@nmshd/consumption 2.0.0-beta.27 → 2.0.0-beta.29

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.27",
-    build: "79",
-    date: "2022-09-29T11:43:35+00:00",
-    commit: "2d56b0f94fb7544763da2f6220433345cbc9cab4",
+    version: "2.0.0-beta.29",
+    build: "83",
+    date: "2022-10-19T14:10:26+00:00",
+    commit: "f5d9f037ba327b9dc898659c39e158614e4acfdd",
     dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
     libraries: {
         transport: transport_1.buildInformation,
@@ -212,9 +212,6 @@ exports.CoreErrors = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 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.`);
     }
@@ -234,23 +231,20 @@ class Requests {
     }
 }
 Requests._decideValidation = class {
-    invalidRequestId() {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response");
-    }
     invalidNumberOfItems(message) {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.invalidNumberOfItems", message);
     }
     itemAcceptedButParentNotAccepted(message) {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
     }
     mustBeAcceptedItemNotAccepted(message) {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
     }
     requestItemAnsweredAsRequestItemGroup() {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
     }
     requestItemGroupAnsweredAsRequestItem() {
-        return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
+        return new ts_utils_1.ApplicationError("error.consumption.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
     }
 };
 class CoreErrors {
@@ -718,7 +712,7 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
             throw consumption_1.CoreErrors.attributes.cannotSucceedAttributesWithAParent(parsedParams.succeeds.toString());
         }
         if (!currentAttributeDoc) {
-            throw consumption_1.CoreErrors.attributes.predecessorNotFound(parsedParams.succeeds.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, parsedParams.succeeds.toString());
         }
         if (!parsedParams.successorContent.validFrom) {
             parsedParams.successorContent.validFrom = transport_1.CoreDate.utc();
@@ -735,7 +729,7 @@ class AttributesController extends consumption_1.ConsumptionBaseController {
         const parsedParams = CreateSharedLocalAttributeCopyParams_1.CreateSharedLocalAttributeCopyParams.from(params);
         const sourceAttribute = await this.getLocalAttribute(parsedParams.sourceAttributeId);
         if (!sourceAttribute) {
-            throw consumption_1.CoreErrors.attributes.predecessorNotFound(parsedParams.sourceAttributeId.toString());
+            throw transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, parsedParams.sourceAttributeId.toString());
         }
         const shareInfo = LocalAttributeShareInfo_1.LocalAttributeShareInfo.from({
             peer: parsedParams.peer,
@@ -1908,7 +1902,7 @@ const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideReq
 class DecideRequestParametersValidator {
     validate(params, request) {
         if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
-            return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidRequestId());
+            throw new Error("The response is invalid because the id of the Request does not match the id of the Response.");
         }
         if (params.items.length !== request.content.items.length) {
             return ValidationResult_1.ValidationResult.error(consumption_1.CoreErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
@@ -2603,7 +2597,6 @@ __exportStar(__webpack_require__(/*! ./incoming/IncomingRequestsController */ ".
 __exportStar(__webpack_require__(/*! ./incoming/received/ReceivedIncomingRequestParameters */ "./dist/modules/requests/incoming/received/ReceivedIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters */ "./dist/modules/requests/incoming/requireManualDecision/RequireManualDecisionOfIncomingRequestParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/AbstractRequestItemProcessor */ "./dist/modules/requests/itemProcessors/AbstractRequestItemProcessor.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/createAttribute/CreateAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/GenericRequestItemProcessor */ "./dist/modules/requests/itemProcessors/GenericRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/IRequestItemProcessor */ "./dist/modules/requests/itemProcessors/IRequestItemProcessor.js"), exports);
@@ -2614,7 +2607,6 @@ __exportStar(__webpack_require__(/*! ./itemProcessors/readAttribute/ReadAttribut
 __exportStar(__webpack_require__(/*! ./itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor */ "./dist/modules/requests/itemProcessors/registerAttributeListener/RegisterAttributeListenerRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/RequestItemConstructor */ "./dist/modules/requests/itemProcessors/RequestItemConstructor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/RequestItemProcessorRegistry */ "./dist/modules/requests/itemProcessors/RequestItemProcessorRegistry.js"), exports);
-__exportStar(__webpack_require__(/*! ./itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters */ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor */ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js"), exports);
 __exportStar(__webpack_require__(/*! ./itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js"), exports);
 __exportStar(__webpack_require__(/*! ./local/LocalRequest */ "./dist/modules/requests/local/LocalRequest.js"), exports);
@@ -2826,36 +2818,6 @@ exports.ErrorValidationResult = ErrorValidationResult;
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js":
-/*!************************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/createAttribute/AcceptCreateAttributeRequestItemParameters.js ***!
-  \************************************************************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptCreateAttributeRequestItemParameters = void 0;
-const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptCreateAttributeRequestItemParameters = class AcceptCreateAttributeRequestItemParameters extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
-AcceptCreateAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptCreateAttributeRequestItemParameters")
-], AcceptCreateAttributeRequestItemParameters);
-exports.AcceptCreateAttributeRequestItemParameters = AcceptCreateAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptCreateAttributeRequestItemParameters.js.map
-
-/***/ }),
-
 /***/ "./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js":
 /*!*****************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js ***!
@@ -2960,16 +2922,25 @@ const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-s
 const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 const ts_simple_nameof_1 = __webpack_require__(/*! ts-simple-nameof */ "./node_modules/ts-simple-nameof/index.js");
+const consumption_1 = __webpack_require__(/*! ../../../../consumption */ "./dist/consumption/index.js");
 let AcceptProposeAttributeRequestItemParameters = AcceptProposeAttributeRequestItemParameters_1 = class AcceptProposeAttributeRequestItemParameters extends ts_serval_1.Serializable {
+    isWithExistingAttribute() {
+        return this.attributeId !== undefined;
+    }
+    isWithNewAttribute() {
+        return this.attribute !== undefined;
+    }
     static from(value) {
         return this.fromAny(value);
     }
     static postFrom(value) {
-        const typedValue = value;
-        if (typedValue.attributeId && typedValue.attribute) {
+        if (!(value instanceof AcceptProposeAttributeRequestItemParameters_1)) {
+            throw new consumption_1.ConsumptionError("this should never happen");
+        }
+        if (value.attributeId && value.attribute) {
             throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You cannot specify both ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} and ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
-        if (!typedValue.attributeId && !typedValue.attribute) {
+        if (!value.attributeId && !value.attribute) {
             throw new ts_serval_1.ValidationError(AcceptProposeAttributeRequestItemParameters_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.attribute), `You have to specify either ${(0, ts_simple_nameof_1.nameof)((x) => x.attribute)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.attributeId)}.`);
         }
         return value;
@@ -3045,7 +3016,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     async canAccept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
         let attribute = parsedParams.attribute;
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             const localAttribute = await this.consumptionController.attributes.getLocalAttribute(parsedParams.attributeId);
             if (!localAttribute) {
                 return ValidationResult_1.ValidationResult.error(transport_1.CoreErrors.general.recordNotFound(LocalAttribute_1.LocalAttribute, requestInfo.id.toString()));
@@ -3060,7 +3031,7 @@ class ProposeAttributeRequestItemProcessor extends GenericRequestItemProcessor_1
     async accept(_requestItem, params, requestInfo) {
         const parsedParams = AcceptProposeAttributeRequestItemParameters_1.AcceptProposeAttributeRequestItemParameters.from(params);
         let sharedLocalAttribute;
-        if (parsedParams.attributeId) {
+        if (parsedParams.isWithExistingAttribute()) {
             sharedLocalAttribute = await this.copyExistingAttribute(parsedParams.attributeId, requestInfo);
         }
         else {
@@ -3307,36 +3278,6 @@ exports.RegisterAttributeListenerRequestItemProcessor = RegisterAttributeListene
 
 /***/ }),
 
-/***/ "./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js":
-/*!**********************************************************************************************************!*\
-  !*** ./dist/modules/requests/itemProcessors/shareAttribute/AcceptShareAttributeRequestItemParameters.js ***!
-  \**********************************************************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AcceptShareAttributeRequestItemParameters = void 0;
-const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
-let AcceptShareAttributeRequestItemParameters = class AcceptShareAttributeRequestItemParameters extends ts_serval_1.Serializable {
-    static from(value) {
-        return this.fromAny(value);
-    }
-};
-AcceptShareAttributeRequestItemParameters = __decorate([
-    (0, ts_serval_1.type)("AcceptShareAttributeRequestItemParameters")
-], AcceptShareAttributeRequestItemParameters);
-exports.AcceptShareAttributeRequestItemParameters = AcceptShareAttributeRequestItemParameters;
-//# sourceMappingURL=AcceptShareAttributeRequestItemParameters.js.map
-
-/***/ }),
-
 /***/ "./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js":
 /*!***************************************************************************************************!*\
   !*** ./dist/modules/requests/itemProcessors/shareAttribute/ShareAttributeRequestItemProcessor.js ***!
@@ -3819,7 +3760,6 @@ class OutgoingRequestsController extends consumption_1.ConsumptionBaseController
         if (!(templateContent instanceof content_1.RelationshipTemplateContent)) {
             throw new consumption_1.ConsumptionError("The content of the template is not supported as it is not type of RelationshipTemplateContent.");
         }
-        // TODO: is this the correct request (=> could be RelationshipTemplateContent#existingRelationshipRequest)
         await this._create(id, templateContent.onNewRelationship, peer);
         await this._sent(id, parsedParams.template);
         const request = await this._complete(id, parsedParams.creationChange, receivedResponse);