Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update metadata in existing assets when the model is modified #287

Merged
merged 6 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 142 additions & 9 deletions lib/modules/asset/AssetService.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,42 @@
import _ from "lodash";
import { Backend, BadRequestError, PluginContext, User } from "kuzzle";
import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle-sdk";
import {
BaseRequest,
JSONObject,
KDocument,
KHit,
SearchResult,
mReplaceResponse,
} from "kuzzle-sdk";
import _ from "lodash";

import { MeasureContent } from "../measure/";
import { AskDeviceUnlinkAsset } from "../device";
import { EmbeddedMeasure, Metadata, lock, ask, flattenObject } from "../shared";
import { MeasureContent } from "../measure/";
import { AskModelAssetGet, AssetModelContent } from "../model";
import {
AskEngineList,
DeviceManagerConfiguration,
InternalCollection,
DeviceManagerPlugin,
InternalCollection,
} from "../plugin";
import { AskModelAssetGet } from "../model";
import {
EmbeddedMeasure,
Metadata,
ask,
flattenObject,
lock,
onAsk,
} from "../shared";

import { AssetContent } from "./types/AssetContent";
import { AssetHistoryService } from "./AssetHistoryService";
import { ApiAssetGetMeasuresResult } from "./exports";
import { AssetSerializer } from "./model/AssetSerializer";
import { AssetContent } from "./types/AssetContent";
import {
AskAssetRefreshModel,
EventAssetUpdateAfter,
EventAssetUpdateBefore,
} from "./types/AssetEvents";
import { AssetHistoryService } from "./AssetHistoryService";
import { AssetHistoryEventMetadata } from "./types/AssetHistoryContent";
import { ApiAssetGetMeasuresResult } from "./types/AssetApi";

