feat(assets-groups): implement add assets to group

kuzzleio · Jun 14, 2023 · 5c4d928 · 5c4d928
1 parent 54ebead
commit 5c4d928
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 14 deletions.
diff --git a/lib/modules/asset/AssetsGroupsController.ts b/lib/modules/asset/AssetsGroupsController.ts
@@ -228,13 +228,32 @@ export class AssetsGroupsController {
       _id
     );
 
-    // TODO implement addAsset on database
-    // eslint-disable-next-line no-console
-    console.debug({
-      _id,
-      action: request.getAction(),
-      body,
+    const assets = [];
+    for (const assetId of body.assetIds) {
+      const assetContent = (
+        await this.sdk.document.get(
+          engineId,
+          InternalCollection.ASSETS,
+          assetId
+        )
+      )._source;
+
+      if (!Array.isArray(assetContent.groups)) {
+        assetContent.groups = [];
+      }
+
+      assetContent.groups.push(_id);
+
+      assets.push({
+        _id: assetId,
+        body: assetContent,
+      });
+    }
+
+    return this.sdk.document.mReplace(
       engineId,
-    });
+      InternalCollection.ASSETS,
+      assets
+    );
   }
 }
diff --git a/lib/modules/asset/collections/assetsMappings.ts b/lib/modules/asset/collections/assetsMappings.ts
@@ -1,9 +1,11 @@
+import { CollectionMappings } from "kuzzle";
+
 /**
  * Base mappings for the "assets" collection.
  *
  * Those mappings does not contains the `measures` and `metadata` mappings.
  */
-export const assetsMappings = {
+export const assetsMappings: CollectionMappings = {
   dynamic: "strict",
   properties: {
     model: {
@@ -14,6 +16,10 @@ export const assetsMappings = {
       type: "keyword",
       fields: { text: { type: "text" } },
     },
+    groups: {
+      type: "keyword",
+      fields: { text: { type: "text" } },
+    },
 
     metadata: {
       properties: {

diff --git a/lib/modules/asset/types/AssetContent.ts b/lib/modules/asset/types/AssetContent.ts
@@ -31,6 +31,10 @@ export interface AssetContent<
      */
     measureNames: Array<{ asset: string; device: string; type: string }>;
   }>;
+  /**
+   * Id's of asset groups
+   */
+  groups: string[];
 }
 
 /**

diff --git a/lib/modules/asset/types/AssetGroupsAPI.ts b/lib/modules/asset/types/AssetGroupsAPI.ts
@@ -1,4 +1,10 @@
-import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle-sdk";
+import {
+  JSONObject,
+  KDocument,
+  KHit,
+  SearchResult,
+  mUpdateResponse,
+} from "kuzzle-sdk";
 import { AssetsGroupsBody, AssetsGroupContent } from "./AssetGroupContent";
 
 // Make "parent" property to optional for request
@@ -57,4 +63,4 @@ export interface ApiGroupAddAssetsRequest extends GroupControllerRequest {
     assetIds: string[];
   };
 }
-export type ApiGroupAddAssetsResult = void;
+export type ApiGroupAddAssetsResult = mUpdateResponse;
diff --git a/tests/scenario/modules/assets/asset-group.test.ts b/tests/scenario/modules/assets/asset-group.test.ts
@@ -317,7 +317,7 @@ describe("AssetsGroupsController", () => {
       /^Document "bad-id" not found in "engine-ayse":"assets-groups".$/
     );
 
-    const { error, status } = await sdk.query<ApiGroupAddAssetsRequest>({
+    const { result } = await sdk.query<ApiGroupAddAssetsRequest>({
       controller: "device-manager/assetsGroup",
       engineId: "engine-ayse",
       action: "addAsset",
@@ -327,9 +327,43 @@ describe("AssetsGroupsController", () => {
       },
     });
 
-    expect({ error, status }).toStrictEqual({
-      error: null,
-      status: 200,
+    expect(result.errors).toHaveLength(0);
+
+    const assetsGroups = result.successes.map(({ _id, _source }) => ({
+      _id,
+      groups: _source.groups,
+    }));
+    expect(assetsGroups).toStrictEqual([
+      { _id: "Container-linked1", groups: [assetGroupTestId] },
+      { _id: "Container-linked2", groups: [assetGroupTestId] },
+    ]);
+
+    // Add assets in an second group
+    const { result: result2 } = await sdk.query<ApiGroupAddAssetsRequest>({
+      controller: "device-manager/assetsGroup",
+      engineId: "engine-ayse",
+      action: "addAsset",
+      _id: assetGroupTestParentId,
+      body: {
+        assetIds: ["Container-linked1", "Container-linked2"],
+      },
     });
+
+    expect(result2.errors).toHaveLength(0);
+
+    const assetsGroups2 = result2.successes.map(({ _id, _source }) => ({
+      _id,
+      groups: _source.groups,
+    }));
+    expect(assetsGroups2).toStrictEqual([
+      {
+        _id: "Container-linked1",
+        groups: [assetGroupTestId, assetGroupTestParentId],
+      },
+      {
+        _id: "Container-linked2",
+        groups: [assetGroupTestId, assetGroupTestParentId],
+      },
+    ]);
   });
 });