@nmshd/consumption 2.0.0-alpha.8 → 2.0.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/consumption",
-    "version": "2.0.0-alpha.8",
+    "version": "2.0.0-beta.10",
     "description": "The consumption library extends the transport library.",
     "homepage": "https://enmeshed.eu",
     "repository": "github:nmshd/cns-consumption",
@@ -17,10 +17,6 @@
         "ui5.yaml"
     ],
     "scripts": {
-        "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:tsc",
-        "lint:prettier": "prettier --check .",
-        "lint:eslint": "eslint --ext ts ./src ./test",
-        "lint:tsc": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
         "bt": "npm run test:node && npm run build:node && npm run build:test && npm run bundle && npm run test:web",
         "build": "npm run build:node && npm run build:test && npm run bundle",
         "build:ci": "npm run build:node && .ci/writeBuildInformation.sh && npm run build:test && npm run bundle",
@@ -31,50 +27,60 @@
         "bundle:min": "webpack --stats-all --config webpack.min.config.js",
         "bundle:test": "webpack --stats-all --config webpack.test.config.js",
         "cdep": "tsc && madge --circular dist",
+        "lint": "npm run lint:prettier && npm run lint:eslint && npm run lint:tsc",
+        "lint:eslint": "eslint --ext ts ./src ./test",
+        "lint:prettier": "prettier --check .",
+        "lint:tsc": "tsc --noEmit && tsc -p test/tsconfig.json --noEmit",
         "test": "npm run test:node && npm run test:web",
         "test:ci": "npm run test",
         "test:local": "npm run build && npm run test:local:node && npm run test:web",
         "test:local:node": ". ./scripts/testSetup.sh && npm run test:node",
-        "test:local:node:mongodb": ". ./scripts/testSetup.sh && npm run test:node:mongodb",
         "test:local:node:lokijs": "npm run test:node:lokijs",
+        "test:local:node:mongodb": ". ./scripts/testSetup.sh && npm run test:node:mongodb",
         "test:local:teardown": "docker-compose -f test/docker-compose.yml rm -fsv",
         "test:node": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.ts --project ./test/tsconfig.json --exit",
-        "test:node:mongodb": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.mongo.ts --project ./test/tsconfig.json --exit",
         "test:node:lokijs": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.loki.ts --project ./test/tsconfig.json --exit",
+        "test:node:mongodb": "mocha -r ts-node/register -r tsconfig-paths/register ./test/index.node.mongo.ts --project ./test/tsconfig.json --exit",
         "test:web": "browsertest-runner",
         "test:web:debug": "browsertest-runner-debug"
     },
