@nmshd/consumption 2.0.0-alpha.5 → 2.0.0-alpha.8

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-alpha.5",
-    build: "23",
-    date: "2022-04-29T08:19:49+00:00",
-    commit: "48d18c4c35feaf8dedbc452ed5b085aaaa29d5ce",
+    version: "2.0.0-alpha.8",
+    build: "26",
+    date: "2022-05-05T12:20:20+00:00",
+    commit: "c699fbc6fc9984848f31155fdf1713706bdfffe5",
     dependencies: {},
     libraries: {
         transport: transport_1.buildInformation,
@@ -110,8 +110,8 @@ class ConsumptionController {
         this._attributes = await new modules_1.ConsumptionAttributesController(this).init();
         this._drafts = await new modules_1.DraftsController(this).init();
         const processorRegistry = new modules_1.RequestItemProcessorRegistry(requestItemProcessors);
-        this._outgoingRequests = await new modules_1.OutgoingRequestsController(this, processorRegistry).init();
-        this._incomingRequests = await new IncomingRequestsController_1.IncomingRequestsController(this, processorRegistry).init();
+        this._outgoingRequests = await new modules_1.OutgoingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this).init();
+        this._incomingRequests = await new IncomingRequestsController_1.IncomingRequestsController(await this.accountController.getSynchronizedCollection("Requests"), processorRegistry, this).init();
         this._settings = await new modules_1.SettingsController(this).init();
         this._sharedItems = await new modules_1.SharedItemsController(this).init();
         this._relationshipInfo = await new modules_1.RelationshipInfoController(this).init();
@@ -1233,13 +1233,67 @@ exports.RelationshipTheme = RelationshipTheme;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.DecideRequestParametersValidator = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
+const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
+const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const DecideRequestItemGroupParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js");
+const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js");
 class DecideRequestParametersValidator {
     validate(params, request) {
+        if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the request does not match the id of the response"));
+        }
         if (params.items.length !== request.content.items.length) {
-            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("invalidNumberOfItems", "Number of items in Request and Response do not match"));
+            return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in Request and Response do not match"));
+        }
+        for (let i = 0; i < params.items.length; i++) {
+            const validationResult = this.checkItemOrGroup(request.content.items[i], params.items[i], i.toString(), params.accept);
+            if (validationResult.isError)
+                return validationResult;
         }
         return ts_utils_1.Result.ok(undefined);
     }
+    checkItemOrGroup(requestItem, responseItem, index, isParentAccepted) {
+        if (requestItem instanceof content_1.RequestItem) {
+            return this.checkItem(requestItem, responseItem, index, isParentAccepted);
+        }
+        return this.checkItemGroup(requestItem, responseItem, index, isParentAccepted);
+    }
+    checkItem(requestItem, response, index, isParentAccepted) {
+        if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was answered as a RequestItemGroup.`));
+        }
+        if (!isParentAccepted && response.accept) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}' was accepted, but the parent was not accepted.`));
+        }
+        if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItem with index '${index}', which is flagged as 'mustBeAccepted', was not accepted.`));
+        }
+        return ts_utils_1.Result.ok(undefined);
+    }
+    checkItemGroup(requestItemGroup, responseItemGroup, index, isParentAccepted) {
+        if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was answered as a RequestItem.`));
+        }
+        if (responseItemGroup.items.length !== requestItemGroup.items.length) {
+            return ts_utils_1.Result.fail(this.invalidNumberOfItemsError("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
+        }
+        const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
+        if (!isParentAccepted && isGroupAccepted) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}' was accepted, but the parent was not accepted.`));
+        }
+        if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
+            return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidResponseItemForRequestItem", `The RequestItemGroup with index '${index}', which is flagged as 'mustBeAccepted', was not accepted. Please accept all 'mustBeAccepted' items in this group.`));
+        }
+        for (let i = 0; i < responseItemGroup.items.length; i++) {
+            const validationResult = this.checkItem(requestItemGroup.items[i], responseItemGroup.items[i], `${index}.${i}`, isGroupAccepted);
+            if (validationResult.isError)
+                return validationResult;
+        }
+        return ts_utils_1.Result.ok(undefined);
+    }
+    invalidNumberOfItemsError(message) {
+        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
+    }
 }
 exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
 //# sourceMappingURL=DecideRequestParametersValidator.js.map
