chore(release): '2-dev' into beta

Author: sebtiz13

CHANGELOG.md

@@ -1,3 +1,11 @@
+# [2.5.0-dev.2](https://github.com/kuzzleio/kuzzle-device-manager/compare/v2.5.0-dev.1...v2.5.0-dev.2) (2024-11-18)
+
+
+### Bug Fixes
+
+* backport fix ([#380](https://github.com/kuzzleio/kuzzle-device-manager/issues/380)) ([5392b56](https://github.com/kuzzleio/kuzzle-device-manager/commit/5392b56a9478b1c1932845ee44965d5978197350))
+* getAsset should search in commons assets too ([#380](https://github.com/kuzzleio/kuzzle-device-manager/issues/380)) ([d588a93](https://github.com/kuzzleio/kuzzle-device-manager/commit/d588a93b0dd5b270199083cfb0856e34b57afa66))
+
 # [2.5.0-beta.1](https://github.com/kuzzleio/kuzzle-device-manager/compare/v2.4.3...v2.5.0-beta.1) (2024-11-12)
 
 
@@ -12,6 +20,13 @@
 
 * **measure:** allow measures to be pushed on Assets via API (no devices) ([#344](https://github.com/kuzzleio/kuzzle-device-manager/issues/344)) ([c1073c1](https://github.com/kuzzleio/kuzzle-device-manager/commit/c1073c1f0ccb4cfc7cee64d86c51a4999617fd41))
 
+## [2.4.4](https://github.com/kuzzleio/kuzzle-device-manager/compare/v2.4.3...v2.4.4) (2024-11-18)
+
+
+### Bug Fixes
+
+* getAsset should search in commons assets too ([#380](https://github.com/kuzzleio/kuzzle-device-manager/issues/380)) ([d588a93](https://github.com/kuzzleio/kuzzle-device-manager/commit/d588a93b0dd5b270199083cfb0856e34b57afa66))
+
 ## [2.4.3](https://github.com/kuzzleio/kuzzle-device-manager/compare/v2.4.2...v2.4.3) (2024-10-25)
 
 

lib/modules/model/ModelService.ts

@@ -608,7 +608,12 @@ export class ModelService extends BaseService {
   ): Promise<KDocument<AssetModelContent>> {
     const query = {
       and: [
-        { equals: { engineGroup } },
+        {
+          or: [
+            { equals: { engineGroup } },
+            { equals: { engineGroup: "commons" } },
+          ],
+        },
         { equals: { type: "asset" } },
         { equals: { "asset.model": model } },
       ],

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-device-manager",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-dev.2",
   "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": {

package.json

@@ -110,15 +110,6 @@ describe("ModelsController:assets", () => {
       _id: "model-asset-Plane",
       _source: { asset: { model: "Plane" } },
     });
-
-    const getAssetNotExist = sdk.query({
-      controller: "device-manager/models",
-      action: "getAsset",
-      engineGroup: "other_engine",
-      model: "Plane",
-    });
-
-    await expect(getAssetNotExist).rejects.toMatchObject({ status: 404 });
   });
 
   it("List asset models only from the requested engine group and the common ones", async () => {

tests/scenario/modules/models/asset-model.test.ts

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-device-manager-types",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-dev.2",
   "description": "Shared types for Kuzzle Device Manager",
   "author": "The Kuzzle Team (support@kuzzle.io)",
   "main": "index.js",