@nmshd/consumption 2.0.0-beta.4 → 2.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/buildInformation.js +4 -4
- package/dist/consumption/ConsumptionErrors.d.ts +11 -0
- package/dist/consumption/ConsumptionErrors.js +28 -1
- package/dist/consumption/ConsumptionErrors.js.map +1 -1
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.d.ts +0 -1
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.js +10 -13
- package/dist/modules/requests/incoming/DecideRequestParametersValidator.js.map +1 -1
- package/dist/modules/requests/incoming/IncomingRequestsController.js +5 -2
- package/dist/modules/requests/incoming/IncomingRequestsController.js.map +1 -1
- package/lib-web/nmshd.consumption.js +47 -20
- package/lib-web/nmshd.consumption.js.map +1 -1
- package/lib-web/nmshd.consumption.min.js +1 -1
- package/lib-web/nmshd.consumption.min.js.map +1 -1
- package/package.json +7 -7
package/dist/buildInformation.js
CHANGED
|
@@ -6,10 +6,10 @@ const content_1 = require("@nmshd/content");
|
|
|
6
6
|
const crypto_1 = require("@nmshd/crypto");
|
|
7
7
|
const transport_1 = require("@nmshd/transport");
|
|
8
8
|
exports.buildInformation = {
|
|
9
|
-
version: "2.0.0-beta.
|
|
10
|
-
build: "
|
|
11
|
-
date: "2022-
|
|
12
|
-
commit: "
|
|
9
|
+
version: "2.0.0-beta.5",
|
|
10
|
+
build: "55",
|
|
11
|
+
date: "2022-08-02T14:10:27+00:00",
|
|
12
|
+
commit: "a910348a6c8c7ba541017cbc90d2fba2add16b68",
|
|
13
13
|
dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
|
|
14
14
|
libraries: {
|
|
15
15
|
transport: transport_1.buildInformation,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ApplicationError } from "@js-soft/ts-utils";
|
|
1
2
|
import { CoreError } from "@nmshd/transport";
|
|
2
3
|
declare class Attributes {
|
|
3
4
|
attributeExists(id: string): CoreError;
|
|
@@ -6,7 +7,17 @@ declare class Attributes {
|
|
|
6
7
|
declare class Requests {
|
|
7
8
|
requestExists(id: string): CoreError;
|
|
8
9
|
unexpectedErrorDuringRequestItemProcessing(error: any): CoreError;
|
|
10
|
+
servalErrorDuringRequestItemProcessing(error: any): CoreError;
|
|
9
11
|
invalidRequestItem(message: string): CoreError;
|
|
12
|
+
private static readonly _decideValidation;
|
|
13
|
+
readonly decideValidation: {
|
|
14
|
+
invalidRequestId(): ApplicationError;
|
|
15
|
+
invalidNumberOfItems(message: string): ApplicationError;
|
|
16
|
+
itemAcceptedButParentNotAccepted(message: string): ApplicationError;
|
|
17
|
+
mustBeAcceptedItemNotAccepted(message: string): ApplicationError;
|
|
18
|
+
requestItemAnsweredAsRequestItemGroup(): ApplicationError;
|
|
19
|
+
requestItemGroupAnsweredAsRequestItem(): ApplicationError;
|
|
20
|
+
};
|
|
10
21
|
}
|
|
11
22
|
declare class RelationshipInfo {
|
|
12
23
|
relationshipInfoExists(relationshipId: string): CoreError;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConsumptionErrors = void 0;
|
|
4
|
+
const ts_utils_1 = require("@js-soft/ts-utils");
|
|
4
5
|
const transport_1 = require("@nmshd/transport");
|
|
5
6
|
class Attributes {
|
|
6
7
|
attributeExists(id) {
|
|
@@ -11,16 +12,42 @@ class Attributes {
|
|
|
11
12
|
}
|
|
12
13
|
}
|
|
13
14
|
class Requests {
|
|
15
|
+
constructor() {
|
|
16
|
+
this.decideValidation = new Requests._decideValidation();
|
|
17
|
+
}
|
|
14
18
|
requestExists(id) {
|
|
15
19
|
return new transport_1.CoreError("error.consumption.requests.requestExists", `Request with id ${id} already exists and can't be created.`);
|
|
16
20
|
}
|
|
17
21
|
unexpectedErrorDuringRequestItemProcessing(error) {
|
|
18
|
-
return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
|
|
22
|
+
return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'", undefined, undefined, error);
|
|
23
|
+
}
|
|
24
|
+
servalErrorDuringRequestItemProcessing(error) {
|
|
25
|
+
return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Serval error: '${JSON.stringify(e)'", undefined, undefined, error);
|
|
19
26
|
}
|
|
20
27
|
invalidRequestItem(message) {
|
|
21
28
|
return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
|
|
22
29
|
}
|
|
23
30
|
}
|
|
31
|
+
Requests._decideValidation = class {
|
|
32
|
+
invalidRequestId() {
|
|
33
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response");
|
|
34
|
+
}
|
|
35
|
+
invalidNumberOfItems(message) {
|
|
36
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
37
|
+
}
|
|
38
|
+
itemAcceptedButParentNotAccepted(message) {
|
|
39
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
|
|
40
|
+
}
|
|
41
|
+
mustBeAcceptedItemNotAccepted(message) {
|
|
42
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
|
|
43
|
+
}
|
|
44
|
+
requestItemAnsweredAsRequestItemGroup() {
|
|
45
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
|
|
46
|
+
}
|
|
47
|
+
requestItemGroupAnsweredAsRequestItem() {
|
|
48
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
|
|
49
|
+
}
|
|
50
|
+
};
|
|
24
51
|
class RelationshipInfo {
|
|
25
52
|
relationshipInfoExists(relationshipId) {
|
|
26
53
|
return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsumptionErrors.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionErrors.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAE5C,MAAM,UAAU;IACL,eAAe,CAAC,EAAU;QAC7B,OAAO,IAAI,qBAAS,CAChB,8CAA8C,EAC9C,sBAAsB,EAAE,+CAA+C,CAC1E,CAAA;IACL,CAAC;IACM,mBAAmB,CAAC,EAAU;QACjC,OAAO,IAAI,qBAAS,CAChB,kDAAkD,EAClD,sBAAsB,EAAE,8CAA8C,CACzE,CAAA;IACL,CAAC;CACJ;AAED,MAAM,QAAQ;
|
|
1
|
+
{"version":3,"file":"ConsumptionErrors.js","sourceRoot":"","sources":["../../src/consumption/ConsumptionErrors.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AACpD,gDAA4C;AAE5C,MAAM,UAAU;IACL,eAAe,CAAC,EAAU;QAC7B,OAAO,IAAI,qBAAS,CAChB,8CAA8C,EAC9C,sBAAsB,EAAE,+CAA+C,CAC1E,CAAA;IACL,CAAC;IACM,mBAAmB,CAAC,EAAU;QACjC,OAAO,IAAI,qBAAS,CAChB,kDAAkD,EAClD,sBAAsB,EAAE,8CAA8C,CACzE,CAAA;IACL,CAAC;CACJ;AAED,MAAM,QAAQ;IAAd;QAmEoB,qBAAgB,GAAG,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAA;IACvE,CAAC;IAnEU,aAAa,CAAC,EAAU;QAC3B,OAAO,IAAI,qBAAS,CAChB,0CAA0C,EAC1C,mBAAmB,EAAE,uCAAuC,CAC/D,CAAA;IACL,CAAC;IAEM,0CAA0C,CAAC,KAAU;QACxD,OAAO,IAAI,qBAAS,CAChB,uEAAuE,EACvE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,sCAAsC,EAC/E,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,sCAAsC,CAAC,KAAU;QACpD,OAAO,IAAI,qBAAS,CAChB,mEAAmE,EACnE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,qCAAqC,EAC9E,SAAS,EACT,SAAS,EACT,KAAK,CACR,CAAA;IACL,CAAC;IAEM,kBAAkB,CAAC,OAAe;QACrC,OAAO,IAAI,qBAAS,CAAC,+CAA+C,EAAE,OAAO,CAAC,CAAA;IAClF,CAAC;;AAEuB,0BAAiB,GAAG;IACjC,gBAAgB;QACnB,OAAO,IAAI,2BAAgB,CACvB,mDAAmD,EACnD,6DAA6D,CAChE,CAAA;IACL,CAAC;IAEM,oBAAoB,CAAC,OAAe;QACvC,OAAO,IAAI,2BAAgB,CAAC,uDAAuD,EAAE,OAAO,CAAC,CAAA;IACjG,CAAC;IAEM,gCAAgC,CAAC,OAAe;QACnD,OAAO,IAAI,2BAAgB,CAAC,mEAAmE,EAAE,OAAO,CAAC,CAAA;IAC7G,CAAC;IAEM,6BAA6B,CAAC,OAAe;QAChD,OAAO,IAAI,2BAAgB,CAAC,gEAAgE,EAAE,OAAO,CAAC,CAAA;IAC1G,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,wEAAwE,EACxE,qDAAqD,CACxD,CAAA;IACL,CAAC;IAEM,qCAAqC;QACxC,OAAO,IAAI,2BAAgB,CACvB,wEAAwE,EACxE,qDAAqD,CACxD,CAAA;IACL,CAAC;CACJ,CAAA;AAKL,MAAM,gBAAgB;IACX,sBAAsB,CAAC,cAAsB;QAChD,OAAO,IAAI,qBAAS,CAChB,4DAA4D,EAC5D,qCAAqC,cAAc,kBAAkB,CACxE,CAAA;IACL,CAAC;CACJ;AAED,MAAM,UAAU;IACL,eAAe,CAAC,aAAqB;QACxC,OAAO,IAAI,qBAAS,CAChB,8CAA8C,EAC9C,0BAA0B,aAAa,qCAAqC,CAC/E,CAAA;IACL,CAAC;IAEM,aAAa;QAChB,OAAO,IAAI,qBAAS,CAAC,4CAA4C,EAAE,4CAA4C,CAAC,CAAA;IACpH,CAAC;CACJ;AAED,MAAa,iBAAiB;;AAA9B,8CAKC;AAJiB,4BAAU,GAAG,IAAI,UAAU,EAAE,CAAA;AAC7B,0BAAQ,GAAG,IAAI,QAAQ,EAAE,CAAA;AACzB,kCAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAA;AACzC,4BAAU,GAAG,IAAI,UAAU,EAAE,CAAA"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DecideRequestParametersValidator = void 0;
|
|
4
|
-
const ts_utils_1 = require("@js-soft/ts-utils");
|
|
5
4
|
const content_1 = require("@nmshd/content");
|
|
6
5
|
const transport_1 = require("@nmshd/transport");
|
|
6
|
+
const consumption_1 = require("../../../consumption");
|
|
7
7
|
const ValidationResult_1 = require("../itemProcessors/ValidationResult");
|
|
8
8
|
const DecideRequestItemGroupParameters_1 = require("./decide/DecideRequestItemGroupParameters");
|
|
9
9
|
const DecideRequestItemParameters_1 = require("./decide/DecideRequestItemParameters");
|
|
10
10
|
class DecideRequestParametersValidator {
|
|
11
11
|
validate(params, request) {
|
|
12
12
|
if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
|
|
13
|
-
return ValidationResult_1.ValidationResult.error(
|
|
13
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidRequestId());
|
|
14
14
|
}
|
|
15
15
|
if (params.items.length !== request.content.items.length) {
|
|
16
|
-
return ValidationResult_1.ValidationResult.error(
|
|
16
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
|
|
17
17
|
}
|
|
18
18
|
const validationResults = request.content.items.map((requestItem, index) => this.checkItemOrGroup(requestItem, params.items[index], params.accept));
|
|
19
19
|
return ValidationResult_1.ValidationResult.fromItems(validationResults);
|
|
@@ -26,36 +26,33 @@ class DecideRequestParametersValidator {
|
|
|
26
26
|
}
|
|
27
27
|
checkItem(requestItem, response, isParentAccepted) {
|
|
28
28
|
if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
|
|
29
|
-
return ValidationResult_1.ValidationResult.error(
|
|
29
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
|
|
30
30
|
}
|
|
31
31
|
if (!isParentAccepted && response.accept) {
|
|
32
|
-
return ValidationResult_1.ValidationResult.error(
|
|
32
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
|
|
33
33
|
}
|
|
34
34
|
if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
|
|
35
|
-
return ValidationResult_1.ValidationResult.error(
|
|
35
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
|
|
36
36
|
}
|
|
37
37
|
return ValidationResult_1.ValidationResult.success();
|
|
38
38
|
}
|
|
39
39
|
checkItemGroup(requestItemGroup, responseItemGroup, isParentAccepted) {
|
|
40
40
|
if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
|
|
41
|
-
return ValidationResult_1.ValidationResult.error(
|
|
41
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
|
|
42
42
|
}
|
|
43
43
|
if (responseItemGroup.items.length !== requestItemGroup.items.length) {
|
|
44
|
-
return ValidationResult_1.ValidationResult.error(
|
|
44
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
|
|
45
45
|
}
|
|
46
46
|
const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
|
|
47
47
|
if (!isParentAccepted && isGroupAccepted) {
|
|
48
|
-
return ValidationResult_1.ValidationResult.error(
|
|
48
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
|
|
49
49
|
}
|
|
50
50
|
if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
|
|
51
|
-
return ValidationResult_1.ValidationResult.error(
|
|
51
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
|
|
52
52
|
}
|
|
53
53
|
const validationResults = requestItemGroup.items.map((requestItem, index) => this.checkItem(requestItem, responseItemGroup.items[index], isGroupAccepted));
|
|
54
54
|
return ValidationResult_1.ValidationResult.fromItems(validationResults);
|
|
55
55
|
}
|
|
56
|
-
invalidNumberOfItemsError(message) {
|
|
57
|
-
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
58
|
-
}
|
|
59
56
|
}
|
|
60
57
|
exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
|
|
61
58
|
//# sourceMappingURL=DecideRequestParametersValidator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"DecideRequestParametersValidator.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/DecideRequestParametersValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.IncomingRequestsController = void 0;
|
|
4
|
+
const ts_serval_1 = require("@js-soft/ts-serval");
|
|
4
5
|
const content_1 = require("@nmshd/content");
|
|
5
6
|
const transport_1 = require("@nmshd/transport");
|
|
6
7
|
const consumption_1 = require("../../../consumption");
|
|
@@ -153,12 +154,14 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
153
154
|
async canDecideItem(params, requestItem, request) {
|
|
154
155
|
const processor = this.processorRegistry.getProcessorForItem(requestItem);
|
|
155
156
|
try {
|
|
156
|
-
if (params.accept)
|
|
157
|
+
if (params.accept)
|
|
157
158
|
return await processor.canAccept(requestItem, params, request);
|
|
158
|
-
}
|
|
159
159
|
return await processor.canReject(requestItem, params, request);
|
|
160
160
|
}
|
|
161
161
|
catch (e) {
|
|
162
|
+
if (e instanceof ts_serval_1.ServalError) {
|
|
163
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.servalErrorDuringRequestItemProcessing(e));
|
|
164
|
+
}
|
|
162
165
|
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
|
|
163
166
|
}
|
|
164
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingRequestsController.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/IncomingRequestsController.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"IncomingRequestsController.js","sourceRoot":"","sources":["../../../../src/modules/requests/incoming/IncomingRequestsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,10 +17,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
|
17
17
|
const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
|
|
18
18
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
19
19
|
exports.buildInformation = {
|
|
20
|
-
version: "2.0.0-beta.
|
|
21
|
-
build: "
|
|
22
|
-
date: "2022-
|
|
23
|
-
commit: "
|
|
20
|
+
version: "2.0.0-beta.5",
|
|
21
|
+
build: "55",
|
|
22
|
+
date: "2022-08-02T14:10:27+00:00",
|
|
23
|
+
commit: "a910348a6c8c7ba541017cbc90d2fba2add16b68",
|
|
24
24
|
dependencies: {"@js-soft/docdb-querytranslator":"^1.1.0","ts-simple-nameof":"^1.3.1"},
|
|
25
25
|
libraries: {
|
|
26
26
|
transport: transport_1.buildInformation,
|
|
@@ -168,6 +168,7 @@ var ConsumptionControllerName;
|
|
|
168
168
|
|
|
169
169
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
170
170
|
exports.ConsumptionErrors = void 0;
|
|
171
|
+
const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
|
|
171
172
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
172
173
|
class Attributes {
|
|
173
174
|
attributeExists(id) {
|
|
@@ -178,16 +179,42 @@ class Attributes {
|
|
|
178
179
|
}
|
|
179
180
|
}
|
|
180
181
|
class Requests {
|
|
182
|
+
constructor() {
|
|
183
|
+
this.decideValidation = new Requests._decideValidation();
|
|
184
|
+
}
|
|
181
185
|
requestExists(id) {
|
|
182
186
|
return new transport_1.CoreError("error.consumption.requests.requestExists", `Request with id ${id} already exists and can't be created.`);
|
|
183
187
|
}
|
|
184
188
|
unexpectedErrorDuringRequestItemProcessing(error) {
|
|
185
|
-
return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'");
|
|
189
|
+
return new transport_1.CoreError("error.consumption.requests.unexpectedErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Unknown error: '${JSON.stringify(e)'", undefined, undefined, error);
|
|
190
|
+
}
|
|
191
|
+
servalErrorDuringRequestItemProcessing(error) {
|
|
192
|
+
return new transport_1.CoreError("error.consumption.requests.servalErrorDuringRequestItemProcessing", error instanceof Error ? error.message : "Serval error: '${JSON.stringify(e)'", undefined, undefined, error);
|
|
186
193
|
}
|
|
187
194
|
invalidRequestItem(message) {
|
|
188
195
|
return new transport_1.CoreError("error.consumption.requests.invalidRequestItem", message);
|
|
189
196
|
}
|
|
190
197
|
}
|
|
198
|
+
Requests._decideValidation = class {
|
|
199
|
+
invalidRequestId() {
|
|
200
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidRequestId", "The id of the Request does not match the id of the Response");
|
|
201
|
+
}
|
|
202
|
+
invalidNumberOfItems(message) {
|
|
203
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
204
|
+
}
|
|
205
|
+
itemAcceptedButParentNotAccepted(message) {
|
|
206
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.itemAcceptedButParentNotAccepted", message);
|
|
207
|
+
}
|
|
208
|
+
mustBeAcceptedItemNotAccepted(message) {
|
|
209
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.mustBeAcceptedItemNotAccepted", message);
|
|
210
|
+
}
|
|
211
|
+
requestItemAnsweredAsRequestItemGroup() {
|
|
212
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemAnsweredAsRequestItemGroup", "The RequestItem was answered as a RequestItemGroup.");
|
|
213
|
+
}
|
|
214
|
+
requestItemGroupAnsweredAsRequestItem() {
|
|
215
|
+
return new ts_utils_1.ApplicationError("error.requests.decide.validation.requestItemGroupAnsweredAsRequestItem", "The RequestItemGroup was answered as a RequestItem.");
|
|
216
|
+
}
|
|
217
|
+
};
|
|
191
218
|
class RelationshipInfo {
|
|
192
219
|
relationshipInfoExists(relationshipId) {
|
|
193
220
|
return new transport_1.CoreError("error.consumption.relationshipInfos.relationshipInfoExists", `RelationshipInfo for Relationship ${relationshipId} already exists.`);
|
|
@@ -1498,19 +1525,19 @@ __exportStar(__webpack_require__(/*! ./OutgoingRequestStatusChangedEvent */ "./d
|
|
|
1498
1525
|
|
|
1499
1526
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1500
1527
|
exports.DecideRequestParametersValidator = void 0;
|
|
1501
|
-
const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
|
|
1502
1528
|
const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
1503
1529
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
1530
|
+
const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
|
|
1504
1531
|
const ValidationResult_1 = __webpack_require__(/*! ../itemProcessors/ValidationResult */ "./dist/modules/requests/itemProcessors/ValidationResult.js");
|
|
1505
1532
|
const DecideRequestItemGroupParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemGroupParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js");
|
|
1506
1533
|
const DecideRequestItemParameters_1 = __webpack_require__(/*! ./decide/DecideRequestItemParameters */ "./dist/modules/requests/incoming/decide/DecideRequestItemParameters.js");
|
|
1507
1534
|
class DecideRequestParametersValidator {
|
|
1508
1535
|
validate(params, request) {
|
|
1509
1536
|
if (!request.id.equals(transport_1.CoreId.from(params.requestId))) {
|
|
1510
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1537
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidRequestId());
|
|
1511
1538
|
}
|
|
1512
1539
|
if (params.items.length !== request.content.items.length) {
|
|
1513
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1540
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in Request and Response do not match"));
|
|
1514
1541
|
}
|
|
1515
1542
|
const validationResults = request.content.items.map((requestItem, index) => this.checkItemOrGroup(requestItem, params.items[index], params.accept));
|
|
1516
1543
|
return ValidationResult_1.ValidationResult.fromItems(validationResults);
|
|
@@ -1523,36 +1550,33 @@ class DecideRequestParametersValidator {
|
|
|
1523
1550
|
}
|
|
1524
1551
|
checkItem(requestItem, response, isParentAccepted) {
|
|
1525
1552
|
if ((0, DecideRequestItemGroupParameters_1.isDecideRequestItemGroupParametersJSON)(response)) {
|
|
1526
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1553
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemAnsweredAsRequestItemGroup());
|
|
1527
1554
|
}
|
|
1528
1555
|
if (!isParentAccepted && response.accept) {
|
|
1529
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1556
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItem was accepted, but the parent was not accepted."));
|
|
1530
1557
|
}
|
|
1531
1558
|
if (isParentAccepted && requestItem.mustBeAccepted && !response.accept) {
|
|
1532
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1559
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItem is flagged as 'mustBeAccepted', but it was not accepted."));
|
|
1533
1560
|
}
|
|
1534
1561
|
return ValidationResult_1.ValidationResult.success();
|
|
1535
1562
|
}
|
|
1536
1563
|
checkItemGroup(requestItemGroup, responseItemGroup, isParentAccepted) {
|
|
1537
1564
|
if ((0, DecideRequestItemParameters_1.isDecideRequestItemParametersJSON)(responseItemGroup)) {
|
|
1538
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1565
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.requestItemGroupAnsweredAsRequestItem());
|
|
1539
1566
|
}
|
|
1540
1567
|
if (responseItemGroup.items.length !== requestItemGroup.items.length) {
|
|
1541
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1568
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.invalidNumberOfItems("Number of items in RequestItemGroup and ResponseItemGroup do not match"));
|
|
1542
1569
|
}
|
|
1543
1570
|
const isGroupAccepted = responseItemGroup.items.some((value) => value.accept);
|
|
1544
1571
|
if (!isParentAccepted && isGroupAccepted) {
|
|
1545
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1572
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.itemAcceptedButParentNotAccepted("The RequestItemGroup was accepted, but the parent was not accepted."));
|
|
1546
1573
|
}
|
|
1547
1574
|
if (isParentAccepted && requestItemGroup.mustBeAccepted && !isGroupAccepted) {
|
|
1548
|
-
return ValidationResult_1.ValidationResult.error(
|
|
1575
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.decideValidation.mustBeAcceptedItemNotAccepted("The RequestItemGroup is flagged as 'mustBeAccepted', but it was not accepted. Please accept all 'mustBeAccepted' items in this group."));
|
|
1549
1576
|
}
|
|
1550
1577
|
const validationResults = requestItemGroup.items.map((requestItem, index) => this.checkItem(requestItem, responseItemGroup.items[index], isGroupAccepted));
|
|
1551
1578
|
return ValidationResult_1.ValidationResult.fromItems(validationResults);
|
|
1552
1579
|
}
|
|
1553
|
-
invalidNumberOfItemsError(message) {
|
|
1554
|
-
return new ts_utils_1.ApplicationError("error.requests.decide.validation.invalidNumberOfItems", message);
|
|
1555
|
-
}
|
|
1556
1580
|
}
|
|
1557
1581
|
exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
|
|
1558
1582
|
//# sourceMappingURL=DecideRequestParametersValidator.js.map
|
|
@@ -1569,6 +1593,7 @@ exports.DecideRequestParametersValidator = DecideRequestParametersValidator;
|
|
|
1569
1593
|
|
|
1570
1594
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
1571
1595
|
exports.IncomingRequestsController = void 0;
|
|
1596
|
+
const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
|
|
1572
1597
|
const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
|
|
1573
1598
|
const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
|
|
1574
1599
|
const consumption_1 = __webpack_require__(/*! ../../../consumption */ "./dist/consumption/index.js");
|
|
@@ -1721,12 +1746,14 @@ class IncomingRequestsController extends consumption_1.ConsumptionBaseController
|
|
|
1721
1746
|
async canDecideItem(params, requestItem, request) {
|
|
1722
1747
|
const processor = this.processorRegistry.getProcessorForItem(requestItem);
|
|
1723
1748
|
try {
|
|
1724
|
-
if (params.accept)
|
|
1749
|
+
if (params.accept)
|
|
1725
1750
|
return await processor.canAccept(requestItem, params, request);
|
|
1726
|
-
}
|
|
1727
1751
|
return await processor.canReject(requestItem, params, request);
|
|
1728
1752
|
}
|
|
1729
1753
|
catch (e) {
|
|
1754
|
+
if (e instanceof ts_serval_1.ServalError) {
|
|
1755
|
+
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.servalErrorDuringRequestItemProcessing(e));
|
|
1756
|
+
}
|
|
1730
1757
|
return ValidationResult_1.ValidationResult.error(consumption_1.ConsumptionErrors.requests.unexpectedErrorDuringRequestItemProcessing(e));
|
|
1731
1758
|
}
|
|
1732
1759
|
}
|