+    "dependencies": {
+        "@js-soft/docdb-querytranslator": "^1.1.0",
+        "ts-simple-nameof": "^1.3.1"
+    },
     "devDependencies": {
-        "@js-soft/docdb-access-loki": "1.0.2",
-        "@js-soft/docdb-access-mongo": "1.0.5",
-        "@js-soft/eslint-config-ts": "1.5.2",
+        "@js-soft/docdb-access-loki": "1.0.3",
+        "@js-soft/docdb-access-mongo": "1.1.1",
+        "@js-soft/eslint-config-ts": "1.6.0",
         "@js-soft/license-check": "1.0.4",
-        "@js-soft/node-logger": "1.0.1",
-        "@js-soft/ts-serval": "2.0.3",
-        "@js-soft/ts-utils": "1.1.1",
-        "@js-soft/web-logger": "1.0.1",
-        "@nmshd/content": "2.0.0-alpha.8",
+        "@js-soft/node-logger": "1.0.2",
+        "@js-soft/ts-serval": "2.0.4",
+        "@js-soft/ts-utils": "2.2.2",
+        "@js-soft/web-logger": "1.0.2",
+        "@nmshd/content": "2.0.0-beta.12",
         "@nmshd/crypto": "2.0.1",
-        "@nmshd/transport": "2.0.0-alpha.1",
-        "@types/chai": "^4.3.1",
+        "@nmshd/transport": "2.0.0-beta.4",
+        "@types/chai": "^4.3.3",
+        "@types/chai-subset": "^1.3.3",
         "@types/glob": "^7.2.0",
-        "@types/luxon": "^2.3.1",
+        "@types/luxon": "^3.0.0",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.29",
-        "bt-runner": "^2.0.5",
+        "@types/node": "^18.7.13",
+        "bt-runner": "^3.1.0",
         "chai": "^4.3.6",
-        "copy-webpack-plugin": "^10.2.4",
-        "eslint": "^8.14.0",
+        "chai-subset": "^1.6.0",
+        "copy-webpack-plugin": "^11.0.0",
+        "eslint": "^8.22.0",
         "madge": "^5.0.1",
-        "mocha": "^9.2.2",
+        "mocha": "^10.0.0",
         "mocha-param": "^2.0.1",
-        "prettier": "^2.6.2",
-        "terser-webpack-plugin": "5.3.1",
-        "ts-node": "^10.7.0",
-        "tsconfig-paths": "^3.14.1",
-        "typescript": "^4.6.3",
-        "webpack": "^5.72.0",
-        "webpack-cli": "^4.9.2"
+        "prettier": "^2.7.1",
+        "terser-webpack-plugin": "5.3.5",
+        "ts-node": "^10.9.1",
+        "tsconfig-paths": "^4.1.0",
+        "typescript": "^4.7.4",
+        "webpack": "^5.74.0",
+        "webpack-cli": "^4.10.0"
     },
     "publishConfig": {
         "access": "public"

package/dist/modules/attributes/ConsumptionAttributesController.d.ts

@@ -1,22 +0,0 @@
-import { CoreDate, CoreId } from "@nmshd/transport";
-import { ConsumptionBaseController } from "../../consumption";
-import { ConsumptionController } from "../../consumption/ConsumptionController";
-import { ConsumptionAttribute } from "./local/ConsumptionAttribute";
-export declare class ConsumptionAttributesController extends ConsumptionBaseController {
-    private attributes;
-    constructor(parent: ConsumptionController);
-    init(): Promise<this>;
-    checkValid(attribute: ConsumptionAttribute): boolean;
-    findCurrent(attributes: ConsumptionAttribute[]): ConsumptionAttribute | undefined;
-    filterCurrent(attributes: ConsumptionAttribute[]): ConsumptionAttribute[];
-    getAttribute(id: CoreId): Promise<ConsumptionAttribute | undefined>;
-    getAttributeByName(name: string): Promise<ConsumptionAttribute | undefined>;
-    getAttributeHistoryByName(name: string): Promise<ConsumptionAttribute[]>;
-    getAttributes(query?: any): Promise<ConsumptionAttribute[]>;
-    getValidAttributes(query?: any): Promise<ConsumptionAttribute[]>;
-    getAttributesByName(query?: any): Promise<Record<string, ConsumptionAttribute>>;
-    createAttribute(attribute: ConsumptionAttribute): Promise<ConsumptionAttribute>;
-    succeedAttribute(attribute: ConsumptionAttribute, validFrom?: CoreDate): Promise<ConsumptionAttribute>;
-    updateAttribute(attribute: ConsumptionAttribute): Promise<ConsumptionAttribute>;
-    deleteAttribute(attribute: ConsumptionAttribute): Promise<void>;
-}

package/dist/modules/attributes/ConsumptionAttributesController.js

@@ -1,141 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsumptionAttributesController = void 0;
-const transport_1 = require("@nmshd/transport");
-const ts_simple_nameof_1 = require("ts-simple-nameof");
-const consumption_1 = require("../../consumption");
-const ConsumptionAttribute_1 = require("./local/ConsumptionAttribute");
-class ConsumptionAttributesController extends consumption_1.ConsumptionBaseController {
-    constructor(parent) {
-        super(consumption_1.ConsumptionControllerName.ConsumptionAttributesController, parent);
-    }
-    async init() {
-        await super.init();
-        this.attributes = await this.parent.accountController.getSynchronizedCollection("Attributes");
-        return this;
-    }
-    checkValid(attribute) {
-        const now = transport_1.CoreDate.utc();
-        if (!attribute.content.validFrom && !attribute.content.validTo) {
-            return true;
-        }
-        else if (attribute.content.validFrom &&
-            !attribute.content.validTo &&
-            attribute.content.validFrom.isSameOrBefore(now)) {
-            return true;
-        }
-        else if (!attribute.content.validFrom &&
-            attribute.content.validTo &&
-            attribute.content.validTo.isAfter(now)) {
-            return true;
-        }
-        else if (attribute.content.validFrom &&
-            attribute.content.validTo &&
-            attribute.content.validFrom.isSameOrBefore(now) &&
-            attribute.content.validTo.isAfter(now)) {
-            return true;
-        }
-        return false;
-    }
-    findCurrent(attributes) {
-        const sorted = attributes.sort((a, b) => {
-            return a.createdAt.compare(b.createdAt);
-        });
-        let current;
-        for (const attribute of sorted) {
-            if (this.checkValid(attribute)) {
-                current = attribute;
-            }
-        }
-        return current;
-    }
-    filterCurrent(attributes) {
-        const sorted = attributes.sort((a, b) => {
-            return a.createdAt.compare(b.createdAt);
-        });
-        const items = [];
-        for (const attribute of sorted) {
-            if (this.checkValid(attribute)) {
-                items.push(attribute);
-            }
-        }
-        return items;
-    }
-    async getAttribute(id) {
-        const result = await this.attributes.find({
-            [(0, ts_simple_nameof_1.nameof)((c) => c.id)]: id.toString()
-        });
-        const attributes = await this.parseArray(result, ConsumptionAttribute_1.ConsumptionAttribute);
-        return this.findCurrent(attributes);
-    }
-    async getAttributeByName(name) {
-        const result = await this.attributes.find({
-            [`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.${(0, ts_simple_nameof_1.nameof)((a) => a.name)}`]: name
-        });
-        const attributes = await this.parseArray(result, ConsumptionAttribute_1.ConsumptionAttribute);
-        return this.findCurrent(attributes);
-    }
-    async getAttributeHistoryByName(name) {
-        const result = await this.attributes.find({
-            [`${(0, ts_simple_nameof_1.nameof)((c) => c.content)}.${(0, ts_simple_nameof_1.nameof)((a) => a.name)}`]: name
-        });
-        const attributes = await this.parseArray(result, ConsumptionAttribute_1.ConsumptionAttribute);
-        const sorted = attributes.sort((a, b) => {
-            return a.createdAt.compare(b.createdAt);
-        });
-        return sorted;
-    }
-    async getAttributes(query) {
-        const items = await this.attributes.find(query);
-        return await this.parseArray(items, ConsumptionAttribute_1.ConsumptionAttribute);
-    }
-    async getValidAttributes(query) {
-        const docs = await this.attributes.find(query);
-        const items = await this.parseArray(docs, ConsumptionAttribute_1.ConsumptionAttribute);
-        return this.filterCurrent(items);
-    }
-    async getAttributesByName(query) {
-        const attributes = await this.getValidAttributes(query);
-        const mapper = (result, attribute) => {
-            result[attribute.content.name] = attribute;
-            return result;
-        };
-        return attributes.reduce(mapper, {});
-    }
-    async createAttribute(attribute) {
-        const current = await this.getAttributeByName(attribute.content.name);
-        if (current) {
-            throw consumption_1.ConsumptionErrors.attributes.attributeExists(attribute.content.name);
-        }
-        await this.attributes.create(attribute);
-        return attribute;
-    }
-    async succeedAttribute(attribute, validFrom) {
-        const current = await this.getAttributeByName(attribute.content.name);
-        if (current && !validFrom) {
-            validFrom = transport_1.CoreDate.utc();
-        }
-        if (current) {
-            attribute.content.validFrom = validFrom;
-            current.content.validTo = validFrom;
-            await this.updateAttribute(current);
-        }
-        await this.attributes.create(attribute);
-        return attribute;
-    }
-    async updateAttribute(attribute) {
-        const current = await this.attributes.findOne({
-            [(0, ts_simple_nameof_1.nameof)((c) => c.id)]: attribute.id.toString()
-        });
-        if (!current) {
-            throw transport_1.TransportErrors.general.recordNotFound(ConsumptionAttribute_1.ConsumptionAttribute, attribute.id.toString());
-        }
-        await this.attributes.update(current, attribute);
-        return attribute;
-    }
-    async deleteAttribute(attribute) {
-        await this.attributes.delete(attribute);
-    }
-}
-exports.ConsumptionAttributesController = ConsumptionAttributesController;
-//# sourceMappingURL=ConsumptionAttributesController.js.map

package/dist/modules/attributes/ConsumptionAttributesController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConsumptionAttributesController.js","sourceRoot":"","sources":["../../../src/modules/attributes/ConsumptionAttributesController.ts"],"names":[],"mappings":"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"}

package/dist/modules/attributes/local/ConsumptionAttribute.d.ts

@@ -1,19 +0,0 @@
-import { Attribute, IAttribute } from "@nmshd/content";
-import { CoreDate, CoreSynchronizable, ICoreDate, ICoreSynchronizable } from "@nmshd/transport";
-export interface IConsumptionAttribute extends ICoreSynchronizable {
-    content: IAttribute;
-    createdAt: ICoreDate;
-    metadata?: any;
-    metadataModifiedAt?: ICoreDate;
-}
-export declare class ConsumptionAttribute extends CoreSynchronizable implements IConsumptionAttribute {
-    readonly technicalProperties: string[];
-    readonly userdataProperties: string[];
-    readonly metadataProperties: string[];
-    content: Attribute;
-    createdAt: CoreDate;
-    metadata?: any;
-    metadataModifiedAt?: CoreDate;
-    static from(value: IConsumptionAttribute): ConsumptionAttribute;
-    static fromAttribute(attribute: IAttribute): Promise<ConsumptionAttribute>;
-}

package/dist/modules/attributes/local/ConsumptionAttribute.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConsumptionAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/ConsumptionAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA8D;AAC9D,4CAAsD;AACtD,gDAA+F;AAC/F,uDAAyC;AACzC,sDAAqD;AAUrD,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,8BAAkB;IAA5D;;QAC6B,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;SACnD,CAAA;QAEwB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;QAErE,uBAAkB,GAAG;YAC1C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC/C,IAAA,yBAAM,EAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC;SAC5D,CAAA;IA6BL,CAAC;IAXU,MAAM,CAAC,IAAI,CAAC,KAA4B;QAC3C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAqB;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC;YACb,OAAO,EAAE,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC;YAClC,EAAE,EAAE,MAAM,4BAAc,CAAC,SAAS,CAAC,QAAQ,EAAE;YAC7C,SAAS,EAAE,oBAAQ,CAAC,GAAG,EAAE;SAC5B,CAAC,CAAA;IACN,CAAC;CACJ,CAAA;AAzBG;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,EAAC,EAAE,IAAI,EAAE,mBAAS,EAAE,CAAC;8BACf,mBAAS;qDAAA;AAIzB;IAFC,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACM,oBAAQ;uDAAA;AAI1B;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;;sDACJ;AAIrB;IAFC,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,IAAA,qBAAS,GAAE;8BACgB,oBAAQ;gEAAA;AA5B3B,oBAAoB;IADhC,IAAA,gBAAI,EAAC,sBAAsB,CAAC;GAChB,oBAAoB,CAyChC;AAzCY,oDAAoB"}

package/dist/modules/relationships/RelationshipInfoController.d.ts

@@ -1,15 +0,0 @@
-import { CoreId } from "@nmshd/transport";
-import { ConsumptionBaseController } from "../../consumption";
-import { ConsumptionController } from "../../consumption/ConsumptionController";
-import { RelationshipInfo } from "./local/RelationshipInfo";
-export declare class RelationshipInfoController extends ConsumptionBaseController {
-    private relationshipInfo;
-    constructor(parent: ConsumptionController);
-    init(): Promise<this>;
-    getRelationshipInfo(id: CoreId): Promise<RelationshipInfo | undefined>;
-    getRelationshipInfoByRelationship(relationshipId: CoreId): Promise<RelationshipInfo | undefined>;
-    getRelationshipInfos(query?: any): Promise<RelationshipInfo[]>;
-    createRelationshipInfo(relationshipInfo: RelationshipInfo): Promise<RelationshipInfo>;
-    updateRelationshipInfo(relationshipInfo: RelationshipInfo): Promise<void>;
-    deleteRelationshipInfo(relationshipInfo: RelationshipInfo): Promise<void>;
-}

package/dist/modules/relationships/RelationshipInfoController.js

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelationshipInfoController = void 0;
-const consumption_1 = require("../../consumption");
-const RelationshipInfo_1 = require("./local/RelationshipInfo");
-const RelationshipInfoUtil_1 = require("./RelationshipInfoUtil");
-class RelationshipInfoController extends consumption_1.ConsumptionBaseController {
-    constructor(parent) {
-        super(consumption_1.ConsumptionControllerName.RelationshipInfoController, parent);
-    }
-    async init() {
-        await super.init();
-        this.relationshipInfo = await this.parent.accountController.getSynchronizedCollection("RelationshipInfo");
-        return this;
-    }
-    async getRelationshipInfo(id) {
-        const result = await this.relationshipInfo.read(id.toString());
-        return result ? RelationshipInfo_1.RelationshipInfo.from(result) : undefined;
-    }
-    async getRelationshipInfoByRelationship(relationshipId) {
-        const info = await new RelationshipInfoUtil_1.RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId);
-        return info;
-        /*
-        // So far, do not store the relationshipInfo, as they wouldn't be updated correctly
-
-        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() })
-
-        if (result) {
-            return await RelationshipInfo.from(result)
-        }
-
-        const info = await new RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId)
-        await this.relationshipInfo.create(info)
-        return info
-        */
-    }
-    async getRelationshipInfos(query) {
-        const items = await this.relationshipInfo.find(query);
-        return await this.parseArray(items, RelationshipInfo_1.RelationshipInfo);
-    }
-    async createRelationshipInfo(relationshipInfo) {
-        const exists = await this.relationshipInfo.exists({ relationshipId: relationshipInfo.relationshipId });
-        if (exists) {
-            throw consumption_1.ConsumptionErrors.relationshipInfo.relationshipInfoExists(relationshipInfo.relationshipId.toString());
-        }
-        await this.relationshipInfo.create(relationshipInfo);
-        return relationshipInfo;
-    }
-    async updateRelationshipInfo(relationshipInfo) {
-        const oldRelationshipInfo = await this.relationshipInfo.read(relationshipInfo.id.toString());
-        if (!oldRelationshipInfo) {
-            throw new Error("RelationshipInfo Not Found");
-        }
-        await this.relationshipInfo.update(oldRelationshipInfo, relationshipInfo);
-    }
-    async deleteRelationshipInfo(relationshipInfo) {
-        await this.relationshipInfo.delete(relationshipInfo);
-    }
-}
-exports.RelationshipInfoController = RelationshipInfoController;
-//# sourceMappingURL=RelationshipInfoController.js.map

