Skip to content

Commit

Permalink
chore(release): '2-dev' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
sebtiz13 committed Nov 18, 2024
2 parents 6d46cde + f69c0a7 commit e89d00a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 14 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand All @@ -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)


Expand Down
7 changes: 6 additions & 1 deletion lib/modules/model/ModelService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 } },
],
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
9 changes: 0 additions & 9 deletions tests/scenario/modules/models/asset-model.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion types/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit e89d00a

Please sign in to comment.