Merge pull request #813 from Keshav-NEC/Fix_for_810

constants.DEFAULT_ATTRIBUTE_TYPE is changed to Text
telefonicaid · Feb 1, 2024 · e2cd004 · e2cd004
2 parents 87686a3 + 5f6fc33
commit e2cd004
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 30 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -0,0 +1 @@
+- Fix: default attribute type changed from 'string' to 'Text' (#810)
diff --git a/lib/constants.js b/lib/constants.js
@@ -42,7 +42,7 @@ module.exports = {
     TIMESTAMP_ATTRIBUTE: 'TimeInstant',
     TIMESTAMP_TYPE_NGSI2: 'DateTime',
 
-    DEFAULT_ATTRIBUTE_TYPE: 'string',
+    DEFAULT_ATTRIBUTE_TYPE: 'Text',
 
     COMMAND_STATUS_PENDING: 'PENDING',
     COMMAND_STATUS_ERROR: 'ERROR',

diff --git a/test/unit/ngsiv2/contextRequests/ngsildMeasure.json b/test/unit/ngsiv2/contextRequests/ngsildMeasure.json
@@ -3,7 +3,7 @@
     "type": "AnMQTTDevice",
     "actionType": {
         "value": "APPEND",
-        "type": "string"
+        "type": "Text"
     },
     "entities": {
         "value": [
@@ -45,7 +45,6 @@
                 ]
             }
         ],
-        "type": "string"
+        "type": "Text"
     }
 }
-
diff --git a/test/unit/ngsiv2/contextRequests/ngsildPayloadMeasure.json b/test/unit/ngsiv2/contextRequests/ngsildPayloadMeasure.json
@@ -2,11 +2,11 @@
     "id": "Second MQTT Device",
     "type": "AnMQTTDevice",
     "measure_id": {
-        "type": "string",
+        "type": "Text",
         "value": "urn:ngsi-ld:ParkingSpot:santander:daoiz_velarde_1_5:3"
     },
     "measure_type": {
-        "type": "string",
+        "type": "Text",
         "value": "ParkingSpot"
     },
     "status": {

diff --git a/test/unit/ngsiv2/contextRequests/ngsildPayloadMeasure2.json b/test/unit/ngsiv2/contextRequests/ngsildPayloadMeasure2.json
@@ -2,11 +2,11 @@
     "id": "Second MQTT Device",
     "type": "AnMQTTDevice",
     "measure_id": {
-        "type": "string",
+        "type": "Text",
         "value": "urn:ngsi-ld:ParkingSpot:santander:reyes_magos_1_1:1"
     },
     "measure_type": {
-        "type": "string",
+        "type": "Text",
         "value": "ParkingSpot"
     },
     "status": {

diff --git a/test/unit/ngsiv2/contextRequests/ngsiv2Measure.json b/test/unit/ngsiv2/contextRequests/ngsiv2Measure.json
@@ -3,7 +3,7 @@
     "type":"AnMQTTDevice",    
     "actionType": {
         "value": "APPEND",
-        "type": "string"
+        "type": "Text"
     },
     "entities": {
         "value": [
@@ -56,6 +56,6 @@
                 }
             }
         ],
-        "type": "string"
+        "type": "Text"
     }
 }