package/dist/modules/relationships/RelationshipInfoController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RelationshipInfoController.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoController.ts"],"names":[],"mappings":";;;AACA,mDAA2G;AAE3G,+DAA2D;AAC3D,iEAA6D;AAE7D,MAAa,0BAA2B,SAAQ,uCAAyB;IAGrE,YAAmB,MAA6B;QAC5C,KAAK,CAAC,uCAAyB,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAA;IACvE,CAAC;IAEe,KAAK,CAAC,IAAI;QACtB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAA;QAElB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAA;QACzG,OAAO,IAAI,CAAA;IACf,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,EAAU;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAC,CAAC,CAAC,mCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,CAAC;IAEM,KAAK,CAAC,iCAAiC,CAAC,cAAsB;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,2CAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAA;QACtG,OAAO,IAAI,CAAA;QACX;;;;;;;;;;;;UAYE;IACN,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,KAAW;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAmB,KAAK,EAAE,mCAAgB,CAAC,CAAA;IAC3E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAA;QACtG,IAAI,MAAM,EAAE;YACR,MAAM,+BAAiB,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC9G;QAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACpD,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC5F,IAAI,CAAC,mBAAmB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAChD;QACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,gBAAkC;QAClE,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACxD,CAAC;CACJ;AA/DD,gEA+DC"}

