Merge pull request #1024 from telefonicaid/task/store_service_lowerca…

…se_in_db_models force store service in lowercase
telefonicaid · Apr 30, 2021 · c4da324 · c4da324
2 parents f333af3 + f61f61e
commit c4da324
Show file tree

Hide file tree

Showing 176 changed files with 1,469 additions and 1,471 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Fix: ensure service of groups, device and commands is stored in mongo in lowercase (#1023)
 - Add: add getTypeSilently for device group and use in device registration to avoid false mongo alarm
 - Fix: group command is not provisioned in device when entity_type is different (#1011)
 - Hotfix: avoid automatic conversion from geo:xxxx ('xxxx' diferent from 'json') to geo:json (reverts the work done in PR  #854)

diff --git a/lib/model/Command.js b/lib/model/Command.js
@@ -29,7 +29,7 @@ const Command = new Schema({
     type: String,
     name: String,
     value: Object,
-    service: String,
+    service: { type: String, lowercase: true },
     subservice: String,
     creationDate: { type: Date, default: Date.now }
 });

diff --git a/lib/model/Device.js b/lib/model/Device.js
@@ -38,7 +38,7 @@ const Device = new Schema({
     transport: String,
     staticAttributes: Array,
     subscriptions: Array,
-    service: String,
+    service: { type: String, lowercase: true },
     subservice: String,
     polling: Boolean,
     timezone: String,

diff --git a/lib/model/Group.js b/lib/model/Group.js
@@ -29,7 +29,7 @@ const Group = new Schema({
     resource: String,
     apikey: String,
     type: String,
-    service: String,
+    service: { type: String, lowercase: true },
     subservice: String,
     description: String,
     trust: String,

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgent1.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgent1.json
@@ -14,7 +14,7 @@
                     "type": "centigrades"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgent2.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgent2.json
@@ -14,7 +14,7 @@
                     "type": "Boolean"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json
@@ -18,7 +18,7 @@
                     "type": "Array"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgent4.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgent4.json
@@ -14,7 +14,7 @@
                     "type": "Boolean"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgentAttributeUpdates.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgentAttributeUpdates.json
@@ -9,7 +9,7 @@
         }
       ],
       "attributes": [],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerIoTAgentCommands.json b/test/unit/examples/contextAvailabilityRequests/registerIoTAgentCommands.json
@@ -14,7 +14,7 @@
           "type": "Array"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerNewDevice1.json b/test/unit/examples/contextAvailabilityRequests/registerNewDevice1.json
@@ -14,7 +14,7 @@
                     "type": "centigrades"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerNewDevice2.json b/test/unit/examples/contextAvailabilityRequests/registerNewDevice2.json
@@ -14,7 +14,7 @@
                     "type": "kelvin"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice.json b/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice.json
@@ -18,7 +18,7 @@
           "type": "commandType"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice2.json b/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice2.json
@@ -14,7 +14,7 @@
           "type": "lumens"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json b/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json
@@ -26,7 +26,7 @@
           "type": "Wheel"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json b/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json
@@ -26,7 +26,7 @@
           "type": "Wheel"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M"

diff --git a/test/unit/examples/contextAvailabilityRequests/unregisterDevice1.json b/test/unit/examples/contextAvailabilityRequests/unregisterDevice1.json
@@ -14,7 +14,7 @@
                     "type": "centigrades"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "registrationId": "6319a7f5254b05844116584d",

diff --git a/test/unit/examples/contextAvailabilityRequests/unregisterDevice3.json b/test/unit/examples/contextAvailabilityRequests/unregisterDevice3.json
@@ -18,7 +18,7 @@
                     "type": "Array"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "registrationId": "6319a7f5254b05844116584d",

diff --git a/test/unit/examples/contextAvailabilityRequests/unregisterProvisionedDevice.json b/test/unit/examples/contextAvailabilityRequests/unregisterProvisionedDevice.json
@@ -18,7 +18,7 @@
           "type": "commandType"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "registrationId": "6319a7f5254b05844116584d",

diff --git a/test/unit/examples/contextAvailabilityRequests/updateCommands1.json b/test/unit/examples/contextAvailabilityRequests/updateCommands1.json
@@ -14,7 +14,7 @@
           "type": "command"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M",

diff --git a/test/unit/examples/contextAvailabilityRequests/updateIoTAgent1.json b/test/unit/examples/contextAvailabilityRequests/updateIoTAgent1.json
@@ -14,7 +14,7 @@
                     "type": "Hgmm"
                 }
             ],
-            "providingApplication": "http://smartGondor.com"
+            "providingApplication": "http://smartgondor.com"
         }
     ],
     "registrationId": "6319a7f5254b05844116584d",

diff --git a/test/unit/examples/contextAvailabilityRequests/updateIoTAgent2.json b/test/unit/examples/contextAvailabilityRequests/updateIoTAgent2.json
@@ -18,7 +18,7 @@
           "type": "commandType"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M",

diff --git a/test/unit/examples/contextAvailabilityRequests/updateIoTAgent3.json b/test/unit/examples/contextAvailabilityRequests/updateIoTAgent3.json
@@ -18,7 +18,7 @@
           "type": "commandType"
         }
       ],