@@ -1270,21 +1324,17 @@ const DecideRequestParametersValidator_1 = __webpack_require__(/*! ./DecideReque
 const ReceivedIncomingRequestParameters_1 = __webpack_require__(/*! ./received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js");
 const RequireManualDecisionOfIncomingRequestParameters_1 = __webpack_require__(/*! ./requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js");
 class IncomingRequestsController extends consumption_1.ConsumptionBaseController {
-    constructor(parent, processorRegistry) {
+    constructor(consumptionRequests, processorRegistry, parent) {
         super(consumption_1.ConsumptionControllerName.RequestsController, parent);
+        this.consumptionRequests = consumptionRequests;
         this.processorRegistry = processorRegistry;
         this.decideRequestParamsValidator = new DecideRequestParametersValidator_1.DecideRequestParametersValidator();
     }
-    async init() {
-        await super.init();
-        this.consumptionRequests = await this.parent.accountController.getSynchronizedCollection("Requests");
-        return this;
-    }
     async received(params) {
         const parsedParams = ReceivedIncomingRequestParameters_1.ReceivedIncomingRequestParameters.from(params);
         const infoFromSource = this.extractInfoFromSource(parsedParams.requestSourceObject);
         const consumptionRequest = ConsumptionRequest_1.ConsumptionRequest.from({
-            id: parsedParams.receivedRequest.id ?? (await transport_1.CoreId.generate()),
+            id: parsedParams.receivedRequest.id ?? (await consumption_1.ConsumptionIds.request.generate()),
             createdAt: transport_1.CoreDate.utc(),
             status: ConsumptionRequestStatus_1.ConsumptionRequestStatus.Open,
             content: parsedParams.receivedRequest,
@@ -1359,7 +1409,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         return request;
     }
     async canAccept(params) {
-        return await this.canDecide({ ...params, accept: false });
+        return await this.canDecide({ ...params, accept: true });
     }
     async canReject(params) {
         return await this.canDecide({ ...params, accept: false });
@@ -1408,7 +1458,7 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         if (!canAccept.isSuccess()) {
             throw new Error("Cannot accept the Request with the given parameters. Call 'canAccept' to get more information.");
         }
-        return await this.decide({ ...params, accept: false });
+        return await this.decide({ ...params, accept: true });
     }
     async reject(params) {
         const canReject = await this.canReject(params);
@@ -1503,13 +1553,20 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
         await this.update(request);
         return request;
     }
-    async get(id) {
-        const requestDoc = await this.consumptionRequests.findOne({ id: id.toString(), isOwn: false });
+    async getIncomingRequests(query) {
+        query ??= {};
+        query.isOwn = false;
+        const requestDocs = await this.consumptionRequests.find(query);
+        const requests = requestDocs.map((r) => ConsumptionRequest_1.ConsumptionRequest.from(r));
+        return requests;
+    }
+    async getIncomingRequest(idIncomingRequest) {
+        const requestDoc = await this.consumptionRequests.findOne({ id: idIncomingRequest.toString(), isOwn: false });
         const request = requestDoc ? ConsumptionRequest_1.ConsumptionRequest.from(requestDoc) : undefined;
         return request;
     }
     async getOrThrow(id) {
-        const request = await this.get(transport_1.CoreId.from(id));
+        const request = await this.getIncomingRequest(transport_1.CoreId.from(id));
         if (!request) {
             throw transport_1.TransportErrors.general.recordNotFound(ConsumptionRequest_1.ConsumptionRequest, id.toString());
         }
@@ -1635,6 +1692,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isDecideRequestItemGroupParametersJSON = void 0;
+function isDecideRequestItemGroupParametersJSON(json) {
+    return typeof json.items !== "undefined" && typeof json.accept === "undefined";
+}
+exports.isDecideRequestItemGroupParametersJSON = isDecideRequestItemGroupParametersJSON;
 //# sourceMappingURL=DecideRequestItemGroupParameters.js.map
 
 /***/ }),
@@ -1648,6 +1710,11 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isDecideRequestItemParametersJSON = void 0;
+function isDecideRequestItemParametersJSON(json) {
+    return typeof json.items === "undefined" && typeof json.accept !== "undefined";
+}
+exports.isDecideRequestItemParametersJSON = isDecideRequestItemParametersJSON;
 //# sourceMappingURL=DecideRequestItemParameters.js.map
 
 /***/ }),
@@ -2260,15 +2327,11 @@ const CreateOutgoingRequestFromRelationshipCreationChangeParameters_1 = __webpac
 const CreateOutgoingRequestParameters_1 = __webpack_require__(/*! ./createOutgoingRequest/CreateOutgoingRequestParameters */ "./dist/modules/requests/outgoing/createOutgoingRequest/CreateOutgoingRequestParameters.js");
 const SentOutgoingRequestParameters_1 = __webpack_require__(/*! ./sentOutgoingRequest/SentOutgoingRequestParameters */ "./dist/modules/requests/outgoing/sentOutgoingRequest/SentOutgoingRequestParameters.js");
 class OutgoingRequestsController extends consumption_1.ConsumptionBaseController {
-    constructor(parent, processorRegistry) {
+    constructor(consumptionRequests, processorRegistry, parent) {
         super(consumption_1.ConsumptionControllerName.RequestsController, parent);
+        this.consumptionRequests = consumptionRequests;
         this.processorRegistry = processorRegistry;
     }
-    async init() {
-        await super.init();
-        this.consumptionRequests = await this.parent.accountController.getSynchronizedCollection("Requests");
-        return this;
-    }
     async canCreate(params) {
         const parsedParams = CreateOutgoingRequestParameters_1.CreateOutgoingRequestParameters.from(params);
         const innerResults = await this.canCreateItems(parsedParams.content.items);
@@ -2443,13 +2506,20 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         const processor = this.processorRegistry.getProcessorForItem(requestItem);
         await processor.applyIncomingResponseItem(responseItem, requestItem);
     }
-    async get(id) {
+    async getOutgoingRequests(query) {
+        query ??= {};
+        query.isOwn = true;
+        const requestDocs = await this.consumptionRequests.find(query);
+        const requests = requestDocs.map((r) => ConsumptionRequest_1.ConsumptionRequest.from(r));
+        return requests;
+    }
+    async getOutgoingRequest(id) {
         const requestDoc = await this.consumptionRequests.findOne({ id: id.toString(), isOwn: true });
         const request = requestDoc ? ConsumptionRequest_1.ConsumptionRequest.from(requestDoc) : undefined;
         return request;
     }
     async getOrThrow(id) {
-        const request = await this.get(id);
+        const request = await this.getOutgoingRequest(id);
         if (!request) {
             throw transport_1.TransportErrors.general.recordNotFound(ConsumptionRequest_1.ConsumptionRequest, id.toString());
         }