@aldb2b/common 1.0.296 → 1.0.297
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.
|
@@ -48,20 +48,21 @@ let SubscriptionSubtractorMiddleware = class SubscriptionSubtractorMiddleware {
|
|
|
48
48
|
if (redisResponse) {
|
|
49
49
|
resp = JSON.parse(redisResponse);
|
|
50
50
|
console.log('FROM REDIS--------------------');
|
|
51
|
-
await this.subtractSubscription(resp, request.method, request.route.path, redisKey);
|
|
51
|
+
await this.subtractSubscription(resp, request.method, request.route.path, redisKey, response['recordId'], response['description'], request.headers['contactid']);
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
54
|
resp = await rxjs_1.firstValueFrom(this.client.send(user.subject, user.data));
|
|
55
55
|
console.log('FROM MESSAGE BROKER--------------------');
|
|
56
56
|
await this.cachManager.setData(redisKey, JSON.stringify(resp), 60);
|
|
57
|
-
await this.subtractSubscription(resp, request.method, request.route.path, redisKey);
|
|
57
|
+
await this.subtractSubscription(resp, request.method, request.route.path, redisKey, response['recordId'], response['description'], request.headers['contactid']);
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
next();
|
|
61
61
|
}
|
|
62
|
-
async subtractSubscription(subscription, method, path, key) {
|
|
62
|
+
async subtractSubscription(subscription, method, path, key, recordId, description, contactId) {
|
|
63
63
|
const { features, remainingPoints } = subscription;
|
|
64
64
|
const { endpoint, feature: subscriptionFeature } = getEndpoint_1.getEndpoint(features, method, path);
|
|
65
|
+
description += `Deduct ${endpoint.point} ${endpoint.endpointType} for ${subscriptionFeature.featureType}`;
|
|
65
66
|
if ((endpoint === null || endpoint === void 0 ? void 0 : endpoint.endpointType) === endpoint_type_enum_1.EndpointType.BINARY) {
|
|
66
67
|
return;
|
|
67
68
|
}
|
|
@@ -83,6 +84,12 @@ let SubscriptionSubtractorMiddleware = class SubscriptionSubtractorMiddleware {
|
|
|
83
84
|
id: subscription._id,
|
|
84
85
|
featureId: subscriptionFeature._id,
|
|
85
86
|
endpointId: endpoint._id,
|
|
87
|
+
method: endpoint.method,
|
|
88
|
+
action: 'endpoint-called',
|
|
89
|
+
description: description,
|
|
90
|
+
createdBy: contactId,
|
|
91
|
+
relatedRecord: recordId,
|
|
92
|
+
relatedRecordType: subscriptionFeature.featureType,
|
|
86
93
|
}));
|
|
87
94
|
}
|
|
88
95
|
else if ((endpoint === null || endpoint === void 0 ? void 0 : endpoint.endpointType) === endpoint_type_enum_1.EndpointType.CREDIT) {
|
|
@@ -92,6 +99,12 @@ let SubscriptionSubtractorMiddleware = class SubscriptionSubtractorMiddleware {
|
|
|
92
99
|
rxjs_1.firstValueFrom(this.client.send(subjects_1.Subjects.SubtractSubscriptionPoint, {
|
|
93
100
|
point: endpoint.point,
|
|
94
101
|
id: subscription._id,
|
|
102
|
+
method: endpoint.method,
|
|
103
|
+
action: 'endpoint-called',
|
|
104
|
+
description: description,
|
|
105
|
+
createdBy: contactId,
|
|
106
|
+
relatedRecord: recordId,
|
|
107
|
+
relatedRecordType: subscriptionFeature.featureType,
|
|
95
108
|
}));
|
|
96
109
|
}
|
|
97
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-subtractor.middleware.js","sourceRoot":"","sources":["../../src/middlewares/subscription-subtractor.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAmE;AACnE,yDAAmD;AAEnD,+BAAqC;AACrC,sDAAkD;AAClD,iDAA6C;AAC7C,oEAA0D;AAC1D,4DAAwD;AACxD,wDAAmD;AAGnD,IAAa,gCAAgC,GAA7C,MAAa,gCAAgC;IAE3C,YACmD,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAEpE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,EAAE,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,GAAG,CACP,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC9B,IAAI,OAAO,CAAC,sBAAsB,CAAC,KAAK,KAAK,EAAE;gBAC7C,OAAO,IAAI,EAAE,CAAA;aACd;YACD,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAA;YAC/B,IAAI,UAAU,GAAG,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE;gBACxC,OAAM;aACP;YACD,MAAM,IAAI,GAAG;gBACX,OAAO,EAAE,mBAAQ,CAAC,eAAe;gBACjC,IAAI,EAAE;oBACJ,IAAI,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;oBAC3C,OAAO,EAAE,+BAAc,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;iBACrD;aACF,CAAA;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC1C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YAE9D,IAAI,IAAI,CAAA;YACR,IAAI,aAAa,EAAE;gBACjB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;gBAChC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;gBAC7C,MAAM,IAAI,CAAC,oBAAoB,CAC7B,IAAI,EACJ,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,KAAK,CAAC,IAAI,EAClB,QAAQ,
|
|
1
|
+
{"version":3,"file":"subscription-subtractor.middleware.js","sourceRoot":"","sources":["../../src/middlewares/subscription-subtractor.middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -6472,7 +6472,7 @@
|
|
|
6472
6472
|
"affectsGlobalScope": false
|
|
6473
6473
|
},
|
|
6474
6474
|
"../src/middlewares/subscription-subtractor.middleware.ts": {
|
|
6475
|
-
"version": "
|
|
6475
|
+
"version": "ec42c8a8247dc33a069b1b42ade8fd06bdc5b5a86ba9110117b5d787b33bc090",
|
|
6476
6476
|
"signature": "da4aa169159c9b19b8e2360e75aeca1a1a284e1744a3759287d303ec53f732bb",
|
|
6477
6477
|
"affectsGlobalScope": false
|
|
6478
6478
|
},
|