diff --git a/test/unit/ngsiv2/contextRequests/ngsiv2PayloadMeasure.json b/test/unit/ngsiv2/contextRequests/ngsiv2PayloadMeasure.json
@@ -2,11 +2,11 @@
     "id":"Second MQTT Device",
     "type":"AnMQTTDevice",
     "measure_id": {
-        "type": "string",
+        "type": "Text",
         "value": "urn:ngsiv2:Streetlight:Streetlight-Mylightpoint-2"
     },
     "measure_type": {
-        "type": "string",
+        "type": "Text",
         "value": "Streetlight"
     },
     "name": {

diff --git a/test/unit/ngsiv2/contextRequests/ngsiv2PayloadMeasure2.json b/test/unit/ngsiv2/contextRequests/ngsiv2PayloadMeasure2.json
@@ -2,11 +2,11 @@
     "id": "Second MQTT Device",
     "type": "AnMQTTDevice",
     "measure_id": {
-        "type": "string",
+        "type": "Text",
         "value": "urn:ngsiv2:Streetlight:Streetlight-Mylightpoint-3"
     },
     "measure_type": {
-        "type": "string",
+        "type": "Text",
         "value": "Streetlight"
     },
     "name": {

diff --git a/test/unit/ngsiv2/contextRequests/pollingMeasure.json b/test/unit/ngsiv2/contextRequests/pollingMeasure.json
@@ -2,7 +2,7 @@
     "id":"Second MQTT Device",
     "type":"AnMQTTDevice",
   "a": {
-    "type": "string",
+    "type": "Text",
     "value": 23
   }
 }
diff --git a/test/unit/ngsiv2/contextRequests/timeInstantMeasures3.json b/test/unit/ngsiv2/contextRequests/timeInstantMeasures3.json
@@ -6,7 +6,7 @@
      "value": "111222"
   },
   "pressure":{
-    "type": "string",
+    "type": "Text",
       "value": "20"
   },
   "TimeInstant":{

diff --git a/test/unit/ngsiv2/contextRequests/unknownMeasures.json b/test/unit/ngsiv2/contextRequests/unknownMeasures.json
@@ -6,7 +6,7 @@
     "value": "32"   
   },
   "weight":{
-    "type": "string",
+    "type": "Text",
     "value": "87"    
   }
 }
diff --git a/test/unit/ngsiv2/contextRequests/unknownMeasures2.json b/test/unit/ngsiv2/contextRequests/unknownMeasures2.json
@@ -6,7 +6,7 @@
     "value": "33"   
   },
   "weight":{
-    "type": "string",
+    "type": "Text",
     "value": "89"    
   }
 }

diff --git a/test/unit/ngsiv2/contextRequests/unprovisionedDevice.json b/test/unit/ngsiv2/contextRequests/unprovisionedDevice.json
@@ -2,11 +2,11 @@
   "id":"TheLightType:JSON_UNPROVISIONED",
   "type":"TheLightType",
   "humidity":{
-    "type": "string",
+    "type": "Text",
     "value": "32"    
   },
   "temperature":{
-    "type": "string",
+    "type": "Text",
     "value": "87"    
   }
 }
diff --git a/test/unit/ngsiv2/contextRequests/unprovisionedDevice2.json b/test/unit/ngsiv2/contextRequests/unprovisionedDevice2.json
@@ -2,11 +2,11 @@
     "id":"TheLightType:JSON_UNPROVISIONED",
     "type":"TheLightType",    
   "humidity":{
-    "type": "string",
+    "type": "Text",
     "value": "33"    
   },
   "temperature":{
-    "type": "string",
+    "type": "Text",
     "value": "89"    
   }
 }
diff --git a/test/unit/ngsiv2/contextRequests/unprovisionedDevice3.json b/test/unit/ngsiv2/contextRequests/unprovisionedDevice3.json
@@ -2,7 +2,7 @@
   "id": "TheLightType:JSON_UNPROVISIONED",
   "type": "TheLightType",
   "h":{
-    "type": "string",
+    "type": "Text",
     "value": "33"    
   }
 }
diff --git a/test/unit/ngsiv2/explicit_attributes-test.js b/test/unit/ngsiv2/explicit_attributes-test.js
@@ -242,7 +242,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -434,7 +434,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -506,7 +506,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -652,7 +652,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -699,7 +699,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -771,7 +771,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
@@ -917,7 +917,7 @@ describe('explicitAttrs tests', function () {
                 .post('/v2/entities?options=upsert', {
                     id: 'Sensor:Temperature:JSON_UNPROVISIONED',
                     type: 'Sensor:Temperature',
-                    h: { type: 'string', value: '33' },
+                    h: { type: 'Text', value: '33' },
                     temperature: { type: 'Number', value: '89' }
                 })
                 .reply(204);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fix: default attribute type changed from 'string' to 'Text' (#810)