-      "providingApplication": "http://smartGondor.com"
+      "providingApplication": "http://smartgondor.com"
     }
   ],
   "duration": "P1M",

diff --git a/test/unit/examples/contextRequests/contextSubscriptionRequest.json b/test/unit/examples/contextRequests/contextSubscriptionRequest.json
@@ -6,7 +6,7 @@
             "id": "light1"
         }
     ],
-    "reference": "http://smartGondor.com/notification",
+    "reference": "http://smartgondor.com/notification",
     "duration": "P1M",
     "notifyConditions": [
         {

diff --git a/test/unit/examples/contextRequests/contextSubscriptionRequest2.json b/test/unit/examples/contextRequests/contextSubscriptionRequest2.json
@@ -6,7 +6,7 @@
             "id": "term2"
         }
     ],
-    "reference": "http://smartGondor.com/notification",
+    "reference": "http://smartgondor.com/notification",
     "duration": "P1M",
     "notifyConditions": [
         {

diff --git a/test/unit/examples/deviceProvisioningRequests/provisionAnotherDevice.json b/test/unit/examples/deviceProvisioningRequests/provisionAnotherDevice.json
@@ -3,7 +3,7 @@
     {
       "device_id": "Light2",
       "protocol": "GENERIC_PROTO",
-      "service" : "smartGondor",
+      "service" : "smartgondor",
       "service_path": "gardens",
       "entity_name": "TheSecondLight",
       "entity_type": "TheLightType",

diff --git a/test/unit/examples/deviceProvisioningRequests/provisionDeviceMissingParameters.json b/test/unit/examples/deviceProvisioningRequests/provisionDeviceMissingParameters.json
@@ -2,7 +2,7 @@
   "devices": [
     {
       "protocol": "GENERIC_PROTO",
-      "service" : "smartGondor",
+      "service" : "smartgondor",
       "entity_name": "TheFirstLight",
       "attributes": [],
       "commands": [

diff --git a/test/unit/examples/deviceProvisioningRequests/provisionDuplicatedDev.json b/test/unit/examples/deviceProvisioningRequests/provisionDuplicatedDev.json
@@ -3,7 +3,7 @@
     {
       "device_id": "Light1",
       "protocol": "GENERIC_PROTO",
-      "service" : "smartGondor",
+      "service" : "smartgondor",
       "service_path": "gardens",
       "entity_name": "TheFirstLight",
       "entity_type": "TheLightType"

diff --git a/test/unit/examples/deviceProvisioningRequests/provisionFullDevice.json b/test/unit/examples/deviceProvisioningRequests/provisionFullDevice.json
@@ -3,7 +3,7 @@
     {
       "device_id": "LightFull",
       "protocol": "GENERIC_PROTO",
-      "service" : "smartGondor",
+      "service" : "smartgondor",
       "service_path": "gardens",
       "entity_name": "TheFullLight",
       "entity_type": "TheLightType",

diff --git a/test/unit/examples/deviceProvisioningRequests/provisionNewDeviceMalformed1.json b/test/unit/examples/deviceProvisioningRequests/provisionNewDeviceMalformed1.json
@@ -1,7 +1,7 @@
 {
   "device_id": "Light1",
   "protocol": "GENERIC_PROTO",
-  "service" : "smartGondor",
+  "service" : "smartgondor",
   "service_path": "gardens",
   "entity_name": "TheFirstLight",
   "entity_type": "TheLightType",

diff --git a/test/unit/examples/iotamRequests/registrationEmpty.json b/test/unit/examples/iotamRequests/registrationEmpty.json
@@ -1,7 +1,7 @@
 {
   "protocol": "GENERIC_PROTOCOL",
   "description": "A generic protocol",
-  "iotagent": "http://smartGondor.com/iot",
+  "iotagent": "http://smartgondor.com/iot",
   "resource": "/iot/d",
   "services": []
 }
diff --git a/test/unit/examples/iotamRequests/registrationWithGroups.json b/test/unit/examples/iotamRequests/registrationWithGroups.json
@@ -1,7 +1,7 @@
 {
   "protocol": "GENERIC_PROTOCOL",
   "description": "A generic protocol",
-  "iotagent": "http://smartGondor.com/iot",
+  "iotagent": "http://smartgondor.com/iot",
   "resource": "/iot/d",
   "services": [
     {
@@ -10,7 +10,7 @@
       "cbHost":"http://unexistentHost:1026",
       "entity_type": "SensorMachine",
       "resource": "/deviceTest",
-      "service": "theService",
+      "service": "theservice",
       "service_path": "theSubService",
       "attributes": [
         {

diff --git a/test/unit/examples/iotamRequests/registrationWithGroupsWithoutCB.json b/test/unit/examples/iotamRequests/registrationWithGroupsWithoutCB.json
@@ -1,15 +1,15 @@
 {
   "protocol": "GENERIC_PROTOCOL",
   "description": "A generic protocol",
-  "iotagent": "http://smartGondor.com/iot",
+  "iotagent": "http://smartgondor.com/iot",
   "resource": "/iot/d",
   "services": [
     {
       "apikey": "801230BJKL23Y9090DSFL123HJK09H324HV8732",
       "token": "8970A9078A803H3BL98PINEQRW8342HBAMS",
       "entity_type": "SensorMachine",
       "resource": "/deviceTest",
-      "service": "theService",
+      "service": "theservice",
       "service_path": "theSubService",
       "attributes": [
         {

diff --git a/test/unit/examples/iotamRequests/registrationWithStaticGroups.json b/test/unit/examples/iotamRequests/registrationWithStaticGroups.json
@@ -1,7 +1,7 @@
 {
   "protocol": "GENERIC_PROTOCOL",
   "description": "A generic protocol",
-  "iotagent": "http://smartGondor.com/iot",
+  "iotagent": "http://smartgondor.com/iot",
   "resource": "/iot/d",
   "services": [
     {
@@ -10,7 +10,7 @@
       "cbHost":"http://unexistentHost:1026",
       "entity_type": "SensorMachine",
       "resource": "/deviceTest",
-      "service": "theService",
+      "service": "theservice",
       "service_path": "theSubService",
       "attributes": [
         {

diff --git a/test/unit/examples/subscriptionRequests/bidirectionalSubscriptionRequest.json b/test/unit/examples/subscriptionRequests/bidirectionalSubscriptionRequest.json
@@ -6,7 +6,7 @@
       "id": "TheFirstLight"
     }
   ],
-  "reference": "http://smartGondor.com/notify",
+  "reference": "http://smartgondor.com/notify",
   "duration": "P1M",
   "notifyConditions": [
     {

diff --git a/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest.json b/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest.json
@@ -6,7 +6,7 @@
       "id": "FirstMicroLight"
     }
   ],
-  "reference": "http://smartGondor.com/notify",
+  "reference": "http://smartgondor.com/notify",
   "duration": "P1M",
   "notifyConditions": [
     {

diff --git a/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest1.json b/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest1.json
@@ -6,7 +6,7 @@
       "id": "light1"
     }
   ],
-  "reference": "http://smartGondor.com/notify",
+  "reference": "http://smartgondor.com/notify",
   "duration": "P1M",
   "notifyConditions": [
     {