kuzzle-device-manager 2.0.0-rc27 → 2.0.0-rc28

package/lib/DeviceManagerPlugin.js

@@ -121,7 +121,6 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
     async init(config, context) {
         this.config = lodash_1.default.merge({}, this.config, config);
         this.context = context;
-        this.assetCategoryService = new asset_category_1.AssetCategoryService(this);
         /* eslint-disable sort-keys */
         this.pipes = {
             "device-manager/asset:before*": this.pipeCheckEngine.bind(this),
@@ -129,32 +128,6 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
             "device-manager/device:beforeSearch": this.pipeCheckEngine.bind(this),
             "device-manager/device:beforeUpdate": this.pipeCheckEngine.bind(this),
             "generic:document:beforeWrite": [],
-            "generic:document:afterGet": async (documents, request) => {
-                if ((request.input.args.collection === "assets" ||
-                    request.input.args.collection === "devices") &&
-                    request.input.args.options?.prettify) {
-                    for (const document of documents) {
-                        if (document._source?.metadata) {
-                            document._source.metadata =
-                                this.assetCategoryService.formatMetadataForGet(document._source.metadata);
-                        }
-                    }
-                }
-                return documents;
-            },
-            "generic:document:beforeUpdate": async (documents, request) => {
-                if ((request.input.args.collection === "assets" ||
-                    request.input.args.collection === "devices") &&
-                    request.input.args.options?.prettify) {
-                    for (const document of documents) {
-                        if (document._source?.metadata) {
-                            document._source.metadata =
-                                this.assetCategoryService.formatMetadataForES(document._source.metadata);
-                        }
-                    }
-                }
-                return documents;
-            },
         };
         /* eslint-enable sort-keys */
         this.adminConfigManager = new kuzzle_plugin_commons_1.ConfigManager(this, {
@@ -177,6 +150,7 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
             mappings: this.config.engineCollections.config.mappings,
             settings: this.config.engineCollections.config.settings,
         });
+        this.assetCategoryService = new asset_category_1.AssetCategoryService(this);
         this.batchController = new kuzzle_1.BatchController(this.sdk, {
             interval: this.config.batchInterval,
         });
@@ -187,7 +161,7 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
         this.deviceManagerEngine = new engine_1.DeviceManagerEngine(this, this.assetsRegister, this.devicesRegister, this.measuresRegister, this.adminConfigManager, this.engineConfigManager);
         this.decodersRegister.init(this.context);
         this.assetController = new asset_1.AssetController(this, this.assetService, this.deviceService, this.assetCategoryService, this.measuresService);
-        this.deviceController = new device_1.DeviceController(this, this.deviceService, this.assetCategoryService);
+        this.deviceController = new device_1.DeviceController(this, this.deviceService);
         this.decodersController = new measure_1.DecoderController(this, this.decodersRegister);
         this.engineController = new kuzzle_plugin_commons_1.EngineController("device-manager", this, this.deviceManagerEngine);
         this.assetCategoryController = new asset_category_1.AssetCategoryController(this, this.assetCategoryService);

package/lib/modules/asset-category/AssetCategoryService.d.ts

@@ -2,7 +2,6 @@ import { JSONObject, KDocument, Plugin } from "kuzzle";
 import { BaseAssetContent } from "./../asset";
 import { MetadataContent } from "./../metadata";
 import { AssetCategoryContent, FormattedMetadata, FormattedValue } from "./types/AssetCategoryContent";
-import { EsDeviceContent } from "../device";
 export declare class AssetCategoryService {
     private config;
     private context;
@@ -21,7 +20,7 @@ export declare class AssetCategoryService {
      * edit the document to format metadata
      * @param document
      */
-    formatDocumentMetadata(document: KDocument<BaseAssetContent | EsDeviceContent>): KDocument<BaseAssetContent | EsDeviceContent>;
+    formatDocumentMetadata(document: KDocument<BaseAssetContent>): KDocument<BaseAssetContent>;
     formatMetadataForGet(assetMetadata: FormattedMetadata[]): JSONObject;
     getValue(value: FormattedValue, format?: boolean): string | number | boolean | JSONObject;
 }

package/lib/modules/device/Device.js

@@ -9,7 +9,7 @@ class Device {
     constructor(content, _id) {
         this._id = _id || Device.id(content.model, content.reference);
         this._source = {
-            metadata: [],
+            metadata: {},
             ...content,
         };
         if (!Array.isArray(this._source.measures)) {

package/lib/modules/device/DeviceController.d.ts

@@ -2,17 +2,12 @@ import { CRUDController } from "kuzzle-plugin-commons";
 import { KuzzleRequest } from "kuzzle";
 import { DeviceManagerPlugin } from "./../../DeviceManagerPlugin";
 import { DeviceManagerConfiguration } from "./../engine";
-import { AssetCategoryService } from "../asset-category";
 import { DeviceService } from "./DeviceService";
 import { Device } from "./Device";
-import { EsDeviceContent } from "./types/DeviceContent";
 export declare class DeviceController extends CRUDController {
     protected config: DeviceManagerConfiguration;
     private deviceService;
-    private assetCategoryService;
-    protected get sdk(): import("kuzzle").EmbeddedSDK;
-    constructor(plugin: DeviceManagerPlugin, deviceService: DeviceService, assetCategoryService: AssetCategoryService);
-    get(request: KuzzleRequest): Promise<EsDeviceContent>;
+    constructor(plugin: DeviceManagerPlugin, deviceService: DeviceService);
     /**
      * Create and provision a new device
      */

package/lib/modules/device/DeviceController.js

@@ -10,9 +10,8 @@ const kuzzle_1 = require("kuzzle");
 const lodash_1 = __importDefault(require("lodash"));
 const Device_1 = require("./Device");
 class DeviceController extends kuzzle_plugin_commons_1.CRUDController {
-    constructor(plugin, deviceService, assetCategoryService) {
+    constructor(plugin, deviceService) {
         super(plugin, "devices");
-        this.assetCategoryService = assetCategoryService;
         this.deviceService = deviceService;
         /* eslint-disable sort-keys */
         this.definition = {
@@ -32,12 +31,6 @@ class DeviceController extends kuzzle_plugin_commons_1.CRUDController {
                         { path: "device-manager/devices/:_id/_detach", verb: "delete" },
                     ],
                 },
-                get: {
-                    handler: this.get.bind(this),
-                    http: [
-                        { path: "device-manager/:engineId/devices/:_id", verb: "get" },
-                    ],
-                },
                 importDevices: {
                     handler: this.importDevices.bind(this),
                     http: [{ path: "device-manager/devices/_import", verb: "post" }],
@@ -114,16 +107,6 @@ class DeviceController extends kuzzle_plugin_commons_1.CRUDController {
         };
         /* eslint-enable sort-keys */
     }
-    get sdk() {
-        return this.context.accessors.sdk;
-    }
-    async get(request) {
-        const id = request.getId();
-        const engineId = request.getString("engineId");
-        const document = await this.sdk.document.get(engineId, this.collection, id);
-        this.assetCategoryService.formatDocumentMetadata(document);
-        return document._source;
-    }
     /**
      * Create and provision a new device
      */
@@ -131,8 +114,7 @@ class DeviceController extends kuzzle_plugin_commons_1.CRUDController {
         const engineId = request.getString("engineId");
         const model = request.getBodyString("model");
         const reference = request.getBodyString("reference");
-        const rawMetadata = request.getBodyObject("metadata", {});
-        const metadata = this.assetCategoryService.formatMetadataForES(rawMetadata);
+        const metadata = request.getBodyObject("metadata", {});
         const refresh = request.getRefresh();
         const assetId = request.getBodyString("assetId", "");
         const measureNamesLinks = request.getBodyArray("measureNamesLinks", []);
@@ -167,9 +149,6 @@ class DeviceController extends kuzzle_plugin_commons_1.CRUDController {
     }
     async update(request) {
         request.input.args.index = request.getString("engineId");
-        const rawMetadata = request.getBodyObject("metadata", {});
-        const metadata = this.assetCategoryService.formatMetadataForES(rawMetadata);
-        request.input.body.metadata = metadata;
         return super.update(request);
     }
     async search(request) {

package/lib/modules/device/collections/deviceMappings.d.ts

@@ -22,53 +22,7 @@ export declare const devicesMappings: {
         };
         metadata: {
             dynamic: string;
-            properties: {
-                key: {
-                    type: string;
-                };
-                value: {
-                    properties: {
-                        boolean: {
-                            type: string;
-                        };
-                        geo_point: {
-                            type: string;
-                        };
-                        integer: {
-                            type: string;
-                        };
-                        keyword: {
-                            type: string;
-                        };
-                        object: {
-                            dynamic: string;
-                            properties: {
-                                key: {
-                                    type: string;
-                                };
-                                value: {
-                                    properties: {
-                                        boolean: {
-                                            type: string;
-                                        };
-                                        geo_point: {
-                                            type: string;
-                                        };
-                                        integer: {
-                                            type: string;
-                                        };
-                                        keyword: {
-                                            type: string;
-                                        };
-                                    };
-                                };
-                            };
-                            type: string;
-                        };
-                    };
-                };
-            };
-            type: string;
+            properties: {};
         };
         model: {
             fields: {

package/lib/modules/device/collections/deviceMappings.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.devicesMappings = void 0;
-const metadata_1 = require("../../../modules/metadata");
 exports.devicesMappings = {
     dynamic: "strict",
     properties: {
@@ -22,7 +21,10 @@ exports.devicesMappings = {
             // measures mappings will be injected by the plugin
             },
         },
-        metadata: metadata_1.metadataValue,
+        metadata: {
+            dynamic: "false",
+            properties: {},
+        },
         model: {
             fields: {
                 text: { type: "text" },

package/lib/modules/device/types/DeviceContent.d.ts

@@ -1,10 +1,9 @@
 import { JSONObject, KDocumentContent } from "kuzzle";
-import { FormattedMetadata } from "../../asset-category";
 import { MeasureContent } from "../../measure/";
 /**
  * Device document content
  */
-export interface BaseDeviceContent extends KDocumentContent {
+export interface DeviceContent extends KDocumentContent {
     /**
      * Device model
      * (This will be auto-filled by Kuzzle)
@@ -18,6 +17,10 @@ export interface BaseDeviceContent extends KDocumentContent {
      * Each most recent measures with a different `deviceMeasureName`
      */
     measures?: MeasureContent[];
+    /**
+     * Device metadata
+     */
+    metadata?: JSONObject;
     /**
      * Linked asset unique identifier
      */
@@ -27,15 +30,3 @@ export interface BaseDeviceContent extends KDocumentContent {
      */
     engineId?: string;
 }
-export interface DeviceContent extends BaseDeviceContent {
-    /**
-     * Device metadata
-     */
-    metadata?: JSONObject;
-}
-export interface EsDeviceContent extends BaseDeviceContent {
-    /**
-     * Device metadata
-     */
-    metadata?: FormattedMetadata[];
-}

package/lib/modules/measure/MeasureService.js

@@ -56,8 +56,7 @@ class MeasureService {
                 continue;
             }
             const measures = this.buildMeasures(device, asset, measurements, payloadUuids);
-            const deviceMetadata = this.assetCategoryService.formatMetadataForES(decodedPayload.getMetadata(device._source.reference));
-            device.updateMetadata(deviceMetadata);
+            device.updateMetadata(decodedPayload.getMetadata(device._source.reference));
             /**
              * Event before starting to process new measures.
              *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-device-manager",
-  "version": "2.0.0-rc27",
+  "version": "2.0.0-rc28",
   "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": {