kuzzle-device-manager 2.0.0-rc15 → 2.0.0-rc19

package/lib/controllers/AssetController.js

@@ -170,7 +170,11 @@ class AssetController extends RelationalController_1.RelationalController {
         const body = request.getBody();
         const asset = await this.sdk.document.get(engineId, this.collection, id);
         let assetMetadata = request.input.body.metadata;
-        request.input.body.metadata = await this.assetCategoryService.formatMetadataForES(assetMetadata);
+        const previousMetadata = asset._source.metadata
+            ? asset._source.metadata.filter(m => !Object.keys(assetMetadata).includes(m.key))
+            : [];
+        const updatedMetadata = this.assetCategoryService.formatMetadataForES(assetMetadata);
+        request.input.body.metadata = [...updatedMetadata, ...previousMetadata];
         const response = await global.app.trigger('device-manager:asset:update:before', {
             asset,
             updates: body

package/lib/controllers/RelationalController.js

@@ -123,7 +123,7 @@ class RelationalController extends kuzzle_plugin_commons_1.CRUDController {
         request.input.args.index = request.getString('engineId');
         const promises = [];
         promises.push(this.deleteNested(request, nestedFields));
-        if (manyToManyLinkedFields !== [] || oneToManyLinkedFields !== []) {
+        if (manyToManyLinkedFields.length > 0 || oneToManyLinkedFields.length > 0) {
             const document = await this.sdk.document.get(request.getString('engineId'), this.collection, request.getId());
             for (const childrenField of manyToManyLinkedFields) {
                 promises.push(this.propagateDelete(document._source[childrenField], childrenField, true, request));

package/lib/core-classes/MeasureService.js

@@ -59,6 +59,9 @@ class MeasureService {
              * Useful to enrich measures before they are saved.
              */
             const { measures: updatedMeasures } = await this.app.trigger('device-manager:measures:process:before', { asset, device, measures });
+            if (device._source.engineId) {
+                await this.app.trigger(`engine:${device._source.engineId}:device-manager:measures:process:before`, { asset, device, measures });
+            }
             device.updateMeasures(updatedMeasures);
             await this.sdk.document.update(this.config.adminIndex, InternalCollection_1.InternalCollection.DEVICES, device._id, { measures: device._source.measures });
             if (device._source.engineId) {
@@ -78,6 +81,9 @@ class MeasureService {
              * @todo test this
              */
             await this.app.trigger('device-manager:measures:process:after', { asset, device, measures });
+            if (device._source.engineId) {
+                await this.app.trigger(`engine:${device._source.engineId}:device-manager:measures:process:after`, { asset, device, measures });
+            }
         }
     }
     buildMeasures(device, asset, measurements, payloadUuids) {
@@ -180,7 +186,7 @@ class MeasureService {
                     deviceMeasureName: null,
                     measuredAt: measurement.measuredAt ? measurement.measuredAt : Date.now(),
                     origin: {
-                        assetId: null,
+                        assetId,
                         id: kuid,
                         type: types_1.OriginType.USER,
                     },

package/lib/mappings/measuresMappings.d.ts

@@ -46,7 +46,6 @@ export declare const measuresMappings: {
          * Define the origin of the measure.
          */
         origin: {
-            type: string;
             properties: {
                 /**
                  * From what the measure has been pushed. Can be:

package/lib/mappings/measuresMappings.js

@@ -42,7 +42,6 @@ exports.measuresMappings = {
          * Define the origin of the measure.
          */
         origin: {
-            type: 'nested',
             properties: {
                 /**
                  * From what the measure has been pushed. Can be:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-device-manager",
-  "version": "2.0.0-rc15",
+  "version": "2.0.0-rc19",
   "description": "Manage your IoT devices and assets. Choose a provisioning strategy, receive and decode payload, handle your IoT business logic.",
   "author": "The Kuzzle Team (support@kuzzle.io)",
   "repository": {
@@ -31,18 +31,18 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/node": "^17.0.21",
-    "@typescript-eslint/eslint-plugin": "^5.14.0",
-    "@typescript-eslint/parser": "^5.14.0",
+    "@types/node": "^18.7.14",
+    "@typescript-eslint/eslint-plugin": "^5.36.1",
+    "@typescript-eslint/parser": "^5.36.1",
     "axios": "^0.27.2",
     "cucumber": "^6.0.5",
     "ergol": "^1.0.2",
-    "eslint": "^8.10.0",
-    "kuzzle": "^2.18.1",
-    "kuzzle-sdk": "^7.9.1",
+    "eslint": "^8.23.0",
+    "kuzzle": "^2.19.3",
+    "kuzzle-sdk": "^7.10.0",
     "should": "^13.2.3",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.2"
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.2"
   },
   "peerDependencies": {
     "kuzzle": "^2.17.3"