refacto(deviceService): move decoders in the DeviceService

kuzzleio · Apr 14, 2021 · 9941b30 · 9941b30
1 parent c1e7e68
commit 9941b30
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 20 deletions.
diff --git a/lib/DeviceManagerPlugin.ts b/lib/DeviceManagerPlugin.ts
@@ -136,10 +136,10 @@ export class DeviceManagerPlugin extends Plugin {
 
     this.engineService = new EngineService(this.config, context);
     this.payloadService = new PayloadService(this.config, context);
-    this.deviceService = new DeviceService(this.config, context);
+    this.deviceService = new DeviceService(this.config, context, this.decoders);
     this.assetController = new AssetController(this.config, context);
     this.engineController = new EngineController(this.config, context, this.engineService);
-    this.deviceController = new DeviceController(this.config, context, this.decoders, this.deviceService);
+    this.deviceController = new DeviceController(this.config, context, this.deviceService);
 
     this.api['device-manager/asset'] = this.assetController.definition;
     this.api['device-manager/device'] = this.deviceController.definition;

diff --git a/lib/controllers/DeviceController.ts b/lib/controllers/DeviceController.ts
@@ -8,24 +8,24 @@ import {
 } from 'kuzzle';
 
 import { CRUDController } from './CRUDController';
-import { Decoder } from '../decoders';
 import { Device } from '../models';
 import { DeviceBulkContent } from '../types';
 import { DeviceService } from '../services';
 
 export class DeviceController extends CRUDController {
-  private decoders: Map<string, Decoder>;
   private deviceService: DeviceService;
 
   get sdk(): EmbeddedSDK {
     return this.context.accessors.sdk;
   }
 
-  constructor(config: JSONObject, context: PluginContext, decoders: Map<string, Decoder>, deviceService: DeviceService) {
+  constructor(
+    config: JSONObject,
+    context: PluginContext,
+    deviceService: DeviceService
+  ) {
     super(config, context, 'devices');
 
-    this.decoders = decoders;
-
     this.deviceService = deviceService;
 
     this.definition = {
@@ -91,7 +91,13 @@ export class DeviceController extends CRUDController {
     const document = { tenantId: tenantId, deviceId: deviceId };
     const devices = await this.mGetDevice([document]);
 
-    await this.deviceService.mAttach(devices, [document], { strict: true, options:  { ...request.input.args } });
+    await this.deviceService.mAttach(
+      devices,
+      [document],
+      {
+        strict: true,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -102,7 +108,13 @@ export class DeviceController extends CRUDController {
 
     const devices = await this.mGetDevice(bulkData);
 
-    return this.deviceService.mAttach(devices, bulkData, { strict, options:  { ...request.input.args } });
+    return this.deviceService.mAttach(
+      devices,
+      bulkData,
+      {
+        strict,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -114,18 +126,30 @@ export class DeviceController extends CRUDController {
     const document: DeviceBulkContent = { deviceId };
     const devices = await this.mGetDevice([document]);
 
-    await this.deviceService.mDetach(devices, [document], { strict: true, options:  { ...request.input.args } });
+    await this.deviceService.mDetach(
+      devices,
+      [document],
+      {
+        strict: true,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
-   * Unattach multiple devices from multiple tenants
+   * Detach multiple devices from multiple tenants
    */
   async mDetach (request: KuzzleRequest) {
     const { bulkData, strict } = await this.mParseRequest(request);
 
     const devices = await this.mGetDevice(bulkData);
 
-    return this.deviceService.mDetach(devices, bulkData, { strict, options:  { ...request.input.args } });
+    return this.deviceService.mDetach(
+      devices,
+      bulkData,
+      {
+        strict,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -138,7 +162,13 @@ export class DeviceController extends CRUDController {
     const document: DeviceBulkContent = { deviceId, assetId };
     const devices = await this.mGetDevice([document]);
 
-    await this.deviceService.mLink(devices, [document], this.decoders, { strict: true, options:  { ...request.input.args } });
+    await this.deviceService.mLink(
+      devices,
+      [document],
+      {
+        strict: true,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -149,7 +179,13 @@ export class DeviceController extends CRUDController {
 
     const devices = await this.mGetDevice(bulkData);
 
-    return this.deviceService.mLink(devices, bulkData, this.decoders, { strict, options:  { ...request.input.args } });
+    return this.deviceService.mLink(
+      devices,
+      bulkData,
+      {
+        strict,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -161,7 +197,12 @@ export class DeviceController extends CRUDController {
     const document: DeviceBulkContent = { deviceId };
     const devices = await this.mGetDevice([document]);
 
-    await this.deviceService.mUnlink(devices, { strict: true, options:  { ...request.input.args } });
+    await this.deviceService.mUnlink(
+      devices,
+      {
+        strict: true,
+        options:  { ...request.input.args }
+      });
   }
 
   /**
@@ -172,7 +213,12 @@ export class DeviceController extends CRUDController {
 
     const devices = await this.mGetDevice(bulkData);
 
-    return this.deviceService.mUnlink(devices, { strict, options:  { ...request.input.args } });
+    return this.deviceService.mUnlink(
+      devices,
+      {
+        strict,
+        options: { ...request.input.args }
+      });
   }
 
   /**
@@ -224,7 +270,11 @@ export class DeviceController extends CRUDController {
       const lines = await csv({ delimiter: 'auto' })
         .fromString(body.csv);
 
-      bulkData = lines.map(line => ({ tenantId: line.tenantId, deviceId: line.deviceId, assetId: line.assetId }));
+      bulkData = lines.map(({ tenantId, deviceId, assetId}) => ({
+        tenantId,
+        deviceId,
+        assetId
+      }));
     }
     else if (body.records) {
       bulkData = body.records;

diff --git a/lib/services/DeviceService.ts b/lib/services/DeviceService.ts
@@ -21,13 +21,17 @@ export class DeviceService {
   private config: JSONObject;
   private context: PluginContext;
 
+  private decoders: Map<string, Decoder>;
+
   get sdk(): EmbeddedSDK {
     return this.context.accessors.sdk;
   }
 
-  constructor(config: JSONObject, context: PluginContext) {
+  constructor(config: JSONObject, context: PluginContext, decoders: Map<string, Decoder>) {
     this.config = config;
     this.context = context;
+
+    this.decoders = decoders;
   }
 
   async mAttach (
@@ -164,7 +168,6 @@ export class DeviceService {
   async mLink (
     devices: Device[],
     bulkData: DeviceBulkContent[],
-    decoders: Map<string, Decoder>,
     { strict, options }: { strict?: boolean, options?: JSONObject }
   ) {
     const detachedDevices = devices.filter(device => {
@@ -205,7 +208,7 @@ export class DeviceService {
       const assetDocuments = [];
 
       for (const device of devicesContent) {
-        const decoder = decoders.get(device._source.model);
+        const decoder = this.decoders.get(device._source.model);
         const measures = await decoder.copyToAsset(device);
         const { assetId } = bulkData.find(data => data.deviceId === device._id)