Merge pull request #397 from mStirner/dev

Working on issues
OpenHausIO · Jan 4, 2024 · 71bdafb · 71bdafb
2 parents 185a480 + 5e32c4f
commit 71bdafb
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/components/endpoints/class.command.js b/components/endpoints/class.command.js
@@ -273,7 +273,7 @@ module.exports = class Command {
             //payload: Joi.string().allow(null).default(null),
             payload: Joi.alternatives().try(Joi.string(), Joi.binary()).allow(null).default(null),
             description: Joi.string().allow(null).default(null),
-            params: Joi.array().items(Param.schema())
+            params: Joi.array().items(Param.schema()).default([])
         });
     }
 

diff --git a/components/scenes/class.scene.js b/components/scenes/class.scene.js
@@ -80,7 +80,8 @@ module.exports = class Scene extends Item {
             name: Joi.string().required(),
             makros: Joi.array().items(Makro.schema()).default([]),
             triggers: Joi.array().items(Trigger.schema()).default([]),
-            visible: Joi.boolean().default(true)
+            visible: Joi.boolean().default(true),
+            icon: Joi.string().allow(null).default(null)
         });
     }
 

diff --git a/components/store/class.store.js b/components/store/class.store.js
@@ -67,11 +67,13 @@ module.exports = class Store extends Item {
             _id: Joi.string().pattern(/^[0-9a-fA-F]{24}$/).default(() => {
                 return String(new mongodb.ObjectId());
             }),
+            name: Joi.string().required(),
+            description: Joi.string().allow(null).default(null),
             config: Joi.array().min(1).items(Value.schema()).required(),
-            item: Joi.string().allow(null).default(null),
-            namespace: Joi.string().default(() => {
+            //item: Joi.string().allow(null).default(null),
+            uuid: Joi.string().default(() => {
                 return uuid.v4();
-            }),
+            })
         });
     }
 

diff --git a/components/store/class.value.js b/components/store/class.value.js
@@ -60,6 +60,7 @@ class Value {
             _id: Joi.string().pattern(/^[0-9a-fA-F]{24}$/).default(() => {
                 return String(new mongodb.ObjectId());
             }),
+            name: Joi.string().required(),
             key: Joi.string().required(),
             value: Joi.when("type", {
                 is: "number",

diff --git a/components/store/index.js b/components/store/index.js
@@ -39,6 +39,10 @@ class C_STORE extends COMPONENT {
             next(null, new Store(data, this));
         });
 
+        this.collection.createIndex("uuid", {
+            unique: true
+        });
+
     }
 
 }

diff --git a/postman.json b/postman.json
@@ -2378,7 +2378,7 @@
 								"header": [],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n    \"_id\": \"65818986ca5133d8de2bb4a1\",\n    \"config\": [{\n        \"_id\": \"6581a14f1c6d01f32129dabc\",\n        \"key\": \"pairing\",\n        \"type\": \"boolean\",\n        \"value\": false,\n        \"description\": \"Is the Gateway ready for pairing?\"\n    }, {\n        \"_id\": \"6581a1520bcb15659d48b207\",\n        \"key\": \"interval\",\n        \"type\": \"number\",\n        \"value\": 3000,\n        \"description\": \"Sync intervall for Endpoints\"\n    }]\n}",
+									"raw": "{\n    \"name\": \"Store item #1\",\n    \"description\": \"Configuration settings for pluginx xyz\",\n    \"_id\": \"65818986ca5133d8de2bb4a1\",\n    \"config\": [{\n        \"_id\": \"6581a14f1c6d01f32129dabc\",\n        \"name\": \"Gateway Pairing\",\n        \"key\": \"pairing\",\n        \"type\": \"boolean\",\n        \"value\": false,\n        \"description\": \"Is the Gateway ready for pairing?\"\n    }, {\n        \"_id\": \"6581a1520bcb15659d48b207\",\n        \"name\": \"Polling Interval\",\n        \"key\": \"interval\",\n        \"type\": \"number\",\n        \"value\": 3000,\n        \"description\": \"Sync intervall for Endpoints\"\n    }]\n}",
 									"options": {
 										"raw": {
 											"language": "json"
@@ -2525,7 +2525,7 @@
 								"header": [],
 								"body": {
 									"mode": "raw",
-									"raw": "{\n    \"item\": \"6375343d0b555ccd42460a2e\",\n    \"labels\": [\n        \"device=65818918d32dad8dab53e433\",\n        \"endpoint=658189336fa19198939caa21\"\n    ]\n}",
+									"raw": "{\n    \"labels\": [\n        \"device=65818918d32dad8dab53e433\",\n        \"endpoint=658189336fa19198939caa21\"\n    ]\n}",
 									"options": {
 										"raw": {
 											"language": "json"

diff --git a/system/component/class.component.js b/system/component/class.component.js
@@ -340,6 +340,7 @@ module.exports = class COMPONENT extends COMMON {
 
                                 let item = this.items.find((item) => {
 
+                                    // NOTE: rename value to key
                                     return Object.keys(err.keyValue).every((value) => {
 
                                         // fixing "Duplicate unique key/index in database, but no matching item"

diff --git a/tests/components/store.js b/tests/components/store.js
@@ -10,17 +10,20 @@ try {
     const workflow = require("./test.workflow.js");
 
     let _id = String(new mongodb.ObjectId());
-    let namespace = String(new mongodb.ObjectId());
+    let uuid = uuidv4();
 
     workflow(C_COMPONENT, "add", (done, { event }) => {
         C_COMPONENT.add({
             _id,
+            name: "Test store",
+            description: "Test item for unit tests",
             config: [{
+                name: "Test Key",
                 key: "key",
                 type: "string",
                 description: "Test key"
             }],
-            namespace
+            uuid
         }, (err, item) => {
 
             // check event arguments
@@ -57,16 +60,13 @@ try {
 
     workflow(C_COMPONENT, "update", (done) => {
 
-        let uuid = uuidv4();
-
         C_COMPONENT.update(_id, {
-            item: uuid
+            name: "Updated Name"
         }, (err, item) => {
             try {
 
                 assert.ok(err === null);
                 assert.equal(item instanceof Store, true);
-                assert.equal(item.item, uuid);
 
                 done(err);
 
@@ -85,12 +85,12 @@ try {
 
             // update call 1
             C_COMPONENT.update(_id, {
-                item: uuidv4()
+                uuid: uuidv4()
             }),
 
             // update call 2
             C_COMPONENT.update(_id, {
-                item: uuidv4()
+                name: "New config/store name"
             })
 
         ]).then(() => {