starta.microservice 0.1.5983 → 0.1.6063
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/lib/Exception.js.map +1 -1
- package/lib/adapters/aws/index.js +2 -2
- package/lib/adapters/aws/index.js.map +1 -1
- package/lib/adapters/database/DBScripts/BaseMigration.js.map +1 -1
- package/lib/adapters/database/DBScripts/DBInitialise.d.ts +1 -1
- package/lib/adapters/database/DBScripts/DBInitialise.js +3 -2
- package/lib/adapters/database/DBScripts/DBInitialise.js.map +1 -1
- package/lib/adapters/database/index.d.ts +1 -1
- package/lib/adapters/database/index.js +35 -10
- package/lib/adapters/database/index.js.map +1 -1
- package/lib/adapters/logger/index.js +16 -5
- package/lib/adapters/logger/index.js.map +1 -1
- package/lib/adapters/messageBroker/Rabbitmq.js +26 -23
- package/lib/adapters/messageBroker/Rabbitmq.js.map +1 -1
- package/lib/adapters/messageBroker/SnsSqs.d.ts +1 -0
- package/lib/adapters/messageBroker/SnsSqs.js +197 -124
- package/lib/adapters/messageBroker/SnsSqs.js.map +1 -1
- package/lib/adapters/messageBroker/index.js.map +1 -1
- package/lib/adapters/messageBroker/types.js.map +1 -1
- package/lib/adapters/redisService/Listener.d.ts +1 -1
- package/lib/adapters/redisService/Publisher.d.ts +1 -1
- package/lib/adapters/redisService/Publisher.js +1 -1
- package/lib/adapters/redisService/Publisher.js.map +1 -1
- package/lib/adapters/redisService/RedisAdapter.js +54 -30
- package/lib/adapters/redisService/RedisAdapter.js.map +1 -1
- package/lib/adapters/redisService/index.d.ts +0 -3
- package/lib/adapters/redisService/index.js +57 -63
- package/lib/adapters/redisService/index.js.map +1 -1
- package/lib/agenda/index.d.ts +1 -1
- package/lib/agenda/index.js +6 -4
- package/lib/agenda/index.js.map +1 -1
- package/lib/config.js +13 -13
- package/lib/config.js.map +1 -1
- package/lib/entities/Account.d.ts +1 -1
- package/lib/entities/Account.js +1 -1
- package/lib/entities/Account.js.map +1 -1
- package/lib/entities/Base.js +9 -4
- package/lib/entities/Base.js.map +1 -1
- package/lib/entities/Revision.js.map +1 -1
- package/lib/entities/Version.js.map +1 -1
- package/lib/entities/types.d.ts +4 -4
- package/lib/executionContext/index.js +2 -3
- package/lib/executionContext/index.js.map +1 -1
- package/lib/helpers/index.js +35 -26
- package/lib/helpers/index.js.map +1 -1
- package/lib/repositories/Repository.d.ts +0 -2
- package/lib/repositories/Repository.js +53 -44
- package/lib/repositories/Repository.js.map +1 -1
- package/lib/repositories/index.d.ts +4 -4
- package/lib/repositories/index.js.map +1 -1
- package/lib/repositories/types/FindOptions.js.map +1 -1
- package/lib/repositories/types/JoinOptions.js.map +1 -1
- package/lib/services/ServiceExecutor.js +41 -22
- package/lib/services/ServiceExecutor.js.map +1 -1
- package/lib/services/ServiceExecutorHandler.js +103 -56
- package/lib/services/ServiceExecutorHandler.js.map +1 -1
- package/lib/services/ServiceFactoryBase.d.ts +1 -2
- package/lib/services/ServiceFactoryBase.js.map +1 -1
- package/lib/services/ServiceHandlerBase.d.ts +5 -5
- package/lib/services/ServiceHandlerBase.js +31 -14
- package/lib/services/ServiceHandlerBase.js.map +1 -1
- package/lib/services/dataSelectors.d.ts +3 -4
- package/lib/services/dataSelectors.js +34 -14
- package/lib/services/dataSelectors.js.map +1 -1
- package/lib/timeProvider.js.map +1 -1
- package/lib/types/index.d.ts +33 -2
- package/lib/types/index.js.map +1 -1
- package/package.json +15 -8
|
@@ -67,7 +67,8 @@ class ServiceExecutorHandler {
|
|
|
67
67
|
contextType: '',
|
|
68
68
|
currentOrgPermissions: {},
|
|
69
69
|
session: null,
|
|
70
|
-
correlationId: originalRequest.headers['x-correlation-id']?.toString() ||
|
|
70
|
+
correlationId: originalRequest.headers['x-correlation-id']?.toString() ||
|
|
71
|
+
crypto_1.default.randomBytes(10).toString('hex'),
|
|
71
72
|
};
|
|
72
73
|
response.setHeader('x-correlation-id', request.correlationId);
|
|
73
74
|
executionContext_1.default.setCorrelationId(request.correlationId);
|
|
@@ -78,37 +79,45 @@ class ServiceExecutorHandler {
|
|
|
78
79
|
request: {
|
|
79
80
|
url: request.originalRequest.url,
|
|
80
81
|
method: request.originalRequest.method,
|
|
81
|
-
}
|
|
82
|
+
},
|
|
82
83
|
});
|
|
83
|
-
|
|
84
|
-
executionContext_1.default.getLogger().generic.info(
|
|
84
|
+
const startTime = process.hrtime();
|
|
85
|
+
executionContext_1.default.getLogger().generic.info('Request started');
|
|
85
86
|
try {
|
|
86
87
|
if (__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").isAuthorized()) {
|
|
87
88
|
await this.checkAuth(request, response, __classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").allowAnonymous());
|
|
88
89
|
}
|
|
89
|
-
if (request.originalRequest.method !== 'GET' &&
|
|
90
|
+
if (request.originalRequest.method !== 'GET' &&
|
|
91
|
+
(__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getBodyParser &&
|
|
92
|
+
__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getBodyParser()) !== 'raw') {
|
|
90
93
|
request.originalRequest.body.createdAt = timeProvider_1.default.jsDate();
|
|
91
|
-
request.originalRequest.body.createdBy =
|
|
94
|
+
request.originalRequest.body.createdBy =
|
|
95
|
+
request.session?.account.login || '%anonymous';
|
|
92
96
|
}
|
|
93
97
|
await this.checkPermissions(request);
|
|
94
98
|
const executionResult = await this.executeRequest(request);
|
|
95
99
|
if (executionResult?._cookies) {
|
|
96
|
-
executionResult._cookies.forEach(cookie => response.cookie(cookie.name, cookie.value, cookie.options));
|
|
100
|
+
executionResult._cookies.forEach((cookie) => response.cookie(cookie.name, cookie.value, cookie.options));
|
|
97
101
|
delete executionResult._cookies;
|
|
98
102
|
}
|
|
99
103
|
if (executionResult?._clearCookies) {
|
|
100
|
-
executionResult._clearCookies.forEach(cookie => response.clearCookie(cookie.name, cookie.options));
|
|
104
|
+
executionResult._clearCookies.forEach((cookie) => response.clearCookie(cookie.name, cookie.options));
|
|
101
105
|
delete executionResult._clearCookies;
|
|
102
106
|
}
|
|
103
107
|
if (executionResult?._filePath && executionResult._filePathToReplace) {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
executionContext_1.default
|
|
108
|
+
const diff = process.hrtime(startTime);
|
|
109
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
110
|
+
executionContext_1.default
|
|
111
|
+
.getLogger()
|
|
112
|
+
.generic.info('Request finished with download file, status: 200', {
|
|
113
|
+
taskDuration: timeInMilliseconds,
|
|
114
|
+
statusCode: 200,
|
|
115
|
+
});
|
|
107
116
|
return response.download(path.resolve(executionResult._filePath), executionResult._filePathToReplace);
|
|
108
117
|
}
|
|
109
118
|
if (executionResult?._filePath) {
|
|
110
119
|
const s3 = aws_1.default.getS3();
|
|
111
|
-
|
|
120
|
+
const options = {
|
|
112
121
|
Bucket: config_1.default.aws.bucketname,
|
|
113
122
|
Key: executionResult?._filePath,
|
|
114
123
|
};
|
|
@@ -116,49 +125,72 @@ class ServiceExecutorHandler {
|
|
|
116
125
|
await s3.headObject(options).promise();
|
|
117
126
|
response.set('Cache-control', 'public, max-age=100000');
|
|
118
127
|
response.attachment(executionResult?._filePath);
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
executionContext_1.default
|
|
128
|
+
const fileStream = s3.getObject(options).createReadStream();
|
|
129
|
+
const diff = process.hrtime(startTime);
|
|
130
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
131
|
+
executionContext_1.default
|
|
132
|
+
.getLogger()
|
|
133
|
+
.generic.info('Request finished with pipe file from s3, status: 200', { taskDuration: timeInMilliseconds, statusCode: 200 });
|
|
123
134
|
return fileStream.pipe(response);
|
|
124
135
|
}
|
|
125
136
|
catch (error) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
executionContext_1.default
|
|
129
|
-
|
|
130
|
-
.status
|
|
131
|
-
|
|
137
|
+
const diff = process.hrtime(startTime);
|
|
138
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
139
|
+
executionContext_1.default
|
|
140
|
+
.getLogger()
|
|
141
|
+
.generic.info('Request finished file not found, status: 404', {
|
|
142
|
+
taskDuration: timeInMilliseconds,
|
|
143
|
+
statusCode: 404,
|
|
144
|
+
});
|
|
145
|
+
return response.status(404).send(null);
|
|
132
146
|
}
|
|
133
147
|
}
|
|
134
148
|
if (executionResult?._fileStream) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
executionContext_1.default
|
|
149
|
+
const diff = process.hrtime(startTime);
|
|
150
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
151
|
+
executionContext_1.default
|
|
152
|
+
.getLogger()
|
|
153
|
+
.generic.info('Request finished with pipe file, status: 200', {
|
|
154
|
+
taskDuration: timeInMilliseconds,
|
|
155
|
+
statusCode: 200,
|
|
156
|
+
});
|
|
138
157
|
return executionResult._fileStream.pipe(response);
|
|
139
158
|
}
|
|
140
159
|
const statusCode = request.originalRequest.method === 'POST' ? 201 : 200;
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
executionContext_1.default
|
|
144
|
-
|
|
145
|
-
.status
|
|
146
|
-
|
|
160
|
+
const diff = process.hrtime(startTime);
|
|
161
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
162
|
+
executionContext_1.default
|
|
163
|
+
.getLogger()
|
|
164
|
+
.generic.info('Request finished, status: ' + statusCode, {
|
|
165
|
+
taskDuration: timeInMilliseconds,
|
|
166
|
+
statusCode,
|
|
167
|
+
});
|
|
168
|
+
return response.status(statusCode).send(executionResult);
|
|
147
169
|
}
|
|
148
170
|
catch (err) {
|
|
149
171
|
if (err instanceof Exception_1.default) {
|
|
150
172
|
executionContext_1.default.getLogger().debugBadRequest(err, request);
|
|
151
173
|
const errorHash = err.toHash();
|
|
152
174
|
delete errorHash.statusCode;
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
executionContext_1.default
|
|
175
|
+
const diff = process.hrtime(startTime);
|
|
176
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
177
|
+
executionContext_1.default
|
|
178
|
+
.getLogger()
|
|
179
|
+
.generic.info('Request finished, status: ' + (err.statusCode || 400), {
|
|
180
|
+
taskDuration: timeInMilliseconds,
|
|
181
|
+
statusCode: err.statusCode || 400,
|
|
182
|
+
});
|
|
156
183
|
response.status(err.statusCode || 400).send(errorHash);
|
|
157
184
|
}
|
|
158
185
|
else {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
executionContext_1.default
|
|
186
|
+
const diff = process.hrtime(startTime);
|
|
187
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
188
|
+
executionContext_1.default
|
|
189
|
+
.getLogger()
|
|
190
|
+
.generic.error('Request finished, status: 500', {
|
|
191
|
+
taskDuration: timeInMilliseconds,
|
|
192
|
+
statusCode: 500,
|
|
193
|
+
});
|
|
162
194
|
executionContext_1.default.getLogger().internalServerError(err, request);
|
|
163
195
|
response.status(500).send(err);
|
|
164
196
|
}
|
|
@@ -166,7 +198,9 @@ class ServiceExecutorHandler {
|
|
|
166
198
|
}
|
|
167
199
|
async checkPermissions(request) {
|
|
168
200
|
const requestedAccountLogin = request.originalRequest.params._login;
|
|
169
|
-
request.contextType =
|
|
201
|
+
request.contextType =
|
|
202
|
+
requestedAccountLogin &&
|
|
203
|
+
(await __classPrivateFieldGet(this, _ServiceExecutorHandler_redis, "f").getAccountType(requestedAccountLogin));
|
|
170
204
|
const endpointContext = __classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getEndpointContext();
|
|
171
205
|
if (requestedAccountLogin && !request.contextType) {
|
|
172
206
|
throw new Exception_1.default({
|
|
@@ -193,8 +227,9 @@ class ServiceExecutorHandler {
|
|
|
193
227
|
if (!request.session) {
|
|
194
228
|
return;
|
|
195
229
|
}
|
|
196
|
-
if (request.contextType ==
|
|
197
|
-
request.currentOrgPermissions =
|
|
230
|
+
if (request.contextType == 'organization') {
|
|
231
|
+
request.currentOrgPermissions =
|
|
232
|
+
await __classPrivateFieldGet(this, _ServiceExecutorHandler_redis, "f").getOrganizationMemberPermissions(requestedAccountLogin, request.session.account.login);
|
|
198
233
|
}
|
|
199
234
|
const requiredPermissionsSchemas = __classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getRequiredPermissions();
|
|
200
235
|
if (!requiredPermissionsSchemas) {
|
|
@@ -215,9 +250,10 @@ class ServiceExecutorHandler {
|
|
|
215
250
|
}
|
|
216
251
|
}
|
|
217
252
|
}
|
|
218
|
-
else if (request.contextType ==
|
|
253
|
+
else if (request.contextType == 'user') {
|
|
219
254
|
if (requiredPermissionsSchemas.user?.myaccount) {
|
|
220
|
-
if (request.session.account.login === requestedAccountLogin ||
|
|
255
|
+
if (request.session.account.login === requestedAccountLogin ||
|
|
256
|
+
request.session.account.login === 'admin') {
|
|
221
257
|
hasPermissions = true;
|
|
222
258
|
}
|
|
223
259
|
}
|
|
@@ -225,7 +261,7 @@ class ServiceExecutorHandler {
|
|
|
225
261
|
hasPermissions = true;
|
|
226
262
|
}
|
|
227
263
|
}
|
|
228
|
-
else if (request.contextType ==
|
|
264
|
+
else if (request.contextType == 'organization') {
|
|
229
265
|
if (!requiredPermissionsSchemas.organization) {
|
|
230
266
|
hasPermissions = true;
|
|
231
267
|
}
|
|
@@ -233,7 +269,7 @@ class ServiceExecutorHandler {
|
|
|
233
269
|
if (request.currentOrgPermissions) {
|
|
234
270
|
let missingAnyPermission = false;
|
|
235
271
|
let hasAnyPrmission = false;
|
|
236
|
-
requiredPermissionsSchemas.organization.forEach(permission => {
|
|
272
|
+
requiredPermissionsSchemas.organization.forEach((permission) => {
|
|
237
273
|
if (!request.currentOrgPermissions[permission]) {
|
|
238
274
|
missingAnyPermission = true;
|
|
239
275
|
}
|
|
@@ -248,7 +284,8 @@ class ServiceExecutorHandler {
|
|
|
248
284
|
hasPermissions = !missingAnyPermission;
|
|
249
285
|
}
|
|
250
286
|
}
|
|
251
|
-
if (!hasPermissions &&
|
|
287
|
+
if (!hasPermissions &&
|
|
288
|
+
requiredPermissionsSchemas.organizationAllowForStartaAdmins) {
|
|
252
289
|
if (request.session.account.login === 'admin') {
|
|
253
290
|
hasPermissions = true;
|
|
254
291
|
}
|
|
@@ -271,13 +308,15 @@ class ServiceExecutorHandler {
|
|
|
271
308
|
async checkAuth(request, response, allowAnonymous) {
|
|
272
309
|
const unauthorized = function (e) {
|
|
273
310
|
if (!allowAnonymous) {
|
|
274
|
-
e =
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
311
|
+
e =
|
|
312
|
+
e ||
|
|
313
|
+
new Exception_1.default({
|
|
314
|
+
code: 'UNAUTHORIZED',
|
|
315
|
+
statusCode: 401,
|
|
316
|
+
fields: {
|
|
317
|
+
scheme: 'BAD_SCHEME',
|
|
318
|
+
},
|
|
319
|
+
});
|
|
281
320
|
throw e;
|
|
282
321
|
}
|
|
283
322
|
};
|
|
@@ -293,7 +332,9 @@ class ServiceExecutorHandler {
|
|
|
293
332
|
return unauthorized();
|
|
294
333
|
}
|
|
295
334
|
}
|
|
296
|
-
if (!auth &&
|
|
335
|
+
if (!auth &&
|
|
336
|
+
request.originalRequest.cookies &&
|
|
337
|
+
request.originalRequest.cookies.Authorization) {
|
|
297
338
|
auth = { token: request.originalRequest.cookies.Authorization };
|
|
298
339
|
}
|
|
299
340
|
if (!auth) {
|
|
@@ -326,7 +367,11 @@ class ServiceExecutorHandler {
|
|
|
326
367
|
date: timeProvider_1.default.jsDate(),
|
|
327
368
|
};
|
|
328
369
|
if (sessionData.account) {
|
|
329
|
-
response.cookie('Authorization', auth.token, {
|
|
370
|
+
response.cookie('Authorization', auth.token, {
|
|
371
|
+
httpOnly: true,
|
|
372
|
+
maxAge: sessionData.expirationTime * 1000,
|
|
373
|
+
domain: new URL(config_1.default.siteUrl).hostname,
|
|
374
|
+
});
|
|
330
375
|
await __classPrivateFieldGet(this, _ServiceExecutorHandler_redis, "f").resetSessionExpireTimeout(sessionId, sessionData.expirationTime);
|
|
331
376
|
}
|
|
332
377
|
executionContext_1.default.setAuthorizedUserLogin(request.session.account.login);
|
|
@@ -343,8 +388,10 @@ class ServiceExecutorHandler {
|
|
|
343
388
|
if (__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getValidationRules) {
|
|
344
389
|
objectRules = __classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getValidationRules(request);
|
|
345
390
|
}
|
|
346
|
-
else if (__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getValidationRulesPerContext &&
|
|
347
|
-
|
|
391
|
+
else if (__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getValidationRulesPerContext &&
|
|
392
|
+
request?.contextType) {
|
|
393
|
+
objectRules =
|
|
394
|
+
__classPrivateFieldGet(this, _ServiceExecutorHandler_serviceDescription, "f").getValidationRulesPerContext(request)[request.contextType];
|
|
348
395
|
}
|
|
349
396
|
if (objectRules) {
|
|
350
397
|
const rules = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceExecutorHandler.js","sourceRoot":"","sources":["../../src/services/ServiceExecutorHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ServiceExecutorHandler.js","sourceRoot":"","sources":["../../src/services/ServiceExecutorHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import Redis from '../adapters/redisService';
|
|
2
|
-
import EntityBase from '../entities/Base';
|
|
3
2
|
import { IServiceDescription, IAuthorizedRequest, IServiceHandler, IServiceFactory, IServiceExecutor } from '../types';
|
|
4
3
|
import MessageBroker from '../adapters/messageBroker';
|
|
5
4
|
import Repositories from '../repositories';
|
|
6
|
-
declare abstract class ServiceFactory<R extends Repositories
|
|
5
|
+
declare abstract class ServiceFactory<R extends Repositories> implements IServiceFactory {
|
|
7
6
|
protected repositories: R;
|
|
8
7
|
protected redis: Redis;
|
|
9
8
|
protected messageBroker: MessageBroker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceFactoryBase.js","sourceRoot":"","sources":["../../src/services/ServiceFactoryBase.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ServiceFactoryBase.js","sourceRoot":"","sources":["../../src/services/ServiceFactoryBase.ts"],"names":[],"mappings":";;AAWA,MAAe,cAAc;IAS3B,YAAY,YAAe,EAAE,KAAY,EAAE,aAA4B;QACrE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CAQF;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -10,19 +10,19 @@ declare abstract class ServiceHandlerBase<R extends Repositories, T extends Enti
|
|
|
10
10
|
protected request?: IAuthorizedRequest;
|
|
11
11
|
protected serviceExecutor: IServiceExecutor;
|
|
12
12
|
protected permissions?: PermissionsMap;
|
|
13
|
-
constructor(repositories: R, redis: Redis, messageBroker: MessageBroker, serviceExecutor: IServiceExecutor, request?: IAuthorizedRequest
|
|
13
|
+
constructor(repositories: R, redis: Redis, messageBroker: MessageBroker, serviceExecutor: IServiceExecutor, request?: IAuthorizedRequest);
|
|
14
14
|
requestData: any;
|
|
15
15
|
get Permissions(): PermissionsMap;
|
|
16
16
|
set Permissions(permissions: PermissionsMap);
|
|
17
17
|
abstract selectData(): Object;
|
|
18
|
-
abstract execute(data: any): Promise<
|
|
18
|
+
abstract execute(data: any): Promise<unknown>;
|
|
19
19
|
protected simpleHandleRevisions(entityClone: EntityBase, entity: EntityBase): any;
|
|
20
|
-
protected handleRevisions(entityClone: any, entity: any
|
|
20
|
+
protected handleRevisions(entityClone: any, entity: any): any;
|
|
21
21
|
private _emitEvent;
|
|
22
22
|
protected _insert(entityToInsert: any): Promise<T>;
|
|
23
23
|
protected abstract getEntityName(): string;
|
|
24
24
|
protected abstract getMainRepository(): string;
|
|
25
|
-
protected _update(entityUnique: any, update: (input: T) => Promise<void
|
|
26
|
-
protected _updateMulti(entityUniques: any, update: (input: T) => Promise<void
|
|
25
|
+
protected _update(entityUnique: any, update: (input: T) => Promise<void>): Promise<T>;
|
|
26
|
+
protected _updateMulti(entityUniques: any, update: (input: T) => Promise<void>): Promise<T[]>;
|
|
27
27
|
}
|
|
28
28
|
export default ServiceHandlerBase;
|
|
@@ -16,7 +16,7 @@ const actions = {
|
|
|
16
16
|
updated: 'UPDATED',
|
|
17
17
|
};
|
|
18
18
|
class ServiceHandlerBase {
|
|
19
|
-
constructor(repositories, redis, messageBroker, serviceExecutor, request
|
|
19
|
+
constructor(repositories, redis, messageBroker, serviceExecutor, request) {
|
|
20
20
|
this.repositories = repositories;
|
|
21
21
|
this.request = request;
|
|
22
22
|
this.redis = redis;
|
|
@@ -30,8 +30,17 @@ class ServiceHandlerBase {
|
|
|
30
30
|
this.permissions = permissions;
|
|
31
31
|
}
|
|
32
32
|
simpleHandleRevisions(entityClone, entity) {
|
|
33
|
-
entity.updatedAt =
|
|
34
|
-
|
|
33
|
+
entity.updatedAt =
|
|
34
|
+
this.request?.session?.date ||
|
|
35
|
+
this.requestData?.updatedAt ||
|
|
36
|
+
this.requestData?.createdAt ||
|
|
37
|
+
timeProvider_1.default.jsDate();
|
|
38
|
+
entity.updatedBy =
|
|
39
|
+
this.request?.session?.account?.login ||
|
|
40
|
+
executionContext_1.default.getAuthorizedUserLogin() ||
|
|
41
|
+
this.requestData?.updatedBy ||
|
|
42
|
+
this.requestData?.createdBy ||
|
|
43
|
+
'%system';
|
|
35
44
|
entity.createdAt = entityClone.createdAt;
|
|
36
45
|
entity.createdBy = entityClone.createdBy;
|
|
37
46
|
const delta = diffPatcher.diff(entityClone, entity);
|
|
@@ -40,44 +49,52 @@ class ServiceHandlerBase {
|
|
|
40
49
|
}
|
|
41
50
|
return delta;
|
|
42
51
|
}
|
|
43
|
-
handleRevisions(entityClone, entity
|
|
52
|
+
handleRevisions(entityClone, entity) {
|
|
44
53
|
return this.simpleHandleRevisions(entityClone, entity);
|
|
45
54
|
}
|
|
46
55
|
_emitEvent(eventType, eventData) {
|
|
47
56
|
return this.messageBroker.emitEvent(eventType, eventData);
|
|
48
57
|
}
|
|
49
58
|
async _insert(entityToInsert) {
|
|
50
|
-
const createdEntity = await this.repositories
|
|
59
|
+
const createdEntity = await this.repositories
|
|
60
|
+
.getRepository(this.getMainRepository())
|
|
61
|
+
._insert(entityToInsert);
|
|
51
62
|
this._emitEvent(`ENTITY-${this.getEntityName()}-${actions.created}`, {
|
|
52
63
|
entity: createdEntity,
|
|
53
64
|
});
|
|
54
65
|
return createdEntity;
|
|
55
66
|
}
|
|
56
|
-
async _update(entityUnique, update
|
|
57
|
-
const multiResult = await this._updateMulti([entityUnique], update
|
|
67
|
+
async _update(entityUnique, update) {
|
|
68
|
+
const multiResult = await this._updateMulti([entityUnique], update);
|
|
58
69
|
return multiResult[0];
|
|
59
70
|
}
|
|
60
|
-
async _updateMulti(entityUniques, update
|
|
71
|
+
async _updateMulti(entityUniques, update) {
|
|
61
72
|
const repository = this.repositories.getRepository(this.getMainRepository());
|
|
62
|
-
const resourceIds = entityUniques
|
|
73
|
+
const resourceIds = entityUniques
|
|
74
|
+
.map((entityUnique) => repository.entityUniqueToString(entityUnique))
|
|
75
|
+
.sort();
|
|
63
76
|
if (uniquify(resourceIds).length !== resourceIds.length) {
|
|
64
77
|
return Promise.reject(new Exception_1.default({
|
|
65
78
|
code: 'UNALBE_TO_UPDATE_ONE_OBJECT_AT_THE_SAME_TIME',
|
|
66
79
|
}));
|
|
67
80
|
}
|
|
68
|
-
const result = await this.redis
|
|
69
|
-
|
|
81
|
+
const result = await this.redis
|
|
82
|
+
.getLocker()
|
|
83
|
+
.using(resourceIds, 10000, async () => {
|
|
84
|
+
const entities = await repository.findByUniqueKeys(entityUniques, {
|
|
85
|
+
includeInactive: true,
|
|
86
|
+
});
|
|
70
87
|
if (entities.length !== entityUniques.length) {
|
|
71
88
|
throw new Exception_1.default({
|
|
72
89
|
code: 'NOT_FOUND',
|
|
73
90
|
});
|
|
74
91
|
}
|
|
75
92
|
const clones = entities.map(clone);
|
|
76
|
-
const sortedEntityUniques = clones.map(e => repository.getUniqueValue(e));
|
|
77
|
-
await Promise.all(entities.map(e => update(e)));
|
|
93
|
+
const sortedEntityUniques = clones.map((e) => repository.getUniqueValue(e));
|
|
94
|
+
await Promise.all(entities.map((e) => update(e)));
|
|
78
95
|
const resultArray = [];
|
|
79
96
|
await Promise.all(entities.map(async (entity, index) => {
|
|
80
|
-
const delta = this.handleRevisions(clones[index], entity
|
|
97
|
+
const delta = this.handleRevisions(clones[index], entity);
|
|
81
98
|
let hasChanges = false;
|
|
82
99
|
Object.keys(delta || {}).forEach((key) => {
|
|
83
100
|
if (['updatedAt', 'updatedBy'].indexOf(key) < 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceHandlerBase.js","sourceRoot":"","sources":["../../src/services/ServiceHandlerBase.ts"],"names":[],"mappings":";;;;;AAAA,yDAAiC;AACjC,6DAAqC;AACrC,mEAA2C;
|
|
1
|
+
{"version":3,"file":"ServiceHandlerBase.js","sourceRoot":"","sources":["../../src/services/ServiceHandlerBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { IAuthorizedRequest } from '../types';
|
|
1
|
+
import { IAuthorizedRequest, File } from '../types';
|
|
3
2
|
declare const _default: {
|
|
4
3
|
selectBody: (req: IAuthorizedRequest) => any;
|
|
5
4
|
selectLanguageCookie: (req: IAuthorizedRequest) => {
|
|
@@ -12,9 +11,9 @@ declare const _default: {
|
|
|
12
11
|
body: any;
|
|
13
12
|
};
|
|
14
13
|
selectFileAsProp: (req: IAuthorizedRequest) => {
|
|
15
|
-
file:
|
|
14
|
+
file: File;
|
|
16
15
|
};
|
|
17
|
-
selectFile: (req: IAuthorizedRequest) =>
|
|
16
|
+
selectFile: (req: IAuthorizedRequest) => File;
|
|
18
17
|
selectStripeSignature: (req: IAuthorizedRequest) => {
|
|
19
18
|
stripeSignature: string | string[];
|
|
20
19
|
};
|
|
@@ -2,17 +2,33 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = {
|
|
4
4
|
selectBody: (req) => req.originalRequest.body,
|
|
5
|
-
selectLanguageCookie: (req) => ({
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
selectLanguageCookie: (req) => ({
|
|
6
|
+
language: req.originalRequest.cookies.language,
|
|
7
|
+
}),
|
|
8
|
+
selectIsStartaOrderCookie: (req) => ({
|
|
9
|
+
isFoundByStarta: !!req.originalRequest.cookies?.['s-o'],
|
|
10
|
+
}),
|
|
11
|
+
selectBodyAsProp: (req) => ({
|
|
12
|
+
body: req.originalRequest.body,
|
|
13
|
+
}),
|
|
14
|
+
selectFileAsProp: (req) => ({
|
|
15
|
+
file: req.originalRequest.file,
|
|
16
|
+
}),
|
|
9
17
|
selectFile: (req) => req.originalRequest.file,
|
|
10
|
-
selectStripeSignature: (req) => ({
|
|
11
|
-
|
|
12
|
-
|
|
18
|
+
selectStripeSignature: (req) => ({
|
|
19
|
+
stripeSignature: req.originalRequest.headers['stripe-signature'],
|
|
20
|
+
}),
|
|
21
|
+
selectClientIp: (req) => ({
|
|
22
|
+
clientIp: req.originalRequest.headers['cf-connecting-ip'] ||
|
|
23
|
+
req.originalRequest.connection.remoteAddress,
|
|
24
|
+
}),
|
|
25
|
+
selectUserAgent: (req) => ({
|
|
26
|
+
userAgent: req.originalRequest.headers['user-agent'],
|
|
27
|
+
}),
|
|
13
28
|
selectClientCountry: (req) => {
|
|
14
|
-
const country = req.originalRequest.headers['CF-IPCountry'] ||
|
|
15
|
-
|
|
29
|
+
const country = req.originalRequest.headers['CF-IPCountry'] ||
|
|
30
|
+
req.originalRequest.headers['cf-ipcountry'];
|
|
31
|
+
return { clientCountry: country || 'UA' };
|
|
16
32
|
},
|
|
17
33
|
selectQuery: (req) => {
|
|
18
34
|
if (!req.originalRequest.query) {
|
|
@@ -24,9 +40,10 @@ exports.default = {
|
|
|
24
40
|
let currentNode = result;
|
|
25
41
|
keyPath.forEach((keyPathItem, index) => {
|
|
26
42
|
if (!currentNode[keyPathItem]) {
|
|
27
|
-
currentNode[keyPathItem] =
|
|
28
|
-
|
|
29
|
-
|
|
43
|
+
currentNode[keyPathItem] =
|
|
44
|
+
keyPath.length - 1 === index
|
|
45
|
+
? req.originalRequest.query[key]
|
|
46
|
+
: {};
|
|
30
47
|
}
|
|
31
48
|
currentNode = currentNode[keyPathItem];
|
|
32
49
|
});
|
|
@@ -38,11 +55,14 @@ exports.default = {
|
|
|
38
55
|
}, {});
|
|
39
56
|
return recomposedQuery;
|
|
40
57
|
},
|
|
41
|
-
selectLoginFromSession: (req) => ({
|
|
58
|
+
selectLoginFromSession: (req) => ({
|
|
59
|
+
login: req.session.account.login,
|
|
60
|
+
}),
|
|
42
61
|
selectParams: (req) => req.originalRequest.params,
|
|
43
62
|
selectSession: (req) => req.session,
|
|
44
63
|
selectRemarketingUrls: (req) => ({
|
|
45
|
-
remarketingUrls: req.originalRequest.cookies
|
|
64
|
+
remarketingUrls: req.originalRequest.cookies.remarketing_urls &&
|
|
65
|
+
JSON.parse(req.originalRequest.cookies.remarketing_urls),
|
|
46
66
|
}),
|
|
47
67
|
composeSelectors(...args) {
|
|
48
68
|
const selectors = args;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataSelectors.js","sourceRoot":"","sources":["../../src/services/dataSelectors.ts"],"names":[],"mappings":";;AAEA,kBAAe;IACb,UAAU,EAAE,CAAC,GAAuB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI;IACjE,oBAAoB,EAAE,CAAC,GAAuB,EAAyB,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"dataSelectors.js","sourceRoot":"","sources":["../../src/services/dataSelectors.ts"],"names":[],"mappings":"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"}
|
package/lib/timeProvider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeProvider.js","sourceRoot":"","sources":["../src/timeProvider.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAE5B,MAAM,YAAY;
|
|
1
|
+
{"version":3,"file":"timeProvider.js","sourceRoot":"","sources":["../src/timeProvider.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAE5B,MAAM,YAAY;IAGhB;QACE,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,IAAa;QAClB,IAAI,IAAI,EAAE;YACR,OAAO,IAAA,gBAAM,EAAC,IAAI,CAAC,CAAC;SACrB;QAED,OAAO,IAAA,gBAAM,GAAE,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,IAAa;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,IAAI,CAAC,UAAU,IAAI,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IAC/C,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,IAAI,CAAC,UAAU,IAAI,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED,eAAe;QACb,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,kBAAkB,CAChB,UAAyC,EACzC,IAAmC;QAEnC,OAAO,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IACtC,CAAC;CACF;AAED,kBAAe,IAAI,YAAY,EAAE,CAAC"}
|