package/dist/modules/relationships/RelationshipInfoUtil.d.ts

@@ -1,15 +0,0 @@
-import { ILogger } from "@js-soft/logging-abstractions";
-import { CoreId } from "@nmshd/transport";
-import { ConsumptionController } from "../../consumption/ConsumptionController";
-import { RelationshipInfo } from "./local/RelationshipInfo";
-export declare class RelationshipInfoUtil {
-    private readonly parent;
-    protected _log: ILogger;
-    get log(): ILogger;
-    constructor(parent: ConsumptionController);
-    createInitialRelationshipInfo(id: CoreId): Promise<RelationshipInfo>;
-    private getTitle;
-    private createRelationshipInfo;
-    private parseTemplateBody;
-    private parseCreationRequest;
-}

package/dist/modules/relationships/RelationshipInfoUtil.js

@@ -1,219 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelationshipInfoUtil = void 0;
-const ts_serval_1 = require("@js-soft/ts-serval");
-const content_1 = require("@nmshd/content");
-const transport_1 = require("@nmshd/transport");
-const consumption_1 = require("../../consumption");
-const SharedItem_1 = require("../sharedItems/local/SharedItem");
-const RelationshipAttribute_1 = require("./local/RelationshipAttribute");
-const RelationshipInfo_1 = require("./local/RelationshipInfo");
-class RelationshipInfoUtil {
-    constructor(parent) {
-        this.parent = parent;
-        this._log = transport_1.TransportLoggerFactory.getLogger(RelationshipInfoUtil);
-    }
-    get log() {
-        return this._log;
-    }
-    async createInitialRelationshipInfo(id) {
-        const relationship = await this.parent.accountController.relationships.getRelationship(id);
-        if (!relationship) {
-            throw transport_1.TransportErrors.general.recordNotFound(transport_1.Relationship, id.toString()).logWith(this._log);
-        }
-        await this.parseTemplateBody(relationship);
-        await this.parseCreationRequest(relationship);
-        return await this.createRelationshipInfo(relationship);
-    }
-    getTitle(relationship, attributeMap) {
-        let title = relationship.peer.address.toString().substring(3, 9);
-        const thingName = attributeMap.get("Thing.name")?.content.value;
-        const givenName = attributeMap.get("Person.givenName")?.content.value;
-        const familyName = attributeMap.get("Person.familyName")?.content.value;
-        const gender = attributeMap.get("Person.gender")?.content.value;
-        const orgname = attributeMap.get("Organization.name")?.content.value;
-        const legalName = attributeMap.get("Organization.legalname")?.content.value;
-        if (thingName) {
-            title = thingName;
-        }
-        else if (givenName && familyName) {
-            title = `${givenName} ${familyName}`;
-        }
-        else if (givenName) {
-            title = givenName;
-        }
-        else if (familyName && gender) {
-            title = `i18n://salutation.gender.${gender} ${familyName}`;
-        }
-        else if (orgname) {
-            title = orgname;
-        }
-        else if (legalName) {
-            title = legalName;
-        }
-        return title;
-    }
-    async createRelationshipInfo(relationship) {
-        const peerAddress = relationship.peer.address;
-        const truncatedAddress = peerAddress.address.substring(3, 9);
-        const info = RelationshipInfo_1.RelationshipInfo.from({
-            attributes: [],
-            id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
-            isPinned: false,
-            relationshipId: relationship.id,
-            title: truncatedAddress
-        });
-        // info = await this.parent.relationshipInfo.createRelationshipInfo(info)
-        const items = await this.parent.sharedItems.getSharedItems({
-            sharedBy: relationship.peer.address.toString()
-        });
-        const attributes = [];
-        const attributeMap = new Map();
-        for (const item of items) {
-            if (item.content instanceof content_1.Attribute) {
-                const relAttr = RelationshipAttribute_1.RelationshipAttribute.from({
-                    name: item.content.name,
-                    sharedItem: item.id,
-                    content: item.content
-                });
-                attributes.push(relAttr);
-                attributeMap.set(relAttr.name, relAttr);
-            }
-        }
-        info.attributes = attributes;
-        const title = this.getTitle(relationship, attributeMap);
-        info.title = title;
-        // await this.parent.relationshipInfo.updateRelationshipInfo(info)
-        return info;
-    }
-    async parseTemplateBody(relationship) {
-        const template = relationship.cache.template;
-        if (!template.cache) {
-            throw transport_1.TransportErrors.general.cacheEmpty(transport_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
-        }
-        const body = template.cache.content;
-        const isTemplator = this.parent.accountController.identity.isMe(template.cache.createdBy);
-        const sharedAt = template.cache.createdAt;
-        const sharedBy = isTemplator ? this.parent.accountController.identity.address : relationship.peer.address;
-        const sharedWith = isTemplator ? relationship.peer.address : this.parent.accountController.identity.address;
-        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
-            reference: template.id.toString()
-        });
-        const missingItems = [];
-        if (body instanceof content_1.RelationshipTemplateBody) {
-            const attributes = body.sharedAttributes;
-            if (attributes) {
-                if (sharedItemsWithSameReference.length !== attributes.length) {
-                    attributes.forEach((attribute) => {
-                        if (!sharedItemsWithSameReference.find(function (item) {
-                            const content = item.content;
-                            return content.name === attribute.name;
-                        })) {
-                            missingItems.push(attribute);
-                        }
-                    });
-                }
-            }
-        }
-        else {
-            // Try to parse the old template format (without types)
-            let oldTemplateBody = body;
-            if (body instanceof ts_serval_1.JSONWrapper) {
-                oldTemplateBody = oldTemplateBody.value;
-            }
-            if (oldTemplateBody?.attributes && Array.isArray(oldTemplateBody.attributes)) {
-                if (sharedItemsWithSameReference.length !== oldTemplateBody.attributes.length) {
-                    oldTemplateBody.attributes.forEach((attribute) => {
-                        if (!sharedItemsWithSameReference.find(function (item) {
-                            const content = item.content;
-                            return content.name === attribute.name;
-                        })) {
-                            missingItems.push(content_1.Attribute.from({
-                                name: attribute.name,
-                                value: attribute.value
-                            }));
-                        }
-                    });
-                }
-            }
-        }
-        for (const attribute of missingItems) {
-            const sharedItem = SharedItem_1.SharedItem.from({
-                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                content: attribute,
-                sharedAt: sharedAt,
-                sharedBy: sharedBy,
-                sharedWith: sharedWith,
-                reference: template.id,
-                expiresAt: attribute.validTo
-            });
-            await this.parent.sharedItems.createSharedItem(sharedItem);
-        }
-    }
-    async parseCreationRequest(relationship) {
-        const change = relationship.cache.creationChange;
-        const request = change.request;
-        const body = request.content;
-        const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
-        const sharedAt = request.createdAt;
-        const sharedBy = isRequestor ? this.parent.accountController.identity.address : relationship.peer.address;
-        const sharedWith = isRequestor ? relationship.peer.address : this.parent.accountController.identity.address;
-        const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
-            reference: change.id.toString()
-        });
-        const missingItems = [];
-        if (body instanceof content_1.RelationshipCreationChangeRequestBody) {
-            const attributes = body.sharedAttributes;
-            if (attributes && attributes.length > 0) {
-                if (sharedItemsWithSameReference.length !== attributes.length) {
-                    attributes.forEach((attribute) => {
-                        if (!sharedItemsWithSameReference.find(function (item) {
-                            const content = item.content;
-                            return content.name === attribute.name;
-                        })) {
-                            missingItems.push(attribute);
-                        }
-                    });
-                }
-            }
-        }
-        else {
-            // Try to parse the old request format (without types)
-            let oldRequestBody = body;
-            if (body instanceof ts_serval_1.JSONWrapper) {
-                oldRequestBody = oldRequestBody.value;
-            }
-            if (oldRequestBody?.attributes) {
-                const keys = Object.keys(oldRequestBody.attributes);
-                if (sharedItemsWithSameReference.length !== keys.length) {
-                    keys.forEach((key) => {
-                        const attribute = oldRequestBody.attributes[key];
-                        if (!sharedItemsWithSameReference.find(function (item) {
-                            const content = item.content;
-                            return content.name === attribute.name;
-                        })) {
-                            missingItems.push(content_1.Attribute.from({
-                                name: attribute.name,
-                                value: attribute.value
-                            }));
-                        }
-                    });
-                }
-            }
-        }
-        for (const attribute of missingItems) {
-            const sharedItem = SharedItem_1.SharedItem.from({
-                id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                content: attribute,
-                sharedAt: sharedAt,
-                sharedBy: sharedBy,
-                sharedWith: sharedWith,
-                reference: change.id,
-                expiresAt: attribute.validTo
-            });
-            await this.parent.sharedItems.createSharedItem(sharedItem);
-        }
-    }
-}
-exports.RelationshipInfoUtil = RelationshipInfoUtil;
-//# sourceMappingURL=RelationshipInfoUtil.js.map

package/dist/modules/relationships/RelationshipInfoUtil.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RelationshipInfoUtil.js","sourceRoot":"","sources":["../../../src/modules/relationships/RelationshipInfoUtil.ts"],"names":[],"mappings":"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"}