export class AssetService {
private context: PluginContext;
Expand Down Expand Up @@ -52,6 +68,15 @@ export class AssetService {
this.context = plugin.context;
this.config = plugin.config;
this.assetHistoryService = assetHistoryService;

this.registerAskEvents();
}

registerAskEvents() {
onAsk<AskAssetRefreshModel>(
"ask:device-manager:asset:refresh-model",
this.refreshModel.bind(this)
);
}

/**
Expand Down Expand Up @@ -306,6 +331,42 @@ export class AssetService {
return result;
}

/**
* Replace an asset metadata
*/
public async mReplaceAndHistorize(
engineId: string,
assets: KDocument<AssetContent>[],
removedMetadata: string[],
{ refresh }: { refresh: any }
): Promise<mReplaceResponse> {
const replacedAssets = await this.sdk.document.mReplace<AssetContent>(
engineId,
InternalCollection.ASSETS,
assets.map((asset) => ({ _id: asset._id, body: asset._source })),
{ refresh, source: true }
);

await Promise.all(
replacedAssets.successes.map((asset) =>
this.assetHistoryService.add<AssetHistoryEventMetadata>(
engineId,
{
metadata: {
names: Object.keys(flattenObject(asset._source.metadata)).concat(
removedMetadata.map((name) => `-${name}`)
),
},
name: "metadata",
},
asset as KDocument<AssetContent>
)
)
);

return replacedAssets;
}

private async getEngine(engineId: string): Promise<JSONObject> {
const engine = await this.sdk.document.get(
this.config.adminIndex,
Expand All @@ -315,4 +376,76 @@ export class AssetService {

return engine._source.engine;
}

private async refreshModel({
assetModel,
}: {
assetModel: AssetModelContent;
}): Promise<void> {
const engines = await ask<AskEngineList>("ask:device-manager:engine:list", {
group: assetModel.engineGroup,
});

const targets = engines.map((engine) => ({
collections: [InternalCollection.ASSETS],
index: engine.index,
}));

const assets = await this.sdk.query<
BaseRequest,
JSONObject // TODO: switch to DocumentSearchResult<AssetContent> once KHit<> has index and collection properties
>({
action: "search",
body: { query: { equals: { model: assetModel.asset.model } } },
controller: "document",
lang: "koncorde",
targets,
});

const modelMetadata = {};

for (const metadataName of Object.keys(assetModel.asset.metadataMappings)) {
const defaultMetadata = assetModel.asset.defaultMetadata[metadataName];
modelMetadata[metadataName] = defaultMetadata ?? null;
}

const removedMetadata: string[] = [];

const updatedAssetsPerIndex: Record<string, KDocument<AssetContent>[]> =
assets.result.hits.reduce(
(acc: Record<string, KDocument<AssetContent>[]>, asset: JSONObject) => {
const assetMetadata = { ...asset._source.metadata };

for (const key of Object.keys(asset._source.metadata)) {
if (!(key in modelMetadata)) {
removedMetadata.push(key);
delete assetMetadata[key];
}
}

asset._source.metadata = {
...modelMetadata,
...assetMetadata,
};

acc[asset.index].push(asset as KDocument<AssetContent>);

return acc;
},
Object.fromEntries(
engines.map((engine) => [
engine.index,
[] as KDocument<AssetContent>[],
])
)
);

await Promise.all(
Object.entries(updatedAssetsPerIndex).map(([index, updatedAssets]) =>
this.mReplaceAndHistorize(index, updatedAssets, removedMetadata, {
refresh: "wait_for",
})
)
);
}
}
11 changes: 11 additions & 0 deletions lib/modules/asset/types/AssetEvents.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { KDocument } from "kuzzle-sdk";
import { AssetModelContent } from "lib/modules/model";

import { Metadata } from "../../../modules/shared";

Expand All @@ -17,6 +18,16 @@ export type EventAssetUpdateAfter = {
args: [{ asset: KDocument<AssetContent>; metadata: Metadata }];
};

export type AskAssetRefreshModel = {
name: "ask:device-manager:asset:refresh-model";

payload: {
assetModel: AssetModelContent;
};

result: void;
};

/**
* @internal
*/
Expand Down
9 changes: 6 additions & 3 deletions lib/modules/model/ModelService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ import {
} from "../plugin";
import { ask, onAsk } from "../shared/utils/ask";

import { AskAssetRefreshModel } from "../asset";
import { flattenObject } from "../shared/utils/flattenObject";
import { ModelSerializer } from "./ModelSerializer";
import {
AssetModelContent,
DeviceModelContent,
MeasureModelContent,
} from "./types/ModelContent";
import { ModelSerializer } from "./ModelSerializer";
import { AskModelAssetGet, AskModelDeviceGet } from "./types/ModelEvents";
import { flattenObject } from "../shared/utils/flattenObject";

export class ModelService {
private config: DeviceManagerConfiguration;
Expand Down Expand Up @@ -90,7 +91,9 @@ export class ModelService {
);
await ask<AskEngineUpdateAll>("ask:device-manager:engine:updateAll");

// @todo update assets in every engine to add the new metadata with null value or default metadata
await ask<AskAssetRefreshModel>("ask:device-manager:asset:refresh-model", {
assetModel: modelContent,
});

return assetModel;
}
Expand Down
15 changes: 15 additions & 0 deletions lib/modules/plugin/DeviceManagerEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from "lodash";
import { Backend, InternalError, Plugin } from "kuzzle";
import { JSONObject } from "kuzzle-sdk";
import { AbstractEngine, ConfigManager } from "kuzzle-plugin-commons";
import { EngineContent } from "kuzzle-plugin-commons/lib/engine/EngineContent";

import { assetsMappings, assetsHistoryMappings } from "../asset";
import {
Expand All @@ -23,6 +24,16 @@ const digitalTwinMappings = {
device: devicesMappings,
} as const;

export type AskEngineList = {
name: "ask:device-manager:engine:list";

payload: {
group: string | null;
};

result: EngineContent[];
};

export type AskEngineUpdateAll = {
name: "ask:device-manager:engine:updateAll";

Expand Down Expand Up @@ -53,6 +64,10 @@ export class DeviceManagerEngine extends AbstractEngine<DeviceManagerPlugin> {

this.context = plugin.context;

onAsk<AskEngineList>("ask:device-manager:engine:list", async ({ group }) =>
this.list(group)
);

onAsk<AskEngineUpdateAll>(
"ask:device-manager:engine:updateAll",
async () => {
Expand Down
31 changes: 16 additions & 15 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"kuzzle-sdk": "^7.10.7",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"type-fest": "^3.7.2",
"typescript": "^4.9.5"
},
"peerDependencies": {
Expand Down
Loading