@nmshd/consumption 2.0.0-beta.21 → 2.0.0-beta.23

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: "2.0.0-beta.21",
-    build: "73",
-    date: "2022-09-20T13:25:15+00:00",
-    commit: "79868cf6eb51c013e5c41ecd77b3d12d8cfd1b0c",
+    version: "2.0.0-beta.23",
+    build: "75",
+    date: "2022-09-22T07:26:01+00:00",
+    commit: "d236f8080e45bc388cbf4bb982d662e47bfe96e7",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -178,6 +178,9 @@ class Attributes {
     predecessorNotFound(id) {
         return new transport_1.CoreError("error.consumption.attributes.predecessorNotFound", `Attribute with id '${id}' does not exist. Please use create instead.`);
     }
+    cannotSucceedAttributesWithAParent(parentId) {
+        return new transport_1.CoreError("error.consumption.attributes.cannotSucceedAttributesWithAParent", `The Attribute you want to succeed has a parent (id: ${parentId.toString()}). You cannot succeed Attributes with a parent. Instead, succeed the parent, which will implicitly succeed all its children.`);
+    }
 }
 class Requests {
     constructor() {
@@ -681,26 +684,54 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
         return this.parseArray(attributes, LocalAttribute_1.LocalAttribute);
     }
     async createLocalAttribute(params) {
-        const localAttribute = await LocalAttribute_1.LocalAttribute.fromAttribute(params.content);
+        const localAttribute = LocalAttribute_1.LocalAttribute.from({
+            id: await consumption_1.ConsumptionIds.attribute.generate(),
+            createdAt: transport_1.CoreDate.utc(),
+            content: params.content,
+            parentId: params.parentId
+        });
         await this.attributes.create(localAttribute);
+        if (localAttribute.content instanceof content_1.IdentityAttribute && // nested Local Attributes should only be created for Identity Attributes
+            localAttribute.content.value instanceof content_1.AbstractComplexValue) {
+            await this.createLocalAttributesForNestedAttributeValues(localAttribute);
+        }
         this.eventBus.publish(new events_1.AttributeCreatedEvent(this.identity.address.toString(), localAttribute));
         return localAttribute;
     }
+    async createLocalAttributesForNestedAttributeValues(localAttribute) {
+        if (!(localAttribute.content instanceof content_1.IdentityAttribute)) {
+            throw new Error("Only Identity Attributes are allowed here");
+        }
+        const attributeValueAsAny = localAttribute.content.value;
+        const nestedAttributeValues = Object.keys(localAttribute.content.value)
+            .map((k) => attributeValueAsAny[k])
+            .filter((p) => p instanceof content_1.AbstractAttributeValue);
+        for (const propertyValue of nestedAttributeValues) {
+            const nestedAttribute = content_1.IdentityAttribute.from({
+                ...localAttribute.content.toJSON(),
+                value: propertyValue.toJSON()
+            });
+            await this.createLocalAttribute({ content: nestedAttribute, parentId: localAttribute.id });
+        }
+    }
     async succeedLocalAttribute(params) {
         const parsedParams = SucceedLocalAttributeParams_1.SucceedLocalAttributeParams.from(params);
-        const current = await this.attributes.findOne({
+        const currentAttributeDoc = await this.attributes.findOne({
             [(0, ts_simple_nameof_1.nameof)((c) => c.id)]: params.succeeds.toString()
         });
-        if (!current) {
+        const currentAttribute = LocalAttribute_1.LocalAttribute.from(currentAttributeDoc);
+        if (currentAttribute.parentId) {
+            throw consumption_1.ConsumptionErrors.attributes.cannotSucceedAttributesWithAParent(parsedParams.succeeds.toString());
+        }
+        if (!currentAttributeDoc) {
             throw consumption_1.ConsumptionErrors.attributes.predecessorNotFound(parsedParams.succeeds.toString());
         }
         if (!parsedParams.successorContent.validFrom) {
             parsedParams.successorContent.validFrom = transport_1.CoreDate.utc();
         }
         const validFrom = parsedParams.successorContent.validFrom;
-        const currentUpdated = LocalAttribute_1.LocalAttribute.from(current);
-        currentUpdated.content.validTo = validFrom.subtract(1);
-        await this.attributes.update(current, currentUpdated);
+        currentAttribute.content.validTo = validFrom.subtract(1);
+        await this.attributes.update(currentAttributeDoc, currentAttribute);
         const successor = await LocalAttribute_1.LocalAttribute.fromAttribute(parsedParams.successorContent, parsedParams.succeeds);
         await this.attributes.create(successor);
         this.eventBus.publish(new events_1.AttributeSucceededEvent(this.identity.address.toString(), successor));
@@ -965,6 +996,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.CreateLocalAttributeParams = 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");
 class CreateLocalAttributeParams extends ts_serval_1.Serializable {
     static from(value) {
         return this.fromAny(value);
@@ -975,6 +1007,11 @@ __decorate([
     (0, ts_serval_1.validate)(),
     __metadata("design:type", Object)
 ], CreateLocalAttributeParams.prototype, "content", void 0);
+__decorate([
+    (0, ts_serval_1.serialize)({ optional: true }),
+    (0, ts_serval_1.validate)(),
+    __metadata("design:type", transport_1.CoreId)
+], CreateLocalAttributeParams.prototype, "parentId", void 0);
 exports.CreateLocalAttributeParams = CreateLocalAttributeParams;
 //# sourceMappingURL=CreateLocalAttributeParams.js.map
 
@@ -1123,19 +1160,35 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
     isIdentityAttribute() {
         return this.content instanceof content_1.IdentityAttribute;
     }
+    isRelationshipAttribute() {
+        return this.content instanceof content_1.RelationshipAttribute;
+    }
     isOwnedBy(identity) {
         return this.content.owner.equals(identity);
     }
+    isRepositoryAttribute() {
+        return this.isIdentityAttribute() && !this.isShared();
+    }
+    isShared() {
+        return this.shareInfo !== undefined;
+    }
+    isSharedWith(address) {
+        if (!this.isShared()) {
+            return false;
+        }
+        return this.shareInfo.peer === address;
+    }
     static from(value) {
         return this.fromAny(value);
     }
-    static async fromAttribute(attribute, succeeds, shareInfo, id) {
+    static async fromAttribute(content, succeeds, shareInfo, id, parentId) {
         return this.from({
             id: id ?? (await consumption_1.ConsumptionIds.attribute.generate()),
-            content: attribute,
             createdAt: transport_1.CoreDate.utc(),
-            succeeds: succeeds,
-            shareInfo: shareInfo
+            content,
+            succeeds,
+            shareInfo,
+            parentId
         });
     }
 };
@@ -1164,6 +1217,11 @@ __decorate([
     (0, ts_serval_1.serialize)(),
     __metadata("design:type", LocalAttributeShareInfo_1.LocalAttributeShareInfo)
 ], LocalAttribute.prototype, "shareInfo", void 0);
+__decorate([
+    (0, ts_serval_1.validate)({ nullable: true }),
+    (0, ts_serval_1.serialize)(),
+    __metadata("design:type", transport_1.CoreId)
+], LocalAttribute.prototype, "parentId", void 0);
 LocalAttribute = __decorate([
     (0, ts_serval_1.type)("LocalAttribute")
 ], LocalAttribute);
@@ -2179,16 +2237,19 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         return request;
     }
     async getIncomingRequests(query) {
-        query ??= {};
-        query.isOwn = false;
-        const requestDocs = await this.localRequests.find(query);
-        const requests = requestDocs.map((r) => LocalRequest_1.LocalRequest.from(r));
-        return requests;
+        const requestDocs = await this.localRequests.find({
+            ...query,
+            isOwn: false
+        });
+        const requestPromises = requestDocs.map((r) => this.updateRequestExpiry(LocalRequest_1.LocalRequest.from(r)));
+        return await Promise.all(requestPromises);
     }
     async getIncomingRequest(idIncomingRequest) {
         const requestDoc = await this.localRequests.findOne({ id: idIncomingRequest.toString(), isOwn: false });
-        const request = requestDoc ? LocalRequest_1.LocalRequest.from(requestDoc) : undefined;
-        return request;
+        if (!requestDoc)
+            return;
+        const localRequest = LocalRequest_1.LocalRequest.from(requestDoc);
+        return await this.updateRequestExpiry(localRequest);
     }
     async getOrThrow(id) {
         const request = await this.getIncomingRequest(transport_1.CoreId.from(id));
@@ -2209,6 +2270,12 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
             throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
+    async updateRequestExpiry(request) {
+        const statusUpdated = request.updateStatusBasedOnExpiration();
+        if (statusUpdated)
+            await this.update(request);
+        return request;
+    }
 }
 exports.IncomingRequestsController = IncomingRequestsController;
 //# sourceMappingURL=IncomingRequestsController.js.map
@@ -3410,6 +3477,8 @@ LocalRequestSource = __decorate([
 exports.LocalRequestSource = LocalRequestSource;
 let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     changeStatus(newStatus) {
+        if (this.status === newStatus)
+            throw new Error("cannot change status to the same status");
         const logEntry = LocalRequestStatusLogEntry_1.LocalRequestStatusLogEntry.from({
             createdAt: transport_1.CoreDate.utc(),
             oldStatus: this.status,
@@ -3428,6 +3497,20 @@ let LocalRequest = class LocalRequest extends transport_1.CoreSynchronizable {
     static from(value) {
         return this.fromAny(value);
     }
+    isExpired(comparisonDate = transport_1.CoreDate.utc()) {
+        if (!this.content.expiresAt)
+            return false;
+        return comparisonDate.isAfter(this.content.expiresAt.add({ seconds: 10 }));
+    }
+    updateStatusBasedOnExpiration(comparisonDate = transport_1.CoreDate.utc()) {
+        if (this.status === LocalRequestStatus_1.LocalRequestStatus.Completed || this.status === LocalRequestStatus_1.LocalRequestStatus.Expired)
+            return false;
+        if (this.isExpired(comparisonDate)) {
+            this.changeStatus(LocalRequestStatus_1.LocalRequestStatus.Expired);
+            return true;
+        }
+        return false;
+    }
 };
 __decorate([
     (0, ts_serval_1.serialize)(),
@@ -3495,6 +3578,7 @@ var LocalRequestStatus;
     LocalRequestStatus["ManualDecisionRequired"] = "ManualDecisionRequired";
     LocalRequestStatus["Decided"] = "Decided";
     LocalRequestStatus["Completed"] = "Completed";
+    LocalRequestStatus["Expired"] = "Expired";
 })(LocalRequestStatus = exports.LocalRequestStatus || (exports.LocalRequestStatus = {}));
 //# sourceMappingURL=LocalRequestStatus.js.map
 
@@ -3789,7 +3873,13 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async _complete(requestId, responseSourceObject, receivedResponse) {
         const request = await this.getOrThrow(requestId);
-        this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Open);
+        this.assertRequestStatus(request, LocalRequestStatus_1.LocalRequestStatus.Open, LocalRequestStatus_1.LocalRequestStatus.Expired);
+        const responseSourceObjectCreationDate = responseSourceObject instanceof transport_1.Message
+            ? responseSourceObject.cache.createdAt
+            : responseSourceObject.request.createdAt;
+        if (request.status === LocalRequestStatus_1.LocalRequestStatus.Expired && request.isExpired(responseSourceObjectCreationDate)) {
+            throw new Error("Cannot complete an expired request with a response that was created before the expiration date");
+        }
         const canComplete = await this.canComplete(request, receivedResponse);
         if (canComplete.isError()) {
             throw canComplete.error;
@@ -3859,11 +3949,12 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         await processor.applyIncomingResponseItem(responseItem, requestItem, request);
     }
     async getOutgoingRequests(query) {
-        query ??= {};
-        query.isOwn = true;
-        const requestDocs = await this.localRequests.find(query);
-        const requests = requestDocs.map((r) => LocalRequest_1.LocalRequest.from(r));
-        return requests;
+        const requestDocs = await this.localRequests.find({
+            ...query,
+            isOwn: true
+        });
+        const requestPromises = requestDocs.map((r) => this.updateRequestExpiry(LocalRequest_1.LocalRequest.from(r)));
+        return await Promise.all(requestPromises);
     }
     async discardOutgoingRequest(id) {
         const request = await this.getOrThrow(id);
@@ -3872,8 +3963,10 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
     }
     async getOutgoingRequest(id) {
         const requestDoc = await this.localRequests.findOne({ id: id.toString(), isOwn: true });
-        const request = requestDoc ? LocalRequest_1.LocalRequest.from(requestDoc) : undefined;
-        return request;
+        if (!requestDoc)
+            return;
+        const localRequest = LocalRequest_1.LocalRequest.from(requestDoc);
+        return await this.updateRequestExpiry(localRequest);
     }
     async getOrThrow(id) {
         const request = await this.getOutgoingRequest(id);
@@ -3894,6 +3987,12 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
             throw new Error(`Local Request has to be in status '${status.join("/")}'.`);
         }
     }
+    async updateRequestExpiry(request) {
+        const statusUpdated = request.updateStatusBasedOnExpiration();
+        if (statusUpdated)
+            await this.update(request);
+        return request;
+    }
 }
 exports.OutgoingRequestsController = OutgoingRequestsController;
 //# sourceMappingURL=OutgoingRequestsController.js.map