feat(softTenants): add softTenant ids to assets measures documents #383

thomas-mauran · 2024-11-22T15:43:12Z

What does this PR do ?

Add softTenant fields to digitalTwins documents

Other changes

Import types derivative of ModelDefinition like AssetModel, DeviceModel and MeasureModel from iot-platform
Refactor some tests

Boyscout

Improve types export
Improve tests models definitions to simplify list to clear models for tests
Add basic VSCode settings

afondard · 2024-11-25T09:17:50Z

Seems like there is a mapping issue because the dynamic property of the assets collection is set to strict, not allowing a new property like softTenants.

thomas-mauran · 2024-11-25T09:20:39Z

Seems like there is a mapping issue because the dynamic property of the assets collection is set to strict, not allowing a new property like softTenants.

Yes this is still in draft and not working yet, I didn't had the time to finish

etrousset

This feature should be done on 2-dev branch

lib/modules/asset/types/AssetApi.ts

afondard · 2024-12-03T16:44:39Z

.vscode/settings.json

+    "/lib/modules/shared/exports.ts",
+    "/lib/modules/shared/types/exports.ts"
+  ]
+}


Is it normal for this file to be there?

Yes, It's useful to share basic VSCode settings.
Especially on certain repositories like this one which still have a specific configuration like double quote style instead of simple quote.

Maybe we should rationalize these types of configurations between project but that need a huge PR to reformat all code, to accepted style. So for the moment IMHO, it's the better solution to share these settings for contributors

afondard · 2024-12-03T16:46:07Z

lib/modules/asset/collections/assetsMappings.ts

@@ -25,7 +25,10 @@ export const assetsMappings: CollectionMappings = {
        date: { type: "date" },
      },
    },
