@nmshd/consumption 1.0.7 → 1.0.11

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.7",
-    build: "9",
-    date: "2021-12-21T11:15:38+00:00",
-    commit: "e78278e1413f85e42e794e13e6d65b9c51906bc1",
+    version: "1.0.11",
+    build: "13",
+    date: "2021-12-29T14:32:15+00:00",
+    commit: "be407a6eedf0b92497314484fefd282be5ba6254",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,
@@ -700,13 +700,21 @@ 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() });
-        if (result) {
-            return await RelationshipInfo_1.RelationshipInfo.from(result);
-        }
         const info = await new RelationshipInfoUtil_1.RelationshipInfoUtil(this.parent).createInitialRelationshipInfo(relationshipId);
-        await this.relationshipInfo.create(info);
         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);
@@ -745,6 +753,7 @@ exports.RelationshipInfoController = RelationshipInfoController;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RelationshipInfoUtil = void 0;
+const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 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");
@@ -764,53 +773,50 @@ class RelationshipInfoUtil {
         if (!relationship) {
             throw transport_1.TransportErrors.general.recordNotFound(transport_1.Relationship, id.toString()).logWith(this._log);
         }
-        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(relationship, template);
+        await this.parseTemplateBody(relationship);
         await this.parseCreationRequest(relationship);
         return await this.createRelationshipInfo(relationship);
     }
     getTitle(relationship, attributeMap) {
         var _a, _b, _c, _d, _e, _f;
         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 firstname = (_b = attributeMap.get("Person.firstname")) === null || _b === void 0 ? void 0 : _b.content.value;
-        const lastname = (_c = attributeMap.get("Person.lastname")) === null || _c === void 0 ? void 0 : _c.content.value;
+        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;
+        const legalName = (_f = attributeMap.get("Organization.legalname")) === null || _f === void 0 ? void 0 : _f.content.value;
+        if (thingName) {
+            title = thingName;
         }
-        else if (firstname && lastname) {
-            title = `${firstname} ${lastname}`;
+        else if (givenName && familyName) {
+            title = `${givenName} ${familyName}`;
         }
-        else if (lastname && gender) {
-            title = `~~gender.salutation.${gender}~~ ${lastname}`;
+        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;
+        else if (legalName) {
+            title = legalName;
         }
         return title;
     }
     async createRelationshipInfo(relationship) {
         const peerAddress = relationship.peer.address;
         const truncatedAddress = peerAddress.address.substring(3, 9);
-        let info = await RelationshipInfo_1.RelationshipInfo.from({
+        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);
+        // info = await this.parent.relationshipInfo.createRelationshipInfo(info)
         const items = await this.parent.sharedItems.getSharedItems({
             sharedBy: relationship.peer.address.toString()
         });
@@ -830,75 +836,135 @@ class RelationshipInfoUtil {
         info.attributes = attributes;
         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(relationship, template) {
+    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);
-        if (template.cache.content instanceof content_1.RelationshipTemplateBody) {
-            const body = template.cache.content;
+        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) {
-                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;
-                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
+                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 || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldTemplateBody = oldTemplateBody.value;
+            }
+            if ((oldTemplateBody === null || oldTemplateBody === void 0 ? void 0 : 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
+                            }));
+                        }
                     });
-                    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(relationship) {
-        const request = relationship.cache.creationChange.request;
-        if (!request.content) {
-            const error = new Error("error.consumption.noRequestContent");
-            this._log.error(error);
-            throw error;
-        }
+        const change = relationship.cache.creationChange;
+        const request = change.request;
+        const body = request.content;
         const isRequestor = this.parent.accountController.identity.isMe(request.createdBy);
-        if (request.content instanceof content_1.RelationshipCreationChangeRequestBody) {
-            const body = request.content;
+        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) {
-                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;
-                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: relationship.id,
-                        expiresAt: attribute.validTo
+            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);
+                        }
                     });
-                    await this.parent.sharedItems.createSharedItem(sharedItem);
                 }
             }
         }
         else {
-            throw new Error("Request.content.content is no RelationshipCreationChangeRequestBody");
+            // Try to parse the old request format (without types)
+            let oldRequestBody = body;
+            if (body instanceof ts_serval_1.JSONWrapper || body instanceof ts_serval_1.JSONWrapperAsync) {
+                oldRequestBody = oldRequestBody.value;
+            }
+            if (oldRequestBody === null || oldRequestBody === void 0 ? void 0 : 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 = 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);
         }
     }
 }