@nmshd/consumption 3.11.0 → 3.12.0
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/CoreErrors.js +1 -1
- package/dist/consumption/CoreErrors.js.map +1 -1
- package/dist/modules/attributes/AttributesController.d.ts.map +1 -1
- package/dist/modules/attributes/AttributesController.js +45 -61
- package/dist/modules/attributes/AttributesController.js.map +1 -1
- package/dist/modules/attributes/local/LocalAttribute.d.ts.map +1 -1
- package/dist/modules/attributes/local/LocalAttribute.js +10 -10
- package/dist/modules/attributes/local/LocalAttribute.js.map +1 -1
- package/dist/modules/attributes/local/LocalAttributeDeletionInfo.d.ts +2 -0
- package/dist/modules/attributes/local/LocalAttributeDeletionInfo.d.ts.map +1 -1
- package/dist/modules/attributes/local/LocalAttributeDeletionInfo.js +2 -0
- package/dist/modules/attributes/local/LocalAttributeDeletionInfo.js.map +1 -1
- package/dist/modules/attributes/local/LocalAttributeShareInfo.d.ts.map +1 -1
- package/dist/modules/attributes/local/LocalAttributeShareInfo.js +3 -4
- package/dist/modules/attributes/local/LocalAttributeShareInfo.js.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.d.ts.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.js +4 -5
- package/dist/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.js.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.d.ts.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.js +3 -4
- package/dist/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.js.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.d.ts.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.js +3 -4
- package/dist/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.js.map +1 -1
- package/dist/modules/notifications/itemProcessors/attributeSucceeded/PeerSharedAttributeSucceededNotificationItemProcessor.js +2 -2
- package/dist/modules/notifications/itemProcessors/attributeSucceeded/PeerSharedAttributeSucceededNotificationItemProcessor.js.map +1 -1
- package/dist/modules/notifications/local/LocalNotification.js +2 -2
- package/dist/modules/notifications/local/LocalNotification.js.map +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemGroupParameters.js.map +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemParameters.js +1 -1
- package/dist/modules/requests/incoming/decide/DecideRequestItemParameters.js.map +1 -1
- package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.d.ts.map +1 -1
- package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js +2 -4
- package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js.map +1 -1
- package/dist/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.d.ts.map +1 -1
- package/dist/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.js +27 -16
- package/dist/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.js.map +1 -1
- package/dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js +2 -2
- package/dist/modules/requests/itemProcessors/proposeAttribute/AcceptProposeAttributeRequestItemParameters.js.map +1 -1
- package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.d.ts.map +1 -1
- package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js +6 -10
- package/dist/modules/requests/itemProcessors/proposeAttribute/ProposeAttributeRequestItemProcessor.js.map +1 -1
- package/dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js +2 -2
- package/dist/modules/requests/itemProcessors/readAttribute/AcceptReadAttributeRequestItemParameters.js.map +1 -1
- package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.d.ts.map +1 -1
- package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js +6 -9
- package/dist/modules/requests/itemProcessors/readAttribute/ReadAttributeRequestItemProcessor.js.map +1 -1
- package/dist/modules/requests/outgoing/OutgoingRequestsController.d.ts +1 -0
- package/dist/modules/requests/outgoing/OutgoingRequestsController.d.ts.map +1 -1
- package/dist/modules/requests/outgoing/OutgoingRequestsController.js +31 -4
- package/dist/modules/requests/outgoing/OutgoingRequestsController.js.map +1 -1
- package/package.json +2 -2
|
@@ -53,24 +53,21 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
|
|
|
53
53
|
}
|
|
54
54
|
isOwnSharedAttribute(ownAddress, peerAddress) {
|
|
55
55
|
let isOwnSharedAttribute = this.isShared() && this.isOwnedBy(ownAddress);
|
|
56
|
-
if (
|
|
56
|
+
if (peerAddress)
|
|
57
57
|
isOwnSharedAttribute &&= this.shareInfo.peer.equals(peerAddress);
|
|
58
|
-
}
|
|
59
58
|
return isOwnSharedAttribute;
|
|
60
59
|
}
|
|
61
60
|
isPeerSharedAttribute(peerAddress) {
|
|
62
61
|
let isPeerSharedAttribute = this.isShared() && this.isOwnedBy(this.shareInfo.peer);
|
|
63
|
-
isPeerSharedAttribute &&=
|
|
64
|
-
if (
|
|
62
|
+
isPeerSharedAttribute &&= !this.shareInfo.sourceAttribute;
|
|
63
|
+
if (peerAddress)
|
|
65
64
|
isPeerSharedAttribute &&= this.isOwnedBy(peerAddress);
|
|
66
|
-
}
|
|
67
65
|
return isPeerSharedAttribute;
|
|
68
66
|
}
|
|
69
67
|
isThirdPartyOwnedAttribute(ownAddress, thirdPartyAddress) {
|
|
70
68
|
let isThirdPartyOwnedAttribute = this.isShared() && !this.isOwnedBy(ownAddress) && !this.isOwnedBy(this.shareInfo.peer);
|
|
71
|
-
if (
|
|
69
|
+
if (thirdPartyAddress)
|
|
72
70
|
isThirdPartyOwnedAttribute &&= this.isOwnedBy(thirdPartyAddress);
|
|
73
|
-
}
|
|
74
71
|
return isThirdPartyOwnedAttribute;
|
|
75
72
|
}
|
|
76
73
|
isIdentityAttribute() {
|
|
@@ -86,7 +83,7 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
|
|
|
86
83
|
return this.content.owner.equals(identity);
|
|
87
84
|
}
|
|
88
85
|
isShared() {
|
|
89
|
-
return
|
|
86
|
+
return !!this.shareInfo;
|
|
90
87
|
}
|
|
91
88
|
setDeletionInfo(deletionInfo, ownAddress) {
|
|
92
89
|
if (this.isRepositoryAttribute(ownAddress)) {
|
|
@@ -108,13 +105,16 @@ let LocalAttribute = class LocalAttribute extends transport_1.CoreSynchronizable
|
|
|
108
105
|
return deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletedByOwner || deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.ToBeDeleted;
|
|
109
106
|
}
|
|
110
107
|
isOwnSharedAttributeDeletionInfo(deletionInfo) {
|
|
111
|
-
return deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletedByPeer ||
|
|
108
|
+
return (deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletedByPeer ||
|
|
109
|
+
deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.ToBeDeletedByPeer ||
|
|
110
|
+
deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletionRequestSent ||
|
|
111
|
+
deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletionRequestRejected);
|
|
112
112
|
}
|
|
113
113
|
isThirdPartyOwnedRelationshipAttributeDeletionInfo(deletionInfo) {
|
|
114
114
|
return deletionInfo.deletionStatus === LocalAttributeDeletionInfo_1.DeletionStatus.DeletedByPeer;
|
|
115
115
|
}
|
|
116
116
|
hasDeletionInfo() {
|
|
117
|
-
return
|
|
117
|
+
return !!this.deletionInfo;
|
|
118
118
|
}
|
|
119
119
|
static from(value) {
|
|
120
120
|
return this.fromAny(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttribute.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAA+D;AAC/D,4CAQwB;AACxB,gDAA8H;AAC9H,uDAA0C;AAC1C,wEAAqE;AACrE,gEAA6D;AAC7D,6EAAuJ;AACvJ,uEAA2H;AAqDpH,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,8BAAkB;IAA/C;;QACsB,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YACzC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;YAC5C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;YAC7C,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;SAC5C,CAAC;QAEuB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAiB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"LocalAttribute.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttribute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { CoreDate, CoreSerializable, ICoreDate } from "@nmshd/transport";
|
|
2
2
|
export declare enum DeletionStatus {
|
|
3
|
+
DeletionRequestSent = "DeletionRequestSent",
|
|
4
|
+
DeletionRequestRejected = "DeletionRequestRejected",
|
|
3
5
|
ToBeDeleted = "ToBeDeleted",
|
|
4
6
|
ToBeDeletedByPeer = "ToBeDeletedByPeer",
|
|
5
7
|
DeletedByPeer = "DeletedByPeer",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalAttributeDeletionInfo.d.ts","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeDeletionInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,oBAAY,cAAc;IACtB,WAAW,gBAAgB;IAC3B,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;CACpC;AAED,MAAM,WAAW,8BAA8B;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,0BAA2B,SAAQ,gBAAiB,YAAW,2BAA2B;IAK5F,cAAc,EAAE,cAAc,CAAC;IAI/B,YAAY,EAAE,QAAQ,CAAC;WAEhB,IAAI,CAAC,KAAK,EAAE,2BAA2B,GAAG,8BAA8B,GAAG,0BAA0B;CAGtH"}
|
|
1
|
+
{"version":3,"file":"LocalAttributeDeletionInfo.d.ts","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeDeletionInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzE,oBAAY,cAAc;IACtB,mBAAmB,wBAAwB;IAC3C,uBAAuB,4BAA4B;IACnD,WAAW,gBAAgB;IAC3B,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;CACpC;AAED,MAAM,WAAW,8BAA8B;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B;IACxC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,0BAA2B,SAAQ,gBAAiB,YAAW,2BAA2B;IAK5F,cAAc,EAAE,cAAc,CAAC;IAI/B,YAAY,EAAE,QAAQ,CAAC;WAEhB,IAAI,CAAC,KAAK,EAAE,2BAA2B,GAAG,8BAA8B,GAAG,0BAA0B;CAGtH"}
|
|
@@ -14,6 +14,8 @@ const ts_serval_1 = require("@js-soft/ts-serval");
|
|
|
14
14
|
const transport_1 = require("@nmshd/transport");
|
|
15
15
|
var DeletionStatus;
|
|
16
16
|
(function (DeletionStatus) {
|
|
17
|
+
DeletionStatus["DeletionRequestSent"] = "DeletionRequestSent";
|
|
18
|
+
DeletionStatus["DeletionRequestRejected"] = "DeletionRequestRejected";
|
|
17
19
|
DeletionStatus["ToBeDeleted"] = "ToBeDeleted";
|
|
18
20
|
DeletionStatus["ToBeDeletedByPeer"] = "ToBeDeletedByPeer";
|
|
19
21
|
DeletionStatus["DeletedByPeer"] = "DeletedByPeer";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalAttributeDeletionInfo.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeDeletionInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAyD;AACzD,gDAAyE;AAEzE,IAAY,
|
|
1
|
+
{"version":3,"file":"LocalAttributeDeletionInfo.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeDeletionInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAyD;AACzD,gDAAyE;AAEzE,IAAY,cAOX;AAPD,WAAY,cAAc;IACtB,6DAA2C,CAAA;IAC3C,qEAAmD,CAAA;IACnD,6CAA2B,CAAA;IAC3B,yDAAuC,CAAA;IACvC,iDAA+B,CAAA;IAC/B,mDAAiC,CAAA;AACrC,CAAC,EAPW,cAAc,8BAAd,cAAc,QAOzB;AAYD,MAAa,0BAA2B,SAAQ,4BAAgB;IAWrD,MAAM,CAAC,IAAI,CAAC,KAAmE;QAClF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACJ;AAdD,gEAcC;AATU;IAJN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC;QACN,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7J,CAAC;;kEACoC;AAI/B;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACU,oBAAQ;gEAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalAttributeShareInfo.d.ts","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeShareInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,oBAAoB,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKhG,MAAM,WAAW,2BAA2B;IACxC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAGD,MAAM,WAAW,wBAAwB;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,IAAI,EAAE,YAAY,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,uBAAwB,SAAQ,gBAAiB,YAAW,wBAAwB;IAGtF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAI/B,IAAI,EAAE,WAAW,CAAC;IAIlB,eAAe,CAAC,EAAE,MAAM,CAAC;WAElB,IAAI,CAAC,KAAK,EAAE,wBAAwB,GAAG,2BAA2B,GAAG,uBAAuB;qBAIhF,QAAQ,CAAC,CAAC,SAAS,YAAY,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"LocalAttributeShareInfo.d.ts","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeShareInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAwC,MAAM,oBAAoB,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKhG,MAAM,WAAW,2BAA2B;IACxC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAGD,MAAM,WAAW,wBAAwB;IACrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,IAAI,EAAE,YAAY,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,uBAAwB,SAAQ,gBAAiB,YAAW,wBAAwB;IAGtF,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAI/B,IAAI,EAAE,WAAW,CAAC;IAIlB,eAAe,CAAC,EAAE,MAAM,CAAC;WAElB,IAAI,CAAC,KAAK,EAAE,wBAAwB,GAAG,2BAA2B,GAAG,uBAAuB;qBAIhF,QAAQ,CAAC,CAAC,SAAS,YAAY,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC;CAqB1E"}
|
|
@@ -19,13 +19,12 @@ class LocalAttributeShareInfo extends transport_1.CoreSerializable {
|
|
|
19
19
|
return super.fromAny(value);
|
|
20
20
|
}
|
|
21
21
|
static postFrom(value) {
|
|
22
|
-
if (!(value instanceof LocalAttributeShareInfo))
|
|
22
|
+
if (!(value instanceof LocalAttributeShareInfo))
|
|
23
23
|
throw new ConsumptionError_1.ConsumptionError("this should never happen");
|
|
24
|
-
|
|
25
|
-
if (typeof value.requestReference === "undefined" && typeof value.notificationReference === "undefined") {
|
|
24
|
+
if (!value.requestReference && !value.notificationReference) {
|
|
26
25
|
throw new ts_serval_1.ValidationError(LocalAttributeShareInfo.name, (0, ts_simple_nameof_1.nameof)((x) => x.requestReference), `One of ${(0, ts_simple_nameof_1.nameof)((x) => x.requestReference)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.notificationReference)} must be set.`);
|
|
27
26
|
}
|
|
28
|
-
if (
|
|
27
|
+
if (value.requestReference && value.notificationReference) {
|
|
29
28
|
throw new ts_serval_1.ValidationError(LocalAttributeShareInfo.name, (0, ts_simple_nameof_1.nameof)((x) => x.requestReference), `Both of ${(0, ts_simple_nameof_1.nameof)((x) => x.requestReference)} or ${(0, ts_simple_nameof_1.nameof)((x) => x.notificationReference)} must not be set.`);
|
|
30
29
|
}
|
|
31
30
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalAttributeShareInfo.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeShareInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAwF;AACxF,gDAAgG;AAChG,uDAA0C;AAC1C,4EAAyE;AAoBzE,MAAa,uBAAwB,SAAQ,4BAAgB;IAiBlD,MAAM,CAAC,IAAI,CAAC,KAA6D;QAC5E,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAA4B,CAAC;IAC3D,CAAC;IAES,MAAM,CAAU,QAAQ,CAAyB,KAAQ;QAC/D,IAAI,CAAC,CAAC,KAAK,YAAY,uBAAuB,CAAC
|
|
1
|
+
{"version":3,"file":"LocalAttributeShareInfo.js","sourceRoot":"","sources":["../../../../src/modules/attributes/local/LocalAttributeShareInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAwF;AACxF,gDAAgG;AAChG,uDAA0C;AAC1C,4EAAyE;AAoBzE,MAAa,uBAAwB,SAAQ,4BAAgB;IAiBlD,MAAM,CAAC,IAAI,CAAC,KAA6D;QAC5E,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAA4B,CAAC;IAC3D,CAAC;IAES,MAAM,CAAU,QAAQ,CAAyB,KAAQ;QAC/D,IAAI,CAAC,CAAC,KAAK,YAAY,uBAAuB,CAAC;YAAE,MAAM,IAAI,mCAAgB,CAAC,0BAA0B,CAAC,CAAC;QAExG,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;YAC1D,MAAM,IAAI,2BAAe,CACrB,uBAAuB,CAAC,IAAI,EAC5B,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAC1D,UAAU,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,eAAe,CAC5J,CAAC;QACN,CAAC;QAED,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;YACxD,MAAM,IAAI,2BAAe,CACrB,uBAAuB,CAAC,IAAI,EAC5B,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAC1D,WAAW,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,IAAA,yBAAM,EAA0B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,mBAAmB,CACjK,CAAC;QACN,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA1CD,0DA0CC;AAvCU;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACH,kBAAM;iEAAC;AAI1B;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACE,kBAAM;sEAAC;AAI/B;IAFN,IAAA,oBAAQ,GAAE;IACV,IAAA,qBAAS,GAAE;8BACC,uBAAW;qDAAC;AAIlB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACJ,kBAAM;gEAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gDAAgD,EAAE,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAA8C,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,yDAA0D,SAAQ,iCAAiC,CAAC,gDAAgD,CAAC;IAC9J,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,gDAAgD,EAClE,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gDAAgD,EAAE,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAA8C,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,yDAA0D,SAAQ,iCAAiC,CAAC,gDAAgD,CAAC;IAC9J,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,gDAAgD,EAClE,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAgBN,OAAO,CACzB,gBAAgB,EAAE,gDAAgD,EAClE,aAAa,EAAE,iBAAiB,GACjC,OAAO,CAAC,qCAAqC,GAAG,IAAI,CAAC;IAqBlC,QAAQ,CAAC,gBAAgB,EAAE,gDAAgD,EAAE,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAUtJ"}
|
|
@@ -13,9 +13,8 @@ class OwnSharedAttributeDeletedByOwnerNotificationItemProcessor extends Abstract
|
|
|
13
13
|
}
|
|
14
14
|
async checkPrerequisitesOfIncomingNotificationItem(notificationItem, notification) {
|
|
15
15
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
16
|
-
if (
|
|
16
|
+
if (!attribute)
|
|
17
17
|
return common_1.ValidationResult.success();
|
|
18
|
-
}
|
|
19
18
|
if (!attribute.isPeerSharedAttribute()) {
|
|
20
19
|
return common_1.ValidationResult.error(CoreErrors_1.CoreErrors.attributes.isNotPeerSharedAttribute(notificationItem.attributeId));
|
|
21
20
|
}
|
|
@@ -26,7 +25,7 @@ class OwnSharedAttributeDeletedByOwnerNotificationItemProcessor extends Abstract
|
|
|
26
25
|
}
|
|
27
26
|
async process(notificationItem, _notification) {
|
|
28
27
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
29
|
-
if (
|
|
28
|
+
if (!attribute)
|
|
30
29
|
return;
|
|
31
30
|
const deletionInfo = attributes_1.LocalAttributeDeletionInfo.from({
|
|
32
31
|
deletionStatus: attributes_1.DeletionStatus.DeletedByOwner,
|
|
@@ -34,7 +33,7 @@ class OwnSharedAttributeDeletedByOwnerNotificationItemProcessor extends Abstract
|
|
|
34
33
|
});
|
|
35
34
|
const predecessors = await this.consumptionController.attributes.getPredecessorsOfAttribute(attribute.id);
|
|
36
35
|
for (const attr of [attribute, ...predecessors]) {
|
|
37
|
-
if (
|
|
36
|
+
if (!attr.deletionInfo) {
|
|
38
37
|
attr.setDeletionInfo(deletionInfo, this.accountController.identity.address);
|
|
39
38
|
await this.consumptionController.attributes.updateAttributeUnsafe(attr);
|
|
40
39
|
}
|
|
@@ -43,7 +42,7 @@ class OwnSharedAttributeDeletedByOwnerNotificationItemProcessor extends Abstract
|
|
|
43
42
|
}
|
|
44
43
|
async rollback(notificationItem, _notification) {
|
|
45
44
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
46
|
-
if (
|
|
45
|
+
if (!attribute)
|
|
47
46
|
return;
|
|
48
47
|
const predecessors = await this.consumptionController.attributes.getPredecessorsOfAttribute(attribute.id);
|
|
49
48
|
for (const attr of [attribute, ...predecessors]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.ts"],"names":[],"mappings":";;;AAEA,gDAAoE;AAEpE,mEAAgE;AAChE,oDAAwH;AACxH,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,yDAA0D,SAAQ,qEAAmF;IAG9J,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;IAC/G,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAAkE,EAClE,YAA+B;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9G,IAAI,
|
|
1
|
+
{"version":3,"file":"OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/OwnSharedAttributeDeletedByOwnerNotificationItemProcessor.ts"],"names":[],"mappings":";;;AAEA,gDAAoE;AAEpE,mEAAgE;AAChE,oDAAwH;AACxH,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,yDAA0D,SAAQ,qEAAmF;IAG9J,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;IAC/G,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAAkE,EAClE,YAA+B;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9G,IAAI,CAAC,SAAS;YAAE,OAAO,yBAAgB,CAAC,OAAO,EAAE,CAAC;QAElD,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,CAAC;YACrC,OAAO,yBAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,UAAU,CAAC,wBAAwB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;QAChH,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,OAAO,yBAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,UAAU,CAAC,gCAAgC,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3I,CAAC;QAED,OAAO,yBAAgB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEe,KAAK,CAAC,OAAO,CACzB,gBAAkE,EAClE,aAAgC;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,YAAY,GAAG,uCAA0B,CAAC,IAAI,CAAC;YACjD,cAAc,EAAE,2BAAc,CAAC,cAAc;YAC7C,YAAY,EAAE,oBAAQ,CAAC,GAAG,EAAE;SAC/B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE1G,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrB,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC5E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5E,CAAC;QACL,CAAC;QAED,OAAO,IAAI,kDAAqC,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;IACxG,CAAC;IAEe,KAAK,CAAC,QAAQ,CAAC,gBAAkE,EAAE,aAAgC;QAC/H,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC1G,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;IACL,CAAC;CACJ;AA7DD,8HA6DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerSharedAttributeDeletedByPeerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gDAAgD,EAAE,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,yDAA0D,SAAQ,iCAAiC,CAAC,gDAAgD,CAAC;IAC9J,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,gDAAgD,EAClE,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"PeerSharedAttributeDeletedByPeerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gDAAgD,EAAE,MAAM,gBAAgB,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,yDAA0D,SAAQ,iCAAiC,CAAC,gDAAgD,CAAC;IAC9J,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,gDAAgD,EAClE,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAgBN,OAAO,CACzB,gBAAgB,EAAE,gDAAgD,EAClE,aAAa,EAAE,iBAAiB,GACjC,OAAO,CAAC,qCAAqC,GAAG,IAAI,CAAC;IAoBlC,QAAQ,CAAC,gBAAgB,EAAE,gDAAgD,EAAE,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAYtJ"}
|
|
@@ -14,9 +14,8 @@ class PeerSharedAttributeDeletedByPeerNotificationItemProcessor extends Abstract
|
|
|
14
14
|
}
|
|
15
15
|
async checkPrerequisitesOfIncomingNotificationItem(notificationItem, notification) {
|
|
16
16
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
17
|
-
if (
|
|
17
|
+
if (!attribute)
|
|
18
18
|
return common_1.ValidationResult.success();
|
|
19
|
-
}
|
|
20
19
|
if (!attribute.isOwnSharedAttribute(this.currentIdentityAddress)) {
|
|
21
20
|
return common_1.ValidationResult.error(CoreErrors_1.CoreErrors.attributes.isNotOwnSharedAttribute(notificationItem.attributeId));
|
|
22
21
|
}
|
|
@@ -27,7 +26,7 @@ class PeerSharedAttributeDeletedByPeerNotificationItemProcessor extends Abstract
|
|
|
27
26
|
}
|
|
28
27
|
async process(notificationItem, _notification) {
|
|
29
28
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
30
|
-
if (
|
|
29
|
+
if (!attribute)
|
|
31
30
|
return;
|
|
32
31
|
const deletionDate = transport_1.CoreDate.utc();
|
|
33
32
|
const deletionInfo = LocalAttributeDeletionInfo_1.LocalAttributeDeletionInfo.from({
|
|
@@ -43,7 +42,7 @@ class PeerSharedAttributeDeletedByPeerNotificationItemProcessor extends Abstract
|
|
|
43
42
|
}
|
|
44
43
|
async rollback(notificationItem, _notification) {
|
|
45
44
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
46
|
-
if (
|
|
45
|
+
if (!attribute)
|
|
47
46
|
return;
|
|
48
47
|
const predecessors = await this.consumptionController.attributes.getPredecessorsOfAttribute(attribute.id);
|
|
49
48
|
for (const attr of [attribute, ...predecessors]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerSharedAttributeDeletedByPeerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":";;;AAEA,gDAAoE;AAEpE,mEAAgE;AAChE,oDAA4E;AAC5E,qGAAkH;AAClH,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,yDAA0D,SAAQ,qEAAmF;IAG9J,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;IAC/G,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAAkE,EAClE,YAA+B;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9G,IAAI,
|
|
1
|
+
{"version":3,"file":"PeerSharedAttributeDeletedByPeerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/PeerSharedAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":";;;AAEA,gDAAoE;AAEpE,mEAAgE;AAChE,oDAA4E;AAC5E,qGAAkH;AAClH,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,yDAA0D,SAAQ,qEAAmF;IAG9J,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,yDAAyD,CAAC,CAAC;IAC/G,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAAkE,EAClE,YAA+B;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9G,IAAI,CAAC,SAAS;YAAE,OAAO,yBAAgB,CAAC,OAAO,EAAE,CAAC;QAElD,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC/D,OAAO,yBAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,UAAU,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC/G,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,OAAO,yBAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,UAAU,CAAC,gCAAgC,CAAC,YAAY,CAAC,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3I,CAAC;QAED,OAAO,yBAAgB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEe,KAAK,CAAC,OAAO,CACzB,gBAAkE,EAClE,aAAgC;QAEhC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,YAAY,GAAG,oBAAQ,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,uDAA0B,CAAC,IAAI,CAAC;YACjD,cAAc,EAAE,2CAAc,CAAC,aAAa;YAC5C,YAAY,EAAE,YAAY;SAC7B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE1G,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,IAAI,kDAAqC,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC;IACxG,CAAC;IAEe,KAAK,CAAC,QAAQ,CAAC,gBAAkE,EAAE,aAAgC;QAC/H,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE1G,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,2GAA2G;YAC3G,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;IACL,CAAC;CACJ;AA9DD,8HA8DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iEAAiE,EAAE,MAAM,gBAAgB,CAAC;AAEnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAAE,sDAAsD,EAAE,MAAM,qBAAqB,CAAC;AAE7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,0EAA2E,SAAQ,iCAAiC,CAAC,iEAAiE,CAAC;IAChM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,iEAAiE,EACnF,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iEAAiE,EAAE,MAAM,gBAAgB,CAAC;AAEnG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAEtF,OAAO,EAAE,sDAAsD,EAAE,MAAM,qBAAqB,CAAC;AAE7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AAEzF,qBAAa,0EAA2E,SAAQ,iCAAiC,CAAC,iEAAiE,CAAC;IAChM,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEf,qBAAqB,EAAE,qBAAqB;IAKzC,4CAA4C,CAC9D,gBAAgB,EAAE,iEAAiE,EACnF,YAAY,EAAE,iBAAiB,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAgBN,OAAO,CACzB,gBAAgB,EAAE,iEAAiE,EACnF,aAAa,EAAE,iBAAiB,GACjC,OAAO,CAAC,sDAAsD,GAAG,IAAI,CAAC;IAoBnD,QAAQ,CAAC,gBAAgB,EAAE,iEAAiE,EAAE,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAYvK"}
|
|
@@ -14,9 +14,8 @@ class ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor
|
|
|
14
14
|
}
|
|
15
15
|
async checkPrerequisitesOfIncomingNotificationItem(notificationItem, notification) {
|
|
16
16
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
17
|
-
if (
|
|
17
|
+
if (!attribute)
|
|
18
18
|
return common_1.ValidationResult.success();
|
|
19
|
-
}
|
|
20
19
|
if (!attribute.isThirdPartyOwnedRelationshipAttribute(this.currentIdentityAddress)) {
|
|
21
20
|
return common_1.ValidationResult.error(CoreErrors_1.CoreErrors.attributes.isNotThirdPartyOwnedRelationshipAttribute(notificationItem.attributeId));
|
|
22
21
|
}
|
|
@@ -27,7 +26,7 @@ class ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor
|
|
|
27
26
|
}
|
|
28
27
|
async process(notificationItem, _notification) {
|
|
29
28
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
30
|
-
if (
|
|
29
|
+
if (!attribute)
|
|
31
30
|
return;
|
|
32
31
|
const deletionDate = transport_1.CoreDate.utc();
|
|
33
32
|
const deletionInfo = LocalAttributeDeletionInfo_1.LocalAttributeDeletionInfo.from({
|
|
@@ -43,7 +42,7 @@ class ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor
|
|
|
43
42
|
}
|
|
44
43
|
async rollback(notificationItem, _notification) {
|
|
45
44
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(notificationItem.attributeId);
|
|
46
|
-
if (
|
|
45
|
+
if (!attribute)
|
|
47
46
|
return;
|
|
48
47
|
const predecessors = await this.consumptionController.attributes.getPredecessorsOfAttribute(attribute.id);
|
|
49
48
|
for (const attr of [attribute, ...predecessors]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":";;;AAEA,gDAAoE;AAEpE,mEAAgE;AAChE,oDAA6F;AAC7F,qGAAkH;AAClH,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,0EAA2E,SAAQ,qEAAoG;IAGhM,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,0EAA0E,CAAC,CAAC;IAChI,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAAmF,EACnF,YAA+B;QAE/B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE9G,IAAI,
|
|
1
|
+
{"version":3,"file":"ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeDeleted/ThirdPartyOwnedRelationshipAttributeDeletedByPeerNotificationItemProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,13 +56,13 @@ class PeerSharedAttributeSucceededNotificationItemProcessor extends AbstractNoti
|
|
|
56
56
|
}
|
|
57
57
|
async rollbackPartialWork(notificationItem, _notification) {
|
|
58
58
|
const successor = await this.consumptionController.attributes.getLocalAttribute(notificationItem.successorId);
|
|
59
|
-
if (
|
|
59
|
+
if (successor) {
|
|
60
60
|
await this.consumptionController.attributes
|
|
61
61
|
.deleteAttributeUnsafe(successor.id)
|
|
62
62
|
.catch((e) => this._logger.error(`Deletion failed for attribute (attribute id: ${successor.id}).`, e));
|
|
63
63
|
}
|
|
64
64
|
const predecessor = await this.consumptionController.attributes.getLocalAttribute(notificationItem.predecessorId);
|
|
65
|
-
if (
|
|
65
|
+
if (predecessor?.succeededBy) {
|
|
66
66
|
predecessor.succeededBy = undefined;
|
|
67
67
|
await this.consumptionController.attributes
|
|
68
68
|
.updateAttributeUnsafe(predecessor)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerSharedAttributeSucceededNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeSucceeded/PeerSharedAttributeSucceededNotificationItemProcessor.ts"],"names":[],"mappings":";;;AACA,4CAAiG;AACjG,gDAA0D;AAE1D,mEAAgE;AAChE,oDAAwF;AACxF,4CAAmD;AAEnD,4FAAyF;AAEzF,MAAa,qDAAsD,SAAQ,qEAA+E;IAGtJ,YAAmB,qBAA4C;QAC3D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,kCAAsB,CAAC,SAAS,CAAC,qDAAqD,CAAC,CAAC;IAC3G,CAAC;IAEe,KAAK,CAAC,4CAA4C,CAC9D,gBAA8D,EAC9D,YAA+B;QAE/B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YACrE,OAAO,yBAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACpF,CAAC;QAED,MAAM,eAAe,GAAG;YACpB,EAAE,EAAE,gBAAgB,CAAC,WAAW;YAChC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB;YAC1C,SAAS,EAAE,EAAE,qBAAqB,EAAE,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SACjF,CAAC;QAEF,IAAI,gBAAgB,CAAC,gBAAgB,YAAY,2BAAiB,EAAE,CAAC;YACjE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,6CAA6C,CAAC,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YACpK,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iDAAiD,CAAC,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QACxK,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEe,KAAK,CAAC,OAAO,CAAC,gBAA8D,EAAE,YAA+B;QACzH,MAAM,eAAe,GAAG;YACpB,EAAE,EAAE,gBAAgB,CAAC,WAAW;YAChC,OAAO,EAAE,gBAAgB,CAAC,gBAAgB;YAC1C,SAAS,EAAE,EAAE,qBAAqB,EAAE,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE;SACjF,CAAC;QAEF,IAAI,WAA2B,CAAC;QAChC,IAAI,SAAyB,CAAC;QAC9B,IAAI,CAAC;YACD,IAAI,gBAAgB,CAAC,gBAAgB,YAAY,2BAAiB,EAAE,CAAC;gBACjE,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,kCAAkC,CACxG,gBAAgB,CAAC,aAAa,EAC9B,eAAe,EACf,KAAK,CACR,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,sCAAsC,CAC5G,gBAAgB,CAAC,aAAa,EAC9B,eAAe,EACf,KAAK,CACR,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACvE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,2DAA2D,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CACxG,CAAC;YACF,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC;QAChF,OAAO,IAAI,8CAAiC,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IAC/F,CAAC;IAEe,KAAK,CAAC,QAAQ,CAAC,gBAA8D,EAAE,YAA+B;QAC1H,MAAM,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IACnE,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,gBAA8D,EAAE,aAAgC;QAC9H,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,IAAI,
|
|
1
|
+
{"version":3,"file":"PeerSharedAttributeSucceededNotificationItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/notifications/itemProcessors/attributeSucceeded/PeerSharedAttributeSucceededNotificationItemProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,10 +43,10 @@ let LocalNotification = LocalNotification_1 = class LocalNotification extends tr
|
|
|
43
43
|
if (!(value instanceof LocalNotification_1)) {
|
|
44
44
|
throw new ConsumptionError_1.ConsumptionError("this should never happen");
|
|
45
45
|
}
|
|
46
|
-
if (value.isOwn &&
|
|
46
|
+
if (value.isOwn && value.receivedByDevice) {
|
|
47
47
|
throw new ts_serval_1.ValidationError(LocalNotification_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.receivedByDevice), `You cannot define ${(0, ts_simple_nameof_1.nameof)((x) => x.receivedByDevice)} for an own message.`);
|
|
48
48
|
}
|
|
49
|
-
if (!value.isOwn &&
|
|
49
|
+
if (!value.isOwn && !value.receivedByDevice) {
|
|
50
50
|
throw new ts_serval_1.ValidationError(LocalNotification_1.name, (0, ts_simple_nameof_1.nameof)((x) => x.receivedByDevice), `You must define ${(0, ts_simple_nameof_1.nameof)((x) => x.receivedByDevice)} for a peer message.`);
|
|
51
51
|
}
|
|
52
52
|
return value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalNotification.js","sourceRoot":"","sources":["../../../../src/modules/notifications/local/LocalNotification.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8F;AAC9F,4CAA6D;AAC7D,gDAA4I;AAC5I,uDAA0C;AAC1C,4EAAyE;AACzE,uEAA8F;AAE9F,IAAY,uBAKX;AALD,WAAY,uBAAuB;IAC/B,wCAAa,CAAA;IACb,wCAAa,CAAA;IACb,kDAAuB,CAAA;IACvB,0CAAe,CAAA;AACnB,CAAC,EALW,uBAAuB,uCAAvB,uBAAuB,QAKlC;AAaM,IAAM,iBAAiB,yBAAvB,MAAM,iBAAkB,SAAQ,8BAAkB;IAAlD;;QACsB,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACzC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACxC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7C,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACpD,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1C,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SAC7C,CAAC;QAEuB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAyDhG,CAAC;IA3Ba,MAAM,CAAU,QAAQ,CAAyB,KAAQ;QAC/D,IAAI,CAAC,CAAC,KAAK,YAAY,mBAAiB,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,mCAAgB,CAAC,0BAA0B,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"LocalNotification.js","sourceRoot":"","sources":["../../../../src/modules/notifications/local/LocalNotification.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,kDAA8F;AAC9F,4CAA6D;AAC7D,gDAA4I;AAC5I,uDAA0C;AAC1C,4EAAyE;AACzE,uEAA8F;AAE9F,IAAY,uBAKX;AALD,WAAY,uBAAuB;IAC/B,wCAAa,CAAA;IACb,wCAAa,CAAA;IACb,kDAAuB,CAAA;IACvB,0CAAe,CAAA;AACnB,CAAC,EALW,uBAAuB,uCAAvB,uBAAuB,QAKlC;AAaM,IAAM,iBAAiB,yBAAvB,MAAM,iBAAkB,SAAQ,8BAAkB;IAAlD;;QACsB,wBAAmB,GAAG;YAC3C,OAAO;YACP,UAAU;YACV,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACzC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACxC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7C,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACpD,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1C,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SAC7C,CAAC;QAEuB,uBAAkB,GAAG,CAAC,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAyDhG,CAAC;IA3Ba,MAAM,CAAU,QAAQ,CAAyB,KAAQ;QAC/D,IAAI,CAAC,CAAC,KAAK,YAAY,mBAAiB,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,mCAAgB,CAAC,0BAA0B,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YACxC,MAAM,IAAI,2BAAe,CACrB,mBAAiB,CAAC,IAAI,EACtB,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,EACpD,qBAAqB,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,sBAAsB,CAClG,CAAC;QACN,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC1C,MAAM,IAAI,2BAAe,CACrB,mBAAiB,CAAC,IAAI,EACtB,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,EACpD,mBAAmB,IAAA,yBAAM,EAAoB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,sBAAsB,CAChG,CAAC;QACN,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,KAAyB;QACxC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;CACJ,CAAA;AArEY,8CAAiB;AAgBnB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;gDACW;AAIf;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACE,uBAAW;+CAAC;AAIlB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACO,oBAAQ;oDAAC;AAIpB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACH,kBAAM;2DAAC;AAI1B;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACK,sBAAY;kDAAC;AAItB;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;;iDAC4B;AAIhC;IAFN,IAAA,qBAAS,GAAE;IACX,IAAA,oBAAQ,GAAE;8BACI,iDAAuB;iDAAC;4BAxC9B,iBAAiB;IAD7B,IAAA,gBAAI,EAAC,mBAAmB,CAAC;GACb,iBAAiB,CAqE7B"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isDecideRequestItemGroupParametersJSON = void 0;
|
|
4
4
|
function isDecideRequestItemGroupParametersJSON(json) {
|
|
5
|
-
return
|
|
5
|
+
return json.items !== undefined && json.accept === undefined;
|
|
6
6
|
}
|
|
7
7
|
exports.isDecideRequestItemGroupParametersJSON = isDecideRequestItemGroupParametersJSON;
|
|
8
8
|
//# sourceMappingURL=DecideRequestItemGroupParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestItemGroupParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemGroupParameters.ts"],"names":[],"mappings":";;;AAMA,SAAgB,sCAAsC,CAAC,IAAS;IAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"DecideRequestItemGroupParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemGroupParameters.ts"],"names":[],"mappings":";;;AAMA,SAAgB,sCAAsC,CAAC,IAAS;IAC5D,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;AACjE,CAAC;AAFD,wFAEC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isDecideRequestItemParametersJSON = void 0;
|
|
4
4
|
function isDecideRequestItemParametersJSON(json) {
|
|
5
|
-
return
|
|
5
|
+
return json.items === undefined && json.accept !== undefined;
|
|
6
6
|
}
|
|
7
7
|
exports.isDecideRequestItemParametersJSON = isDecideRequestItemParametersJSON;
|
|
8
8
|
//# sourceMappingURL=DecideRequestItemParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecideRequestItemParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemParameters.ts"],"names":[],"mappings":";;;AAKA,SAAgB,iCAAiC,CAAC,IAAS;IACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"DecideRequestItemParameters.js","sourceRoot":"","sources":["../../../../../src/modules/requests/incoming/decide/DecideRequestItemParameters.ts"],"names":[],"mappings":";;;AAKA,SAAgB,iCAAiC,CAAC,IAAS;IACvD,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC;AACjE,CAAC;AAFD,8EAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAttributeRequestItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,0BAA0B,EAAqB,kBAAkB,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AACnK,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,qBAAa,mCAAoC,SAAQ,2BAA2B,CAAC,0BAA0B,CAAC;IAC5F,4BAA4B,CACxC,WAAW,EAAE,0BAA0B,EACvC,QAAQ,CAAC,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,WAAW,GACxB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateAttributeRequestItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,0BAA0B,EAAqB,kBAAkB,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AACnK,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,qBAAa,mCAAoC,SAAQ,2BAA2B,CAAC,0BAA0B,CAAC;IAC5F,4BAA4B,CACxC,WAAW,EAAE,0BAA0B,EACvC,QAAQ,CAAC,EAAE,OAAO,EAClB,SAAS,CAAC,EAAE,WAAW,GACxB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8BzB,MAAM,CACxB,WAAW,EAAE,0BAA0B,EACvC,OAAO,EAAE,+BAA+B,EACxC,WAAW,EAAE,gBAAgB,GAC9B,OAAO,CAAC,iCAAiC,CAAC;IA+BvB,yBAAyB,CAC3C,YAAY,EAAE,iCAAiC,GAAG,kBAAkB,EACpE,WAAW,EAAE,0BAA0B,EACvC,WAAW,EAAE,gBAAgB,GAC9B,OAAO,CAAC,IAAI,CAAC;CAgBnB"}
|
package/dist/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.js
CHANGED
|
@@ -14,14 +14,12 @@ class CreateAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
|
|
|
14
14
|
if (senderIsAttributeOwner) {
|
|
15
15
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidRequestItem("Cannot create own Attributes with a CreateAttributeRequestItem. Use a ShareAttributeRequestItem instead."));
|
|
16
16
|
}
|
|
17
|
-
if (recipientIsAttributeOwner || ownerIsEmptyString ||
|
|
17
|
+
if (recipientIsAttributeOwner || ownerIsEmptyString || !recipient)
|
|
18
18
|
return ValidationResult_1.ValidationResult.success();
|
|
19
|
-
}
|
|
20
19
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidRequestItem("The owner of the given `attribute` can only be the recipient's address or an empty string. The latter will default to the recipient's address."));
|
|
21
20
|
}
|
|
22
|
-
if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString ||
|
|
21
|
+
if (recipientIsAttributeOwner || senderIsAttributeOwner || ownerIsEmptyString || !recipient)
|
|
23
22
|
return ValidationResult_1.ValidationResult.success();
|
|
24
|
-
}
|
|
25
23
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidRequestItem("The owner of the given 'attribute' can only be the sender's address, the recipient's address or an empty string. The latter will default to the recipient's address."));
|
|
26
24
|
}
|
|
27
25
|
async accept(requestItem, _params, requestInfo) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;AAAA,4CAAmK;AAEnK,mEAAgE;AAEhE,uEAAoE;AAEpE,gFAA6E;AAG7E,MAAa,mCAAoC,SAAQ,yDAAuD;IAC5F,4BAA4B,CACxC,WAAuC,EACvC,QAAkB,EAClB,SAAuB;QAEvB,MAAM,yBAAyB,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChF,MAAM,sBAAsB,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC/F,MAAM,kBAAkB,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEzE,IAAI,WAAW,CAAC,SAAS,YAAY,2BAAiB,EAAE,CAAC;YACrD,IAAI,sBAAsB,EAAE,CAAC;gBACzB,OAAO,mCAAgB,CAAC,KAAK,CACzB,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,0GAA0G,CAAC,CACrJ,CAAC;YACN,CAAC;YAED,IAAI,yBAAyB,IAAI,kBAAkB,IAAI,
|
|
1
|
+
{"version":3,"file":"CreateAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/createAttribute/CreateAttributeRequestItemProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteAttributeRequestItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAAiC,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AACpK,OAAO,EAAE,WAAW,EAAY,MAAM,kBAAkB,CAAC;AAGzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,8CAA8C,EAAE,MAAM,8CAA8C,CAAC;AAE9G,qBAAa,mCAAoC,SAAQ,2BAA2B,CAAC,0BAA0B,CAAC;IACtF,4BAA4B,CAAC,WAAW,EAAE,0BAA0B,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"DeleteAttributeRequestItemProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iCAAiC,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,OAAO,EAAsB,MAAM,gBAAgB,CAAC;AACpK,OAAO,EAAE,WAAW,EAAY,MAAM,kBAAkB,CAAC;AAGzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,8CAA8C,EAAE,MAAM,8CAA8C,CAAC;AAE9G,qBAAa,mCAAoC,SAAQ,2BAA2B,CAAC,0BAA0B,CAAC;IACtF,4BAA4B,CAAC,WAAW,EAAE,0BAA0B,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6B5I,SAAS,CAC3B,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,8CAA8C,EACtD,YAAY,EAAE,gBAAgB,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IAiBN,MAAM,CACxB,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,8CAA8C,EACtD,YAAY,EAAE,gBAAgB,GAC/B,OAAO,CAAC,iCAAiC,GAAG,kBAAkB,CAAC;IAsB5C,yBAAyB,CAC3C,YAAY,EAAE,iCAAiC,GAAG,kBAAkB,GAAG,kBAAkB,EACzF,WAAW,EAAE,0BAA0B,EACvC,YAAY,EAAE,gBAAgB,GAC/B,OAAO,CAAC,IAAI,CAAC;CAwCnB"}
|
package/dist/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.js
CHANGED
|
@@ -10,9 +10,8 @@ const GenericRequestItemProcessor_1 = require("../GenericRequestItemProcessor");
|
|
|
10
10
|
class DeleteAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.GenericRequestItemProcessor {
|
|
11
11
|
async canCreateOutgoingRequestItem(requestItem, _request, recipient) {
|
|
12
12
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
|
|
13
|
-
if (
|
|
13
|
+
if (!attribute)
|
|
14
14
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidRequestItem(`The Attribute '${requestItem.attributeId.toString()}' could not be found.`));
|
|
15
|
-
}
|
|
16
15
|
if (!attribute.isOwnSharedAttribute(this.accountController.identity.address)) {
|
|
17
16
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidRequestItem(`The Attribute '${requestItem.attributeId.toString()}' is not an own shared Attribute. You can only request the deletion of own shared Attributes.`));
|
|
18
17
|
}
|
|
@@ -29,9 +28,8 @@ class DeleteAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
|
|
|
29
28
|
}
|
|
30
29
|
async canAccept(requestItem, params, _requestInfo) {
|
|
31
30
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
|
|
32
|
-
if (
|
|
31
|
+
if (!attribute)
|
|
33
32
|
return ValidationResult_1.ValidationResult.success();
|
|
34
|
-
}
|
|
35
33
|
const deletionDate = transport_1.CoreDate.from(params.deletionDate);
|
|
36
34
|
if (!deletionDate.dateTime.isValid) {
|
|
37
35
|
return ValidationResult_1.ValidationResult.error(CoreErrors_1.CoreErrors.requests.invalidAcceptParameters("The deletionDate is invalid."));
|
|
@@ -43,9 +41,8 @@ class DeleteAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
|
|
|
43
41
|
}
|
|
44
42
|
async accept(requestItem, params, _requestInfo) {
|
|
45
43
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
|
|
46
|
-
if (
|
|
44
|
+
if (!attribute)
|
|
47
45
|
return content_1.AcceptResponseItem.from({ result: content_1.ResponseItemResult.Accepted });
|
|
48
|
-
}
|
|
49
46
|
const deletionDate = transport_1.CoreDate.from(params.deletionDate);
|
|
50
47
|
const deletionInfo = attributes_1.LocalAttributeDeletionInfo.from({
|
|
51
48
|
deletionStatus: attributes_1.DeletionStatus.ToBeDeleted,
|
|
@@ -62,23 +59,37 @@ class DeleteAttributeRequestItemProcessor extends GenericRequestItemProcessor_1.
|
|
|
62
59
|
});
|
|
63
60
|
}
|
|
64
61
|
async applyIncomingResponseItem(responseItem, requestItem, _requestInfo) {
|
|
65
|
-
if (!(responseItem instanceof content_1.DeleteAttributeAcceptResponseItem)) {
|
|
62
|
+
if (responseItem instanceof content_1.AcceptResponseItem && !(responseItem instanceof content_1.DeleteAttributeAcceptResponseItem)) {
|
|
66
63
|
return;
|
|
67
64
|
}
|
|
68
65
|
const attribute = await this.consumptionController.attributes.getLocalAttribute(requestItem.attributeId);
|
|
69
|
-
if (
|
|
66
|
+
if (!attribute)
|
|
70
67
|
return;
|
|
71
68
|
if (attribute.deletionInfo?.deletionStatus === attributes_1.DeletionStatus.DeletedByPeer)
|
|
72
69
|
return;
|
|
73
|
-
const deletionInfo = attributes_1.LocalAttributeDeletionInfo.from({
|
|
74
|
-
deletionStatus: attributes_1.DeletionStatus.ToBeDeletedByPeer,
|
|
75
|
-
deletionDate: responseItem.deletionDate
|
|
76
|
-
});
|
|
77
70
|
const predecessors = await this.consumptionController.attributes.getPredecessorsOfAttribute(attribute.id);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
71
|
+
if (responseItem instanceof content_1.DeleteAttributeAcceptResponseItem) {
|
|
72
|
+
const deletionInfo = attributes_1.LocalAttributeDeletionInfo.from({
|
|
73
|
+
deletionStatus: attributes_1.DeletionStatus.ToBeDeletedByPeer,
|
|
74
|
+
deletionDate: responseItem.deletionDate
|
|
75
|
+
});
|
|
76
|
+
for (const attr of [attribute, ...predecessors]) {
|
|
77
|
+
if (attr.deletionInfo?.deletionStatus !== attributes_1.DeletionStatus.DeletedByPeer) {
|
|
78
|
+
attr.setDeletionInfo(deletionInfo, this.accountController.identity.address);
|
|
79
|
+
await this.consumptionController.attributes.updateAttributeUnsafe(attr);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (responseItem instanceof content_1.RejectResponseItem) {
|
|
84
|
+
const deletionInfo = attributes_1.LocalAttributeDeletionInfo.from({
|
|
85
|
+
deletionStatus: attributes_1.DeletionStatus.DeletionRequestRejected,
|
|
86
|
+
deletionDate: transport_1.CoreDate.utc()
|
|
87
|
+
});
|
|
88
|
+
for (const attr of [attribute, ...predecessors]) {
|
|
89
|
+
if (attr.deletionInfo?.deletionStatus !== attributes_1.DeletionStatus.ToBeDeletedByPeer && attr.deletionInfo?.deletionStatus !== attributes_1.DeletionStatus.DeletedByPeer) {
|
|
90
|
+
attr.setDeletionInfo(deletionInfo, this.accountController.identity.address);
|
|
91
|
+
await this.consumptionController.attributes.updateAttributeUnsafe(attr);
|
|
92
|
+
}
|
|
82
93
|
}
|
|
83
94
|
}
|
|
84
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;AAAA,4CAAoK;AACpK,gDAAyD;AACzD,mEAAgE;AAChE,oDAAiF;AACjF,uEAAoE;AACpE,gFAA6E;AAI7E,MAAa,mCAAoC,SAAQ,yDAAuD;IAC5F,KAAK,CAAC,4BAA4B,CAAC,WAAuC,EAAE,QAAiB,EAAE,SAAuB;QAClI,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DeleteAttributeRequestItemProcessor.js","sourceRoot":"","sources":["../../../../../src/modules/requests/itemProcessors/deleteAttribute/DeleteAttributeRequestItemProcessor.ts"],"names":[],"mappings":";;;AAAA,4CAAoK;AACpK,gDAAyD;AACzD,mEAAgE;AAChE,oDAAiF;AACjF,uEAAoE;AACpE,gFAA6E;AAI7E,MAAa,mCAAoC,SAAQ,yDAAuD;IAC5F,KAAK,CAAC,4BAA4B,CAAC,WAAuC,EAAE,QAAiB,EAAE,SAAuB;QAClI,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACzG,IAAI,CAAC,SAAS;YAAE,OAAO,mCAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,kBAAkB,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAEnK,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3E,OAAO,mCAAgB,CAAC,KAAK,CACzB,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAClC,kBAAkB,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,+FAA+F,CACtJ,CACJ,CAAC;QACN,CAAC;QAED,IAAI,SAAS,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,aAAa,EAAE,CAAC;YAC1E,OAAO,mCAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gDAAgD,CAAC,CAAC,CAAC;QAC5H,CAAC;QAED,IAAI,SAAS,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,iBAAiB,EAAE,CAAC;YAC9E,OAAO,mCAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,0DAA0D,CAAC,CAAC,CAAC;QACtI,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9C,OAAO,mCAAgB,CAAC,KAAK,CACzB,uBAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,sGAAsG,CAAC,CACjJ,CAAC;QACN,CAAC;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEe,KAAK,CAAC,SAAS,CAC3B,WAAuC,EACvC,MAAsD,EACtD,YAA8B;QAE9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACzG,IAAI,CAAC,SAAS;YAAE,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAC;QAElD,MAAM,YAAY,GAAG,oBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAExD,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACjC,OAAO,mCAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAC/G,CAAC;QAED,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YACxC,OAAO,mCAAgB,CAAC,KAAK,CAAC,uBAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC,yCAAyC,CAAC,CAAC,CAAC;QAC1H,CAAC;QAED,OAAO,mCAAgB,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEe,KAAK,CAAC,MAAM,CACxB,WAAuC,EACvC,MAAsD,EACtD,YAA8B;QAE9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACzG,IAAI,CAAC,SAAS;YAAE,OAAO,4BAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,4BAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAExF,MAAM,YAAY,GAAG,oBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,uCAA0B,CAAC,IAAI,CAAC;YACjD,cAAc,EAAE,2BAAc,CAAC,WAAW;YAC1C,YAAY,EAAE,YAAY;SAC7B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAC1G,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,2CAAiC,CAAC,IAAI,CAAC;YAC1C,YAAY,EAAE,YAAY;YAC1B,MAAM,EAAE,4BAAkB,CAAC,QAAQ;SACtC,CAAC,CAAC;IACP,CAAC;IAEe,KAAK,CAAC,yBAAyB,CAC3C,YAAyF,EACzF,WAAuC,EACvC,YAA8B;QAE9B,IAAI,YAAY,YAAY,4BAAkB,IAAI,CAAC,CAAC,YAAY,YAAY,2CAAiC,CAAC,EAAE,CAAC;YAC7G,OAAO;QACX,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACzG,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,IAAI,SAAS,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,aAAa;YAAE,OAAO;QAEpF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE1G,IAAI,YAAY,YAAY,2CAAiC,EAAE,CAAC;YAC5D,MAAM,YAAY,GAAG,uCAA0B,CAAC,IAAI,CAAC;gBACjD,cAAc,EAAE,2BAAc,CAAC,iBAAiB;gBAChD,YAAY,EAAE,YAAY,CAAC,YAAY;aAC1C,CAAC,CAAC;YAEH,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;gBAC9C,IAAI,IAAI,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,aAAa,EAAE,CAAC;oBACrE,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC5E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC5E,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,YAAY,YAAY,4BAAkB,EAAE,CAAC;YAC7C,MAAM,YAAY,GAAG,uCAA0B,CAAC,IAAI,CAAC;gBACjD,cAAc,EAAE,2BAAc,CAAC,uBAAuB;gBACtD,YAAY,EAAE,oBAAQ,CAAC,GAAG,EAAE;aAC/B,CAAC,CAAC;YAEH,KAAK,MAAM,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;gBAC9C,IAAI,IAAI,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,EAAE,cAAc,KAAK,2BAAc,CAAC,aAAa,EAAE,CAAC;oBAC/I,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC5E,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC5E,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AAzHD,kFAyHC"}
|