-
+    softTenant: {


So there could be only 1 softTenant?

No, but it's currently implemented like that and change this need a migration of database so it's breaking if we change to pluralize now

Elasticsearch doesn't have array types in mappings, an object and an array of objects will have the exact same mapping definition.

fmauNeko · 2024-12-04T16:13:06Z

lib/modules/asset/AssetsController.ts

-          http: [
-            { path: "device-manager/:engineId/assets/:_id", verb: "post" },
-          ],
+          http: [{ path: "device-manager/:engineId/assets", verb: "put" }],


This is a breaking API change, this should be marked as such in the commits and lead to a semver-major release.

fmauNeko · 2024-12-05T08:08:13Z

lib/modules/device/DevicesController.ts

-          http: [
-            { path: "device-manager/:engineId/devices/:_id", verb: "post" },
-          ],
+          http: [{ path: "device-manager/:engineId/devices", verb: "put" }],


This is a breaking API change, this should be marked as such in the commits and lead to a semver-major release.

# [2.5.0-dev.3](v2.5.0-dev.2...v2.5.0-dev.3) (2024-12-05) ### Features * **softTenants:** add softTenant ids to assets measures documents ([#383](#383)) ([1b36fe0](1b36fe0))

# [2.5.0](v2.4.4...v2.5.0) (2024-12-05) ### Bug Fixes * **assetservice:** can't replace metadata if not present in asset ([#384](#384)) ([eb65c0a](eb65c0a)) * backport fix ([#380](#380)) ([5392b56](5392b56)) ### Features * add editor hint support ([#386](#386)) ([a9b62df](a9b62df)) * **measure:** allow measures to be pushed on Assets via API (no devices) ([#344](#344)) ([c1073c1](c1073c1)) * **softTenants:** add softTenant ids to assets measures documents ([#383](#383)) ([1b36fe0](1b36fe0))

thomas-mauran marked this pull request as draft November 22, 2024 15:43

etrousset requested changes Nov 25, 2024

View reviewed changes

sebtiz13 assigned thomas-mauran Nov 25, 2024

sebtiz13 changed the base branch from 3-dev to 2-dev November 25, 2024 14:51

sebtiz13 self-assigned this Nov 28, 2024

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from 1a19c29 to 7ecf853 Compare November 28, 2024 19:34

wip

35e6324

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from 7ecf853 to 35e6324 Compare November 28, 2024 19:56

fix: correctly clear of models in tests

5084a45

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from 72a4ef2 to ea49a1b Compare December 2, 2024 21:50

etrousset added the 2.5 label Dec 3, 2024

test: more reliable decoder controller test

4b549f0

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from 8f22ef7 to cc3c546 Compare December 3, 2024 09:29

sebtiz13 marked this pull request as ready for review December 3, 2024 09:34

sebtiz13 changed the title ~~KZLPRD-677: add group ids soft tenant to asset measure~~ KZLPRD-677: add softTenant ids to asset measure Dec 3, 2024

sebtiz13 changed the title ~~KZLPRD-677: add softTenant ids to asset measure~~ feat(softtenants): add softTenant ids to asset measure Dec 3, 2024

sebtiz13 changed the title ~~feat(softtenants): add softTenant ids to asset measure~~ feat(digitaltwin): add softTenant ids to asset measure Dec 3, 2024

sebtiz13 changed the title ~~feat(digitaltwin): add softTenant ids to asset measure~~ feat(digitaltwin): add softTenant ids to digitaltwin Dec 3, 2024

sebtiz13 added 2 commits December 3, 2024 13:57

fix: correct softTenant mapping definition

fd1d271

test: correct AssetController tests

48d034c

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from cc3c546 to 48d034c Compare December 3, 2024 12:58

sebtiz13 requested review from etrousset, fmauNeko, Juiced66 and afondard December 3, 2024 12:58

etrousset approved these changes Dec 3, 2024

View reviewed changes

lib/modules/asset/types/AssetApi.ts Outdated Show resolved Hide resolved

etrousset changed the title ~~feat(digitaltwin): add softTenant ids to digitaltwin~~ feat(digitaltwin): add softTenant ids to assets measures documents Dec 3, 2024

etrousset changed the title ~~feat(digitaltwin): add softTenant ids to assets measures documents~~ feat(softTenants): add softTenant ids to assets measures documents Dec 3, 2024

afondard reviewed Dec 3, 2024

View reviewed changes

afondard approved these changes Dec 3, 2024

View reviewed changes

afondard reviewed Dec 3, 2024

View reviewed changes

types: remove useless _id property for upsert requests

1d6d203

sebtiz13 force-pushed the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch from 831550e to 1d6d203 Compare December 4, 2024 13:51

fmauNeko approved these changes Dec 5, 2024

View reviewed changes

sebtiz13 merged commit 1b36fe0 into 2-dev Dec 5, 2024
5 checks passed

sebtiz13 deleted the KZLPRD-677-add-groupIds-softTenant-to-asset-measure branch December 5, 2024 12:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(softTenants): add softTenant ids to assets measures documents #383

feat(softTenants): add softTenant ids to assets measures documents #383

thomas-mauran commented Nov 22, 2024 •

edited by sebtiz13

Loading

afondard commented Nov 25, 2024

thomas-mauran commented Nov 25, 2024

etrousset left a comment

afondard Dec 3, 2024

sebtiz13 Dec 4, 2024

afondard Dec 3, 2024

sebtiz13 Dec 4, 2024

fmauNeko Dec 4, 2024

fmauNeko Dec 4, 2024

fmauNeko Dec 5, 2024

feat(softTenants): add softTenant ids to assets measures documents #383

feat(softTenants): add softTenant ids to assets measures documents #383

Conversation

thomas-mauran commented Nov 22, 2024 • edited by sebtiz13 Loading

What does this PR do ?

Other changes

Boyscout

afondard commented Nov 25, 2024

thomas-mauran commented Nov 25, 2024

etrousset left a comment

Choose a reason for hiding this comment

afondard Dec 3, 2024

Choose a reason for hiding this comment

sebtiz13 Dec 4, 2024

Choose a reason for hiding this comment

afondard Dec 3, 2024

Choose a reason for hiding this comment

sebtiz13 Dec 4, 2024

Choose a reason for hiding this comment

fmauNeko Dec 4, 2024

Choose a reason for hiding this comment

fmauNeko Dec 4, 2024

Choose a reason for hiding this comment

fmauNeko Dec 5, 2024

Choose a reason for hiding this comment

thomas-mauran commented Nov 22, 2024 •

edited by sebtiz13

Loading