From ba6219bfd6b67a5eeb91b0382a3e8d6421616c06 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 29 Jan 2020 14:51:33 +0100
Subject: [PATCH] Cleanup Rule definition in introspection

As per feedback from client development
---
 libnymea-core/ruleengine/rule.h | 4 ++--
 tests/auto/api.json             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libnymea-core/ruleengine/rule.h b/libnymea-core/ruleengine/rule.h
index 5759a0ef..40cd8b17 100644
--- a/libnymea-core/ruleengine/rule.h
+++ b/libnymea-core/ruleengine/rule.h
@@ -35,9 +35,9 @@ namespace nymeaserver {
 class Rule
 {
     Q_GADGET
-    Q_PROPERTY(QUuid id READ id WRITE setId USER true)
+    Q_PROPERTY(QUuid id READ id)
     Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(bool active READ active USER true)
+    Q_PROPERTY(bool active READ active)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled USER true)
     Q_PROPERTY(bool executable READ executable WRITE setExecutable USER true)
     Q_PROPERTY(EventDescriptors eventDescriptors READ eventDescriptors WRITE setEventDescriptors USER true)
diff --git a/tests/auto/api.json b/tests/auto/api.json
index f78a8b5a..89077c94 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1890,10 +1890,10 @@
             "o:eventDescriptors": "$ref:EventDescriptors",
             "o:executable": "Bool",
             "o:exitActions": "$ref:RuleActions",
-            "o:id": "Uuid",
             "o:stateEvaluator": "$ref:StateEvaluator",
             "o:timeDescriptor": "$ref:TimeDescriptor",
-            "r:o:active": "Bool"
+            "r:active": "Bool",
+            "r:id": "Uuid"
         },
         "RuleAction": {
             "o:actionTypeId": "Uuid",