@nmshd/consumption 1.0.6 → 1.0.10

package/lib-web/nmshd.consumption.js

@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "1.0.6",
-    build: "8",
-    date: "2021-12-16T08:02:38+00:00",
-    commit: "e2e727f2a3dfde6caf4e61184236a297e82f4784",
+    version: "1.0.10",
+    build: "12",
+    date: "2021-12-23T16:26:55+00:00",
+    commit: "d6f4641d66742bf72bc0399783a432af36ef8efc",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,
@@ -662,7 +662,6 @@ __exportStar(__webpack_require__(/*! ./relationships/local/RelationshipAttribute
 __exportStar(__webpack_require__(/*! ./relationships/local/RelationshipInfo */ "./dist/modules/relationships/local/RelationshipInfo.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/local/RelationshipTheme */ "./dist/modules/relationships/local/RelationshipTheme.js"), exports);
 __exportStar(__webpack_require__(/*! ./relationships/RelationshipInfoController */ "./dist/modules/relationships/RelationshipInfoController.js"), exports);
-__exportStar(__webpack_require__(/*! ./relationships/SingleRelationshipController */ "./dist/modules/relationships/SingleRelationshipController.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/local/ConsumptionRequest */ "./dist/modules/requests/local/ConsumptionRequest.js"), exports);
 __exportStar(__webpack_require__(/*! ./requests/RequestsController */ "./dist/modules/requests/RequestsController.js"), exports);
 __exportStar(__webpack_require__(/*! ./settings/local/Setting */ "./dist/modules/settings/local/Setting.js"), exports);
@@ -686,6 +685,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipInfoController = void 0;
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
 const RelationshipInfo_1 = __webpack_require__(/*! ./local/RelationshipInfo */ "./dist/modules/relationships/local/RelationshipInfo.js");
+const RelationshipInfoUtil_1 = __webpack_require__(/*! ./RelationshipInfoUtil */ "./dist/modules/relationships/RelationshipInfoUtil.js");
 class RelationshipInfoController extends consumption_1.ConsumptionBaseController {
     constructor(parent) {
         super(consumption_1.ConsumptionControllerName.RelationshipInfoController, parent);
@@ -700,16 +700,29 @@ class RelationshipInfoController extends consumption_1.ConsumptionBaseController
         return result ? await RelationshipInfo_1.RelationshipInfo.from(result) : undefined;
     }
     async getRelationshipInfoByRelationship(relationshipId) {
-        const result = await this.relationshipInfo.findOne({ relationshipId: relationshipId.toString() });
-        return result ? await RelationshipInfo_1.RelationshipInfo.from(result) : undefined;
+        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 current = await this.getRelationshipInfoByRelationship(relationshipInfo.relationshipId);
-        if (current) {
+        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);
@@ -731,119 +744,86 @@ exports.RelationshipInfoController = RelationshipInfoController;
 
 /***/ }),
 
-/***/ "./dist/modules/relationships/SingleRelationshipController.js":
-/*!********************************************************************!*\
-  !*** ./dist/modules/relationships/SingleRelationshipController.js ***!
-  \********************************************************************/
+/***/ "./dist/modules/relationships/RelationshipInfoUtil.js":
+/*!************************************************************!*\
+  !*** ./dist/modules/relationships/RelationshipInfoUtil.js ***!
+  \************************************************************/
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SingleRelationshipController = void 0;
+exports.RelationshipInfoUtil = void 0;
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const consumption_1 = __webpack_require__(/*! ../../consumption */ "./dist/consumption/index.js");
 const SharedItem_1 = __webpack_require__(/*! ../sharedItems/local/SharedItem */ "./dist/modules/sharedItems/local/SharedItem.js");
 const RelationshipAttribute_1 = __webpack_require__(/*! ./local/RelationshipAttribute */ "./dist/modules/relationships/local/RelationshipAttribute.js");
 const RelationshipInfo_1 = __webpack_require__(/*! ./local/RelationshipInfo */ "./dist/modules/relationships/local/RelationshipInfo.js");
-class SingleRelationshipController extends consumption_1.ConsumptionBaseController {
+class RelationshipInfoUtil {
     constructor(parent) {
-        super(consumption_1.ConsumptionControllerName.SingleRelationshipController, parent);
-    }
-    get relationship() {
-        return this._relationship;
+        this.parent = parent;
+        this._log = transport_1.TransportLoggerFactory.getLogger(RelationshipInfoUtil);
     }
-    get info() {
-        return this._info;
-    }
-    get attributeMap() {
-        return this._attributeMap;
+    get log() {
+        return this._log;
     }
-    async initWithRelationshipId(id) {
+    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);
         }
-        return await this.initWithRelationship(relationship);
-    }
-    async initWithRelationship(relationship) {
-        await super.init();
-        this._relationship = relationship;
-        const info = await this.parent.relationshipInfo.getRelationshipInfoByRelationship(this.relationship.id);
-        if (!info) {
-            await this.initialFill();
-        }
-        else {
-            const attributeMap = new Map();
-            for (const item of info.attributes) {
-                attributeMap.set(item.name, item);
-            }
-            this._attributeMap = attributeMap;
-            this._info = info;
-        }
-        return this;
-    }
-    async initialFill() {
-        const relationship = await this.parent.accountController.relationships.getRelationship(this._relationship.id);
-        if (!relationship) {
-            throw transport_1.TransportErrors.general
-                .recordNotFound(transport_1.Relationship, this._relationship.id.toString())
-                .logWith(this._log);
-        }
-        this._relationship = relationship;
         const template = await this.parent.accountController.relationshipTemplates.getRelationshipTemplate(relationship.cache.template.id);
         if (!template) {
             throw transport_1.TransportErrors.general
                 .recordNotFound(transport_1.RelationshipTemplate, relationship.cache.template.id.toString())
                 .logWith(this._log);
         }
-        await this.parseTemplateBody(template);
-        await this.parseCreationRequest();
-        this._info = await this.updateRelationshipInfo();
-        return this;
+        await this.parseTemplateBody(relationship, template);
+        await this.parseCreationRequest(relationship);
+        return await this.createRelationshipInfo(relationship);
     }
-    getTitle() {
+    getTitle(relationship, attributeMap) {
         var _a, _b, _c, _d, _e, _f;
-        let title = this.relationship.peer.address.toString().substr(3, 6);
-        const thingname = (_a = this.attributeMap.get("Thing.name")) === null || _a === void 0 ? void 0 : _a.content.value;
-        const firstname = (_b = this.attributeMap.get("Person.firstname")) === null || _b === void 0 ? void 0 : _b.content.value;
-        const lastname = (_c = this.attributeMap.get("Person.lastname")) === null || _c === void 0 ? void 0 : _c.content.value;
-        const gender = (_d = this.attributeMap.get("Person.gender")) === null || _d === void 0 ? void 0 : _d.content.value;
-        const orgname = (_e = this.attributeMap.get("Organization.name")) === null || _e === void 0 ? void 0 : _e.content.value;
-        const legalname = (_f = this.attributeMap.get("Organization.legalname")) === null || _f === void 0 ? void 0 : _f.content.value;
-        if (thingname) {
-            title = thingname;
+        let title = relationship.peer.address.toString().substring(3, 9);
+        const thingName = (_a = attributeMap.get("Thing.name")) === null || _a === void 0 ? void 0 : _a.content.value;
+        const givenName = (_b = attributeMap.get("Person.givenName")) === null || _b === void 0 ? void 0 : _b.content.value;
+        const familyName = (_c = attributeMap.get("Person.familyName")) === null || _c === void 0 ? void 0 : _c.content.value;
+        const gender = (_d = attributeMap.get("Person.gender")) === null || _d === void 0 ? void 0 : _d.content.value;
+        const orgname = (_e = attributeMap.get("Organization.name")) === null || _e === void 0 ? void 0 : _e.content.value;
+        const legalName = (_f = attributeMap.get("Organization.legalname")) === null || _f === void 0 ? void 0 : _f.content.value;
+        if (thingName) {
+            title = thingName;
+        }
+        else if (givenName && familyName) {
+            title = `${givenName} ${familyName}`;
         }
-        else if (firstname && lastname) {
-            title = `${firstname} ${lastname}`;
+        else if (givenName) {
+            title = givenName;
         }
-        else if (lastname && gender) {
-            title = `~~gender.salutation.${gender}~~ ${lastname}`;
+        else if (familyName && gender) {
+            title = `i18n://salutation.gender.${gender} ${familyName}`;
         }
         else if (orgname) {
             title = orgname;
         }
-        else if (legalname) {
-            title = legalname;
+        else if (legalName) {
+            title = legalName;
         }
         return title;
     }
-    async updateRelationshipInfo() {
-        let info = await this.parent.relationshipInfo.getRelationshipInfoByRelationship(this.relationship.id);
-        if (!info) {
-            const peerAddress = this.relationship.peer.address;
-            const truncatedAddress = peerAddress.address.substr(3, 6);
-            info = await RelationshipInfo_1.RelationshipInfo.from({
-                attributes: [],
-                id: await consumption_1.ConsumptionIds.relationshipInfo.generate(),
-                isPinned: false,
-                relationshipId: this.relationship.id,
-                title: truncatedAddress
-            });
-            info = await this.parent.relationshipInfo.createRelationshipInfo(info);
-        }
+    async createRelationshipInfo(relationship) {
+        const peerAddress = relationship.peer.address;
+        const truncatedAddress = peerAddress.address.substring(3, 9);
+        const info = await 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: this.relationship.peer.address.toString()
+            sharedBy: relationship.peer.address.toString()
         });
         const attributes = [];
         const attributeMap = new Map();
@@ -858,87 +838,110 @@ class SingleRelationshipController extends consumption_1.ConsumptionBaseControll
                 attributeMap.set(relAttr.name, relAttr);
             }
         }
-        this._attributeMap = attributeMap;
         info.attributes = attributes;
-        const title = this.getTitle();
+        const title = this.getTitle(relationship, attributeMap);
         info.title = title;
-        await this.parent.relationshipInfo.updateRelationshipInfo(info);
+        // await this.parent.relationshipInfo.updateRelationshipInfo(info)
         return info;
     }
-    async parseTemplateBody(template) {
+    async parseTemplateBody(relationship, template) {
         if (!template.cache) {
             throw transport_1.TransportErrors.general.cacheEmpty(transport_1.RelationshipTemplate, template.id.toString()).logWith(this._log);
         }
-        const isTemplator = this.parent.accountController.identity.isMe(template.cache.createdBy);
         if (template.cache.content instanceof content_1.RelationshipTemplateBody) {
+            const isTemplator = this.parent.accountController.identity.isMe(template.cache.createdBy);
             const body = template.cache.content;
             const attributes = body.sharedAttributes;
             if (attributes) {
                 const sharedAt = template.cache.createdAt;
                 const sharedBy = isTemplator
                     ? this.parent.accountController.identity.address
-                    : this.relationship.peer.address;
+                    : relationship.peer.address;
                 const sharedWith = isTemplator
-                    ? this.relationship.peer.address
+                    ? relationship.peer.address
                     : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await 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
+                const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+                    reference: template.id.toString()
+                });
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    const missingItems = [];
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
+                    for (const attribute of missingItems) {
+                        const sharedItem = await 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() {
-        const request = this.relationship.cache.creationChange.request;
-        if (!request.content) {
-            const error = new Error("error.consumption.noRequestContent");
-            this._log.error(error);
-            throw error;
-        }
-        let isRequestor = false;
-        if (this.parent.accountController.identity.isMe(request.createdBy)) {
-            isRequestor = true;
+        else {
+            // do nothing, we don't know the content
         }
+    }
+    async parseCreationRequest(relationship) {
+        const change = relationship.cache.creationChange;
+        const request = change.request;
         if (request.content instanceof content_1.RelationshipCreationChangeRequestBody) {
+            const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
             const body = request.content;
             const attributes = body.sharedAttributes;
-            if (attributes) {
+            if (attributes && attributes.length > 0) {
                 const sharedAt = request.createdAt;
                 const sharedBy = isRequestor
                     ? this.parent.accountController.identity.address
-                    : this.relationship.peer.address;
+                    : relationship.peer.address;
                 const sharedWith = isRequestor
-                    ? this.relationship.peer.address
+                    ? relationship.peer.address
                     : this.parent.accountController.identity.address;
-                for (const attribute of attributes) {
-                    const sharedItem = await SharedItem_1.SharedItem.from({
-                        id: await consumption_1.ConsumptionIds.sharedItem.generate(),
-                        content: attribute,
-                        sharedAt: sharedAt,
-                        sharedBy: sharedBy,
-                        sharedWith: sharedWith,
-                        reference: this.relationship.id,
-                        expiresAt: attribute.validTo
+                const sharedItemsWithSameReference = await this.parent.sharedItems.getSharedItems({
+                    reference: change.id.toString()
+                });
+                if (sharedItemsWithSameReference.length !== attributes.length) {
+                    const missingItems = [];
+                    attributes.forEach((attribute) => {
+                        if (!sharedItemsWithSameReference.find(function (item) {
+                            const content = item.content;
+                            return content.name === attribute.name;
+                        })) {
+                            missingItems.push(attribute);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
+                    for (const attribute of missingItems) {
+                        const sharedItem = await 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);
+                    }
                 }
             }
         }
         else {
-            throw new Error("Request.content.content is no RelationshipCreationChangeRequestBody");
+            // do nothing, we don't know the content
         }
     }
 }
-exports.SingleRelationshipController = SingleRelationshipController;
-//# sourceMappingURL=SingleRelationshipController.js.map
+exports.RelationshipInfoUtil = RelationshipInfoUtil;
+//# sourceMappingURL=RelationshipInfoUtil.js.map
 
 /***/ }),
 
@@ -1041,7 +1044,7 @@ let RelationshipInfo = RelationshipInfo_1 = class RelationshipInfo extends trans
                 relationshipId: relationship.id,
                 attributes: [],
                 isPinned: false,
-                title: relationship.peer.address.address.substr(3, 6)
+                title: relationship.peer.address.address.substring(3, 9)
             });
         }
         return await RelationshipInfo_1.from(relationship.metadata);