@bearei/server-common 0.0.120 → 0.0.121

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.
@@ -28,21 +28,26 @@ let AccessGuard = class AccessGuard {
28
28
  this.reflector = reflector;
29
29
  }
30
30
  canActivate(context) {
31
- const requiredAccesses = this.reflector.getAllAndOverride(decorators_1.IS_PUBLIC_KEY, [
32
- context.getClass(),
33
- context.getHandler()
34
- ]);
31
+ const requiredAccesses = this.reflector.getAllAndOverride(decorators_1.IS_PUBLIC_KEY, [context.getClass(), context.getHandler()]);
35
32
  const request = context.switchToHttp().getRequest();
36
33
  const headers = request.headers;
37
- const authorization = headers['x-ei-internal-authorization'] ? 'x-ei-internal-authorization' : 'authorization';
34
+ const authorization = headers['x-ei-internal-authorization'] ?
35
+ 'x-ei-internal-authorization'
36
+ : 'authorization';
38
37
  const token = (0, utils_1.formatToken)(headers)(authorization);
39
38
  if (!token) {
40
- (0, utils_1.throwHTTPError)({ code: '401001', message: 'Authentication token does not exist' })(app_interface_1.HTTPError.UNAUTHORIZED);
39
+ (0, utils_1.throwHTTPError)({
40
+ code: '401001',
41
+ message: 'Authentication token does not exist'
42
+ })(app_interface_1.HTTPError.UNAUTHORIZED);
41
43
  }
42
44
  const handleJWTPayload = (request) => {
43
45
  const handleCompareResult = (request) => (result) => {
44
46
  if (!result) {
45
- (0, utils_1.throwHTTPError)({ code: '401007', message: 'Internal service signature verification failed' })(app_interface_1.HTTPError.UNAUTHORIZED);
47
+ (0, utils_1.throwHTTPError)({
48
+ code: '401007',
49
+ message: 'Internal service signature verification failed'
50
+ })(app_interface_1.HTTPError.UNAUTHORIZED);
46
51
  }
47
52
  request['internalAccess'] = result;
48
53
  return result;
@@ -57,14 +62,20 @@ let AccessGuard = class AccessGuard {
57
62
  serviceName: this.configService.get('service.name')
58
63
  })(subject).then(handleCompareResult(request));
59
64
  }
60
- const disableGuestAccess = subject === 'guest' && !requiredAccesses?.includes(access_interface_1.Access.GUEST);
65
+ const disableGuestAccess = subject === 'guest' &&
66
+ !requiredAccesses?.includes(access_interface_1.Access.GUEST);
61
67
  if (disableGuestAccess) {
62
- (0, utils_1.throwHTTPError)({ code: '401002', message: 'Guest user do not have access to current resource' })(app_interface_1.HTTPError.UNAUTHORIZED);
68
+ (0, utils_1.throwHTTPError)({
69
+ code: '401002',
70
+ message: 'Guest user do not have access to current resource'
71
+ })(app_interface_1.HTTPError.UNAUTHORIZED);
63
72
  }
64
73
  return Boolean(subject);
65
74
  };
66
75
  };
67
- return this.jwtService.verifyAsync(token).then(handleJWTPayload(request)(requiredAccesses));
76
+ return this.jwtService
77
+ .verifyAsync(token)
78
+ .then(handleJWTPayload(request)(requiredAccesses));
68
79
  }
69
80
  };
70
81
  exports.AccessGuard = AccessGuard;
@@ -1 +1 @@
1
- {"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"access.guard.js","sourceRoot":"","sources":["../../src/access/access.guard.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,9 @@ let AccessInterceptor = class AccessInterceptor {
12
12
  intercept(context, next) {
13
13
  const request = context.switchToHttp().getRequest();
14
14
  if (!request.headers['x-ei-ip']) {
15
- request.headers['x-ei-ip'] = request.headers['x-forwarded-for'] ?? request.headers['x-real-ip'];
15
+ request.headers['x-ei-ip'] =
16
+ request.headers['x-forwarded-for'] ??
17
+ request.headers['x-real-ip'];
16
18
  }
17
19
  if (!request.headers['x-ei-subject']) {
18
20
  request.headers['x-ei-subject'] = request.subject;
@@ -1 +1 @@
1
- {"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAyF;AAGlF,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACnG,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACxB,CAAC;CACJ,CAAA;AAlBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAkB7B"}
1
+ {"version":3,"file":"access.interceptor.js","sourceRoot":"","sources":["../../src/access/access.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAKuB;AAGhB,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;QAEnD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;gBACtB,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC;oBAClC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,OAAO,CAAA;QACrD,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAA;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACxB,CAAC;CACJ,CAAA;AApBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAoB7B"}
@@ -27,7 +27,10 @@ let ActionLogsService = class ActionLogsService {
27
27
  create({ headers, enableLogging = true, ...args }) {
28
28
  return async (data) => {
29
29
  if (enableLogging) {
30
- await this.externalService.createActionLogs(headers)({ ...args, data });
30
+ await this.externalService.createActionLogs(headers)({
31
+ ...args,
32
+ data
33
+ });
31
34
  }
32
35
  };
33
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"action-logs.service.js","sourceRoot":"","sources":["../../src/action-logs/action-logs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AACzC,oDAA6C;AAC7C,0CAA2C;AAIpC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACG;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,OAAO,CAAC,OAA0B;QAC9B,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,MAAM,EAAE,4BAAY,CAAC,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACjH,CAAC;IAED,OAAO,CAAC,OAA0B;QAC9B,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,MAAM,EAAE,4BAAY,CAAC,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACjH,CAAC;IAED,MAAM,CAAC,EAAC,OAAO,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,IAAI,EAA0B;QACpE,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE;YAC3C,IAAI,aAAa,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAC,GAAG,IAAI,EAAE,IAAI,EAAC,CAAC,CAAA;YACzE,CAAC;QACL,CAAC,CAAA;IACL,CAAC;CACJ,CAAA;AAlBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAEqC,0BAAe;GADpD,iBAAiB,CAkB7B"}
1
+ {"version":3,"file":"action-logs.service.js","sourceRoot":"","sources":["../../src/action-logs/action-logs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyC;AACzC,oDAA6C;AAC7C,0CAA2C;AAOpC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACG;IAA7B,YAA6B,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEjE,OAAO,CAAC,OAA0B;QAC9B,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE,CAC3C,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,MAAM,EAAE,4BAAY,CAAC,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACrE,CAAC;IAED,OAAO,CAAC,OAA0B;QAC9B,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE,CAC3C,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,MAAM,EAAE,4BAAY,CAAC,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACrE,CAAC;IAED,MAAM,CAAC,EAAC,OAAO,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,IAAI,EAA0B;QACpE,OAAO,KAAK,EAAE,IAA6B,EAAE,EAAE;YAC3C,IAAI,aAAa,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;oBACjD,GAAG,IAAI;oBACP,IAAI;iBACP,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAA;IACL,CAAC;CACJ,CAAA;AAvBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAEqC,0BAAe;GADpD,iBAAiB,CAuB7B"}
package/dist/app.dto.js CHANGED
@@ -42,7 +42,7 @@ __decorate([
42
42
  ], IndexDTO.prototype, "size", void 0);
43
43
  __decorate([
44
44
  (0, class_validator_1.IsBoolean)(),
45
- (0, class_transformer_1.Transform)(({ value }) => (typeof value === 'string' ? value === 'true' : value)),
45
+ (0, class_transformer_1.Transform)(({ value }) => typeof value === 'string' ? value === 'true' : value),
46
46
  __metadata("design:type", Boolean)
47
47
  ], IndexDTO.prototype, "count", void 0);
48
48
  __decorate([
@@ -53,7 +53,7 @@ __decorate([
53
53
  (0, class_validator_1.ArrayMaxSize)(1024),
54
54
  (0, class_validator_1.ArrayMinSize)(1),
55
55
  (0, decorators_1.IsNanoid)({ each: true }),
56
- (0, class_transformer_1.Transform)(({ value }) => (typeof value === 'string' ? value.split(',') : value)),
56
+ (0, class_transformer_1.Transform)(({ value }) => typeof value === 'string' ? value.split(',') : value),
57
57
  __metadata("design:type", Array)
58
58
  ], IndexDTO.prototype, "ids", void 0);
59
59
  __decorate([
@@ -61,7 +61,7 @@ __decorate([
61
61
  (0, class_validator_1.ArrayMinSize)(2),
62
62
  (0, class_validator_1.IsDateString)(undefined, { each: true }),
63
63
  (0, decorators_1.IsNanoid)({ each: true }),
64
- (0, class_transformer_1.Transform)(({ value }) => (typeof value === 'string' ? value.split(',') : value)),
64
+ (0, class_transformer_1.Transform)(({ value }) => typeof value === 'string' ? value.split(',') : value),
65
65
  __metadata("design:type", Array)
66
66
  ], IndexDTO.prototype, "createdAtRange", void 0);
67
67
  class ByIdDTO {
@@ -1 +1 @@
1
- {"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAWwB;AAExB,6CAAqC;AAErC,MAAa,QAAQ;IAEjB,EAAE,CAAS;IAKX,IAAI,CAAS;IAMb,IAAI,CAAS;IAIb,KAAK,CAAU;IAGf,KAAK,CAAQ;IAMb,GAAG,CAAW;IAOd,cAAc,CAAW;CAC5B;AAlCD,4BAkCC;AAhCG;IADC,IAAA,qBAAQ,GAAE;;oCACA;AAKX;IAHC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAMb;IAJC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,IAAI,CAAC;IACT,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAIb;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;uCAChE;AAGf;IADC,IAAA,wBAAM,EAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;uCACX;AAMb;IAJC,IAAA,8BAAY,EAAC,IAAI,CAAC;IAClB,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;qCACjE;AAOd;IALC,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,SAAS,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACrC,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;gDACtD;AAG7B,MAAa,OAAO;IAGhB,EAAE,CAAQ;CACb;AAJD,0BAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAQ,GAAE;;mCACD;AAGd,MAAa,UAAU;IAGnB,KAAK,CAAQ;CAChB;AAJD,gCAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,yBAAO,GAAE;;yCACG;AAGjB,MAAa,QAAQ;IAEjB,KAAK,CAAS;CACjB;AAHD,4BAGC;AADG;IADC,IAAA,qBAAQ,GAAE;;uCACG"}
1
+ {"version":3,"file":"app.dto.js","sourceRoot":"","sources":["../src/app.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA2C;AAC3C,qDAWwB;AAExB,6CAAqC;AAErC,MAAa,QAAQ;IAEjB,EAAE,CAAS;IAKX,IAAI,CAAS;IAMb,IAAI,CAAS;IAMb,KAAK,CAAU;IAGf,KAAK,CAAQ;IAQb,GAAG,CAAW;IASd,cAAc,CAAW;CAC5B;AAxCD,4BAwCC;AAtCG;IADC,IAAA,qBAAQ,GAAE;;oCACA;AAKX;IAHC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAMb;IAJC,IAAA,0BAAQ,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;IAC3B,IAAA,qBAAG,EAAC,IAAI,CAAC;IACT,IAAA,qBAAG,EAAC,CAAC,CAAC;IACN,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;;sCAC7C;AAMb;IAJC,IAAA,2BAAS,GAAE;IACX,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CACnB,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CACvD;;uCACc;AAGf;IADC,IAAA,wBAAM,EAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;;uCACX;AAQb;IANC,IAAA,8BAAY,EAAC,IAAI,CAAC;IAClB,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CACnB,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CACvD;;qCACa;AASd;IAPC,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,CAAC,CAAC;IACf,IAAA,8BAAY,EAAC,SAAS,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACrC,IAAA,qBAAQ,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,IAAA,6BAAS,EAAC,CAAC,EAAC,KAAK,EAAC,EAAE,EAAE,CACnB,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CACvD;;gDACwB;AAG7B,MAAa,OAAO;IAGhB,EAAE,CAAQ;CACb;AAJD,0BAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,qBAAQ,GAAE;;mCACD;AAGd,MAAa,UAAU;IAGnB,KAAK,CAAQ;CAChB;AAJD,gCAIC;AADG;IAFC,IAAA,2BAAS,GAAE;IACX,IAAA,yBAAO,GAAE;;yCACG;AAGjB,MAAa,QAAQ;IAEjB,KAAK,CAAS;CACjB;AAHD,4BAGC;AADG;IADC,IAAA,qBAAQ,GAAE;;uCACG"}
@@ -49,7 +49,12 @@ __decorate([
49
49
  __metadata("design:type", String)
50
50
  ], CommonEntity.prototype, "id", void 0);
51
51
  __decorate([
52
- (0, typeorm_1.Column)({ default: app_interface_1.EntityStatus.RECOVERED, enum: app_interface_1.EntityStatus, nullable: false, type: 'enum' }),
52
+ (0, typeorm_1.Column)({
53
+ default: app_interface_1.EntityStatus.RECOVERED,
54
+ enum: app_interface_1.EntityStatus,
55
+ nullable: false,
56
+ type: 'enum'
57
+ }),
53
58
  __metadata("design:type", String)
54
59
  ], CommonEntity.prototype, "entityStatus", void 0);
55
60
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"app.entity.js","sourceRoot":"","sources":["../src/app.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,mCAA6B;AAC7B,qCAagB;AAChB,mDAA4C;AAIrC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAExC,SAAS,CAAQ;IAGjB,EAAE,CAAQ;IAGV,YAAY,CAAc;IAG1B,SAAS,CAAQ;IAGjB,SAAS,CAAQ;IAGjB,OAAO,CAAQ;IAGf,SAAS,CAAQ;IAGjB,YAAY;QACR,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,IAAA,eAAK,GAAE,CAAC,WAAW,EAAE,CAAA;IAC1C,CAAC;IAGD,YAAY;QACR,IAAI,CAAC,SAAS,GAAG,IAAA,eAAK,GAAE,CAAC,WAAW,EAAE,CAAA;IAC1C,CAAC;IAGD,gBAAgB;QACZ,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,YAAY,CAAA;IACjD,CAAC;IAGD,aAAa;QACT,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,SAAS,CAAA;IAC9C,CAAC;CACJ,CAAA;AA1CY,oCAAY;AAErB;IADC,IAAA,gCAAsB,EAAC,UAAU,CAAC;;+CAClB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;wCAC7C;AAGV;IADC,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,4BAAY,CAAC,SAAS,EAAE,IAAI,EAAE,4BAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC;;kDACnE;AAG1B;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;;+CACxC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;;+CACxC;AAGjB;IADC,IAAA,uBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;;6CAClB;AAGf;IADC,IAAA,0BAAgB,GAAE;;+CACF;AAGjB;IADC,IAAA,sBAAY,GAAE;;;;gDAId;AAGD;IADC,IAAA,sBAAY,GAAE;;;;gDAGd;AAGD;IADC,IAAA,0BAAgB,GAAE;;;;oDAGlB;AAGD;IADC,IAAA,uBAAa,GAAE;;;;iDAGf;uBAzCQ,YAAY;IAFxB,IAAA,eAAK,EAAC,CAAC,WAAW,CAAC,CAAC;IACpB,IAAA,eAAK,EAAC,CAAC,IAAI,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;GACjB,YAAY,CA0CxB"}
1
+ {"version":3,"file":"app.entity.js","sourceRoot":"","sources":["../src/app.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,mCAA6B;AAC7B,qCAagB;AAChB,mDAA4C;AAIrC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,oBAAU;IAExC,SAAS,CAAQ;IAGjB,EAAE,CAAQ;IAQV,YAAY,CAAc;IAG1B,SAAS,CAAQ;IAGjB,SAAS,CAAQ;IAGjB,OAAO,CAAQ;IAGf,SAAS,CAAQ;IAGjB,YAAY;QACR,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,GAAE,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,IAAA,eAAK,GAAE,CAAC,WAAW,EAAE,CAAA;IAC1C,CAAC;IAGD,YAAY;QACR,IAAI,CAAC,SAAS,GAAG,IAAA,eAAK,GAAE,CAAC,WAAW,EAAE,CAAA;IAC1C,CAAC;IAGD,gBAAgB;QACZ,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,YAAY,CAAA;IACjD,CAAC;IAGD,aAAa;QACT,IAAI,CAAC,YAAY,GAAG,4BAAY,CAAC,SAAS,CAAA;IAC9C,CAAC;CACJ,CAAA;AA/CY,oCAAY;AAErB;IADC,IAAA,gCAAsB,EAAC,UAAU,CAAC;;+CAClB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;;wCAC7C;AAQV;IANC,IAAA,gBAAM,EAAC;QACJ,OAAO,EAAE,4BAAY,CAAC,SAAS;QAC/B,IAAI,EAAE,4BAAY;QAClB,QAAQ,EAAE,KAAK;QACf,IAAI,EAAE,MAAM;KACf,CAAC;;kDACwB;AAG1B;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;;+CACxC;AAGjB;IADC,IAAA,0BAAgB,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC;;+CACxC;AAGjB;IADC,IAAA,uBAAa,EAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,CAAC;;6CAClB;AAGf;IADC,IAAA,0BAAgB,GAAE;;+CACF;AAGjB;IADC,IAAA,sBAAY,GAAE;;;;gDAId;AAGD;IADC,IAAA,sBAAY,GAAE;;;;gDAGd;AAGD;IADC,IAAA,0BAAgB,GAAE;;;;oDAGlB;AAGD;IADC,IAAA,uBAAa,GAAE;;;;iDAGf;uBA9CQ,YAAY;IAFxB,IAAA,eAAK,EAAC,CAAC,WAAW,CAAC,CAAC;IACpB,IAAA,eAAK,EAAC,CAAC,IAAI,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;GACjB,YAAY,CA+CxB"}
@@ -1 +1 @@
1
- {"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,4CAA4B,CAAA;IAC5B,uCAAuB,CAAA;AAC3B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AASD,IAAY,SASX;AATD,WAAY,SAAS;IACjB,uCAA0B,CAAA;IAC1B,oCAAuB,CAAA;IACvB,6CAAgC,CAAA;IAChC,0DAA6C,CAAA;IAC7C,mCAAsB,CAAA;IACtB,+CAAkC,CAAA;IAClC,0CAA6B,CAAA;IAC7B,yDAA4C,CAAA;AAChD,CAAC,EATW,SAAS,yBAAT,SAAS,QASpB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AACvB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,MASX;AATD,WAAY,MAAM;IACd,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,4BAAkB,CAAA;IAClB,8BAAoB,CAAA;IACpB,4BAAkB,CAAA;IAClB,2BAAiB,CAAA;AACrB,CAAC,EATW,MAAM,sBAAN,MAAM,QASjB"}
1
+ {"version":3,"file":"app.interface.js","sourceRoot":"","sources":["../src/app.interface.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,4CAA4B,CAAA;IAC5B,uCAAuB,CAAA;AAC3B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,QAGX;AAHD,WAAY,QAAQ;IAChB,0BAAc,CAAA;IACd,0BAAc,CAAA;AAClB,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAiBD,IAAY,SASX;AATD,WAAY,SAAS;IACjB,uCAA0B,CAAA;IAC1B,oCAAuB,CAAA;IACvB,6CAAgC,CAAA;IAChC,0DAA6C,CAAA;IAC7C,mCAAsB,CAAA;IACtB,+CAAkC,CAAA;IAClC,0CAA6B,CAAA;IAC7B,yDAA4C,CAAA;AAChD,CAAC,EATW,SAAS,yBAAT,SAAS,QASpB;AAED,IAAY,YAGX;AAHD,WAAY,YAAY;IACpB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;AACvB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,MASX;AATD,WAAY,MAAM;IACd,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,2BAAiB,CAAA;IACjB,4BAAkB,CAAA;IAClB,8BAAoB,CAAA;IACpB,4BAAkB,CAAA;IAClB,2BAAiB,CAAA;AACrB,CAAC,EATW,MAAM,sBAAN,MAAM,QASjB"}
@@ -31,14 +31,19 @@ let BaseService = class BaseService {
31
31
  };
32
32
  return async (repository) => {
33
33
  const preValidate = preValidateOptions?.findOptions &&
34
- Object.entries(preValidateOptions.findOptions).filter(([, value]) => typeof value !== 'undefined')
35
- .length;
34
+ Object.entries(preValidateOptions.findOptions).filter(([, value]) => typeof value !== 'undefined').length;
36
35
  if (preValidate) {
37
- await (await this.preValidate({ ...preValidateOptions, serviceName, actionLogsOptions }))(repository);
36
+ await (await this.preValidate({
37
+ ...preValidateOptions,
38
+ serviceName,
39
+ actionLogsOptions
40
+ }))(repository);
38
41
  }
39
42
  const createdEntity = repository.create({ ...entityOptions });
40
43
  return async (entityManager) => {
41
- const entity = await (entityManager ? entityManager.save(createdEntity) : createdEntity.save());
44
+ const entity = await (entityManager ?
45
+ entityManager.save(createdEntity)
46
+ : createdEntity.save());
42
47
  await this.actionLogsSuccess(actionLogsOptions)(entity);
43
48
  return entity;
44
49
  };
@@ -54,12 +59,20 @@ let BaseService = class BaseService {
54
59
  serviceName
55
60
  };
56
61
  return async (repository) => {
57
- const entity = await this.findOne({ serviceName, findOptions, actionLogsOptions })(repository);
58
- const raw = enableLogging ? { ...actionLogsOptions.raw, entity: { ...entity } } : undefined;
62
+ const entity = await this.findOne({
63
+ serviceName,
64
+ findOptions,
65
+ actionLogsOptions
66
+ })(repository);
67
+ const raw = enableLogging ?
68
+ { ...actionLogsOptions.raw, entity: { ...entity } }
69
+ : undefined;
59
70
  await this.checkProhibited(actionLogsOptions)(entity);
60
71
  await entity.softRemove();
61
72
  return async (entityManager) => {
62
- await (entityManager ? entityManager.save(entity) : entity.save());
73
+ await (entityManager ?
74
+ entityManager.save(entity)
75
+ : entity.save());
63
76
  await this.actionLogsSuccess({ ...actionLogsOptions, raw })(entity);
64
77
  };
65
78
  };
@@ -77,7 +90,8 @@ let BaseService = class BaseService {
77
90
  const handlePreValidateFindOptions = (rawPreValidateFindOptions) => (entity) => (accumulator, currentValue) => currentValue ?
78
91
  {
79
92
  ...accumulator,
80
- [currentValue]: rawPreValidateFindOptions[currentValue] ?? entity[currentValue]
93
+ [currentValue]: rawPreValidateFindOptions[currentValue] ??
94
+ entity[currentValue]
81
95
  }
82
96
  : accumulator;
83
97
  const updatePreValidate = (preValidateOptions) => (actionLogsOptions) => async ({ entity, repository }) => {
@@ -97,13 +111,27 @@ let BaseService = class BaseService {
97
111
  await (await this.preValidate({
98
112
  ...otherPreValidateOptions,
99
113
  actionLogsOptions,
100
- findOptions: { ...preValidateFindOptions, notId: entity.id },
114
+ findOptions: {
115
+ ...preValidateFindOptions,
116
+ notId: entity.id
117
+ },
101
118
  serviceName
102
119
  }))(repository);
103
120
  };
104
121
  return (repository) => async (rawEntity) => {
105
- const entity = rawEntity ?? (await this.findOne({ actionLogsOptions, findOptions, serviceName })(repository));
106
- const raw = enableLogging ? { ...actionLogsOptions.raw, entity: { ...entity }, entityOptions } : undefined;
122
+ const entity = rawEntity ??
123
+ (await this.findOne({
124
+ actionLogsOptions,
125
+ findOptions,
126
+ serviceName
127
+ })(repository));
128
+ const raw = enableLogging ?
129
+ {
130
+ ...actionLogsOptions.raw,
131
+ entity: { ...entity },
132
+ entityOptions
133
+ }
134
+ : undefined;
107
135
  const nextActionLogsOptions = { ...actionLogsOptions, raw };
108
136
  await this.checkProhibited(nextActionLogsOptions)(entity);
109
137
  if (preValidateOptions) {
@@ -111,7 +139,9 @@ let BaseService = class BaseService {
111
139
  }
112
140
  repository.merge(entity, entityOptions);
113
141
  return async (entityManager) => {
114
- await (entityManager ? entityManager.save(entity) : entity.save());
142
+ await (entityManager ?
143
+ entityManager.save(entity)
144
+ : entity.save());
115
145
  await this.actionLogsSuccess({ ...actionLogsOptions, raw })(entity);
116
146
  return entity;
117
147
  };
@@ -124,17 +154,25 @@ let BaseService = class BaseService {
124
154
  const limit = size;
125
155
  const offset = (page - 1) * size;
126
156
  const where = {
127
- ...Object.entries(otherFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ? { ...accumulator, [key]: value } : accumulator, {}),
157
+ ...Object.entries(otherFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ?
158
+ { ...accumulator, [key]: value }
159
+ : accumulator, {}),
128
160
  ...(ids && { id: (0, typeorm_1.In)(ids) }),
129
- ...(createdAtRange && { createdAt: (0, typeorm_1.Between)(createdAtRange[0], createdAtRange[1]) })
161
+ ...(createdAtRange && {
162
+ createdAt: (0, typeorm_1.Between)(createdAtRange[0], createdAtRange[1])
163
+ })
130
164
  };
131
165
  return async (repository) => {
132
166
  const entityName = alias ?? repository.metadata.name;
133
167
  const findQueryBuilder = repository.createQueryBuilder(entityName);
134
- const distinctOnAliasFields = distinctOnFields ? distinctOnFields.map(field => `${entityName}.${field}`) : undefined;
168
+ const distinctOnAliasFields = distinctOnFields ?
169
+ distinctOnFields.map(field => `${entityName}.${field}`)
170
+ : undefined;
135
171
  const orderBy = distinctOnAliasFields ?
136
172
  {
137
- ...distinctOnAliasFields.reduce((accumulator, currentValue) => currentValue ? { ...accumulator, [currentValue]: 'ASC' } : accumulator, {}),
173
+ ...distinctOnAliasFields.reduce((accumulator, currentValue) => currentValue ?
174
+ { ...accumulator, [currentValue]: 'ASC' }
175
+ : accumulator, {}),
138
176
  [`${entityName}.${orderByField}`]: order
139
177
  }
140
178
  : { [`${entityName}.${orderByField}`]: order };
@@ -146,9 +184,16 @@ let BaseService = class BaseService {
146
184
  findQueryBuilder.withDeleted();
147
185
  }
148
186
  const [entities, { count }] = await Promise.all([
149
- findQueryBuilder.where(where).limit(limit).offset(offset).getMany(),
187
+ findQueryBuilder
188
+ .where(where)
189
+ .limit(limit)
190
+ .offset(offset)
191
+ .getMany(),
150
192
  isCount ?
151
- this.count({ findOptions: { createdAtRange, ids, ...otherFindOptions }, findManyOptions })(repository)
193
+ this.count({
194
+ findOptions: { createdAtRange, ids, ...otherFindOptions },
195
+ findManyOptions
196
+ })(repository)
152
197
  : Promise.resolve({ count: undefined })
153
198
  ]);
154
199
  return {
@@ -166,13 +211,17 @@ let BaseService = class BaseService {
166
211
  const entityName = alias ?? repository.metadata.name;
167
212
  const queryBuilder = repository.createQueryBuilder(entityName);
168
213
  const where = {
169
- ...Object.entries(otherFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ? { ...accumulator, [key]: value } : accumulator, {}),
214
+ ...Object.entries(otherFindOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ?
215
+ { ...accumulator, [key]: value }
216
+ : accumulator, {}),
170
217
  ...(ids && { id: (0, typeorm_1.In)(ids) }),
171
218
  ...(createdAtRange && {
172
219
  createdAt: (0, typeorm_1.Between)(createdAtRange[0], createdAtRange[1])
173
220
  })
174
221
  };
175
- const distinctOnAliasFields = distinctOnFields ? distinctOnFields.map(field => `${entityName}.${field}`) : undefined;
222
+ const distinctOnAliasFields = distinctOnFields ?
223
+ distinctOnFields.map(field => `${entityName}.${field}`)
224
+ : undefined;
176
225
  queryBuilder.where(where);
177
226
  if (withDeleted) {
178
227
  queryBuilder.withDeleted();
@@ -187,7 +236,9 @@ let BaseService = class BaseService {
187
236
  findOne({ serviceName, findOptions, actionLogsOptions }) {
188
237
  return async (repository) => {
189
238
  const entity = await repository.findOne({
190
- where: Object.entries(findOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ? { ...accumulator, [key]: value } : accumulator, {})
239
+ where: Object.entries(findOptions).reduce((accumulator, [key, value]) => typeof value !== 'undefined' ?
240
+ { ...accumulator, [key]: value }
241
+ : accumulator, {})
191
242
  });
192
243
  if (!entity) {
193
244
  const fields = JSON.stringify(Object.keys(findOptions));
@@ -238,14 +289,22 @@ let BaseService = class BaseService {
238
289
  .map(entity => entity.softRemove()));
239
290
  await Promise.all(entitiesToRemove.map(this.checkProhibited(actionLogsOptions)));
240
291
  const entitiesToRecover = await Promise.all(entities
241
- .filter(entity => entityIds.includes(entity[associationKey]) && entity.deletedAt)
292
+ .filter(entity => entityIds.includes(entity[associationKey]) &&
293
+ entity.deletedAt)
242
294
  .map(entity => entity.recover()));
243
- const entityActions = [...entitiesToAdd, ...entitiesToRecover, ...entitiesToRemove];
295
+ const entityActions = [
296
+ ...entitiesToAdd,
297
+ ...entitiesToRecover,
298
+ ...entitiesToRemove
299
+ ];
244
300
  return async (entityManager) => {
245
301
  const savedEntities = await (entityManager ?
246
302
  entityManager.save(entityActions)
247
303
  : repository.save(entityActions));
248
- await this.actionLogsSuccess({ ...actionLogsOptions, raw })(savedEntities);
304
+ await this.actionLogsSuccess({
305
+ ...actionLogsOptions,
306
+ raw
307
+ })(savedEntities);
249
308
  return [...entities, ...entitiesToAdd].filter(filterSoftRemoved);
250
309
  };
251
310
  };
@@ -253,11 +312,15 @@ let BaseService = class BaseService {
253
312
  }
254
313
  async preValidate({ actionLogsOptions, findOptions, orValidateKeysGroups, serviceName, validateMethod = 'and' }) {
255
314
  const handleOrKeys = ({ notId, ...args }) => (keys) => keys.reduce((accumulator, currentValue) => typeof currentValue !== 'undefined' ?
256
- { ...accumulator, [currentValue]: args[currentValue] }
315
+ {
316
+ ...accumulator,
317
+ [currentValue]: args[currentValue]
318
+ }
257
319
  : accumulator, (notId ? { id: (0, typeorm_1.Not)(notId) } : {}));
258
320
  const handleOrValidateWhere = (findOptions) => async (orValidateKeysGroups) => {
259
321
  const { notId, ...otherFindOptions } = findOptions;
260
- if (orValidateKeysGroups && !orValidateKeysGroups.every(keys => Array.isArray(keys))) {
322
+ if (orValidateKeysGroups &&
323
+ !orValidateKeysGroups.every(keys => Array.isArray(keys))) {
261
324
  const orValidateKeysGroups = JSON.stringify([
262
325
  ['key1', 'key2'],
263
326
  ['key1', 'key3']
@@ -265,17 +328,23 @@ let BaseService = class BaseService {
265
328
  await this.throwError({
266
329
  code: '400001',
267
330
  errorType: app_interface_1.HTTPError.BAD_REQUEST,
268
- message: `When using "or" as a validation method, "orValidateKeysGroups" must be a nested array.
331
+ message: `When using "or" as a validation method,
332
+ "orValidateKeysGroups" must be a nested array.
269
333
  ${orValidateKeysGroups}`
270
334
  })(actionLogsOptions);
271
335
  }
272
- const flattedValidateOrKeys = [...new Set(orValidateKeysGroups?.flat())];
336
+ const flattedValidateOrKeys = [
337
+ ...new Set(orValidateKeysGroups?.flat())
338
+ ];
273
339
  const findOrOptions = orValidateKeysGroups?.map(handleOrKeys(findOptions)) ?? [];
274
340
  return {
275
341
  where: [
276
342
  ...Object.entries(otherFindOptions)
277
343
  .filter(([key]) => !flattedValidateOrKeys.includes(key))
278
- .map(([key, value]) => ({ ...(notId && { id: (0, typeorm_1.Not)(notId) }), [key]: value })),
344
+ .map(([key, value]) => ({
345
+ ...(notId && { id: (0, typeorm_1.Not)(notId) }),
346
+ [key]: value
347
+ })),
279
348
  ...findOrOptions
280
349
  ],
281
350
  findOrOptions
@@ -285,12 +354,20 @@ let BaseService = class BaseService {
285
354
  const { where: orWhere, findOrOptions } = validateMethod === 'or' ?
286
355
  await handleOrValidateWhere(findOptions)(orValidateKeysGroups)
287
356
  : {};
288
- const where = validateMethod === 'and' ? { ...otherFindOptions, ...(notId && { id: (0, typeorm_1.Not)(notId) }) } : orWhere;
357
+ const where = validateMethod === 'and' ?
358
+ { ...otherFindOptions, ...(notId && { id: (0, typeorm_1.Not)(notId) }) }
359
+ : orWhere;
289
360
  return async (repository) => {
290
- const entity = await repository.findOne({ select: Object.keys(otherFindOptions), where });
361
+ const entity = await repository.findOne({
362
+ select: Object.keys(otherFindOptions),
363
+ where
364
+ });
291
365
  if (entity) {
292
366
  const fields = JSON.stringify(Object.keys({
293
- ...findOrOptions?.reduce((accumulator, currentValue) => ({ ...accumulator, ...currentValue }), {}),
367
+ ...findOrOptions?.reduce((accumulator, currentValue) => ({
368
+ ...accumulator,
369
+ ...currentValue
370
+ }), {}),
294
371
  ...otherFindOptions
295
372
  }));
296
373
  await this.throwError({
@@ -324,7 +401,8 @@ let BaseService = class BaseService {
324
401
  if (actionLogsOptions) {
325
402
  await this.actionLogsService.failure({
326
403
  ...actionLogsOptions,
327
- message: error?.message
404
+ message: error
405
+ ?.message
328
406
  })({ error });
329
407
  }
330
408
  throw error;
@@ -1 +1 @@
1
- {"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.service.js","sourceRoot":"","sources":["../../src/base/base.service.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,7 @@ const IsPassword = (validationOptions) => (object, propertyName) => (0, class_va
14
14
  validator: {
15
15
  validate(value) {
16
16
  const passwordRegex = /^(?=.*[A-Z])(?=.*\d)(?!.*\s)[\w!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]{8,32}$/;
17
- return typeof value === 'string' && passwordRegex.test(value);
17
+ return (typeof value === 'string' && passwordRegex.test(value));
18
18
  }
19
19
  }
20
20
  });
@@ -1 +1 @@
1
- {"version":3,"file":"is-password.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-password.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,UAAU,GACnB,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAChC,IAAA,mCAAiB,EAAC;IACd,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACL,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY;4FACoD;KAC/E;IACD,SAAS,EAAE;QACP,QAAQ,CAAC,KAAK;YACV,MAAM,aAAa,GAAG,4EAA4E,CAAA;YAElG,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACjE,CAAC;KACJ;CACJ,CAAC,CAAA;AAnBG,QAAA,UAAU,cAmBb"}
1
+ {"version":3,"file":"is-password.decorator.js","sourceRoot":"","sources":["../../src/decorators/is-password.decorator.ts"],"names":[],"mappings":";;;AAAA,qDAAoE;AAE7D,MAAM,UAAU,GACnB,CAAmB,iBAAqC,EAAE,EAAE,CAC5D,CAAC,MAAS,EAAE,YAAoB,EAAE,EAAE,CAChC,IAAA,mCAAiB,EAAC;IACd,IAAI,EAAE,YAAY;IAClB,YAAY,EAAE,YAAY;IAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,OAAO,EAAE;QACL,GAAG,iBAAiB;QACpB,OAAO,EAAE,GAAG,YAAY;4FACoD;KAC/E;IACD,SAAS,EAAE;QACP,QAAQ,CAAC,KAAK;YACV,MAAM,aAAa,GACf,4EAA4E,CAAA;YAEhF,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CACzD,CAAA;QACL,CAAC;KACJ;CACJ,CAAC,CAAA;AAtBG,QAAA,UAAU,cAsBb"}
@@ -1 +1 @@
1
- {"version":3,"file":"public.decorator.js","sourceRoot":"","sources":["../../src/decorators/public.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAG7B,QAAA,aAAa,GAAG,QAAQ,CAAA;AAC9B,MAAM,MAAM,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAA,oBAAW,EAAC,qBAAa,EAAE,QAAQ,CAAC,CAAA;AAArE,QAAA,MAAM,UAA+D"}
1
+ {"version":3,"file":"public.decorator.js","sourceRoot":"","sources":["../../src/decorators/public.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAA0C;AAG7B,QAAA,aAAa,GAAG,QAAQ,CAAA;AAC9B,MAAM,MAAM,GAAG,CAAC,QAAkB,EAAE,EAAE,CACzC,IAAA,oBAAW,EAAC,qBAAa,EAAE,QAAQ,CAAC,CAAA;AAD3B,QAAA,MAAM,UACqB"}
@@ -18,7 +18,11 @@ exports.ExternalModule = ExternalModule;
18
18
  exports.ExternalModule = ExternalModule = __decorate([
19
19
  (0, common_1.Module)({
20
20
  exports: [external_service_1.ExternalService],
21
- imports: [config_1.ConfigModule, axios_1.HttpModule.register({ timeout: 20000, maxRedirects: 5 }), jwt_1.JWTModule],
21
+ imports: [
22
+ config_1.ConfigModule,
23
+ axios_1.HttpModule.register({ timeout: 20000, maxRedirects: 5 }),
24
+ jwt_1.JWTModule
25
+ ],
22
26
  providers: [external_service_1.ExternalService]
23
27
  })
24
28
  ], ExternalModule);
@@ -1 +1 @@
1
- {"version":3,"file":"external.module.js","sourceRoot":"","sources":["../../src/external/external.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAwC;AACxC,2CAAqC;AACrC,2CAA2C;AAC3C,gCAAgC;AAChC,yDAAkD;AAO3C,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAL1B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE,CAAC,kCAAe,CAAC;QAC1B,OAAO,EAAE,CAAC,qBAAY,EAAE,kBAAU,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAC,CAAC,EAAE,eAAS,CAAC;QAC1F,SAAS,EAAE,CAAC,kCAAe,CAAC;KAC/B,CAAC;GACW,cAAc,CAAG"}
1
+ {"version":3,"file":"external.module.js","sourceRoot":"","sources":["../../src/external/external.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAAwC;AACxC,2CAAqC;AACrC,2CAA2C;AAC3C,gCAAgC;AAChC,yDAAkD;AAW3C,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAT1B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE,CAAC,kCAAe,CAAC;QAC1B,OAAO,EAAE;YACL,qBAAY;YACZ,kBAAU,CAAC,QAAQ,CAAC,EAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAC,CAAC;YACtD,eAAS;SACZ;QACD,SAAS,EAAE,CAAC,kCAAe,CAAC;KAC/B,CAAC;GACW,cAAc,CAAG"}
@@ -69,8 +69,13 @@ let ExternalService = class ExternalService {
69
69
  audience: `internal:${this.configService.get('service.name')}`,
70
70
  issuer: `${this.configService.get('service.name')}:${headers['x-ei-domainId']}`
71
71
  })({ expiresIn: '3m' })(subject);
72
- const handleParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => (Array.isArray(value) ? value.length : typeof value !== 'undefined') ?
73
- { ...accumulator, [key]: Array.isArray(value) ? value.join(',') : value }
72
+ const handleParams = (params = {}) => Object.entries(params).reduce((accumulator, [key, value]) => (Array.isArray(value) ?
73
+ value.length
74
+ : typeof value !== 'undefined') ?
75
+ {
76
+ ...accumulator,
77
+ [key]: Array.isArray(value) ? value.join(',') : value
78
+ }
74
79
  : accumulator, {});
75
80
  const url = `/${serviceName}/${version ?? this.configService.get('apiService.version') ?? 'v1'}${path}`;
76
81
  return (0, rxjs_1.firstValueFrom)(this.httpService
@@ -95,11 +100,15 @@ let ExternalService = class ExternalService {
95
100
  .pipe((0, rxjs_1.catchError)(error => {
96
101
  const response = error.response;
97
102
  if (error.code === 'ETIMEDOUT') {
98
- (0, utils_1.throwHTTPError)({ code: '4080001', message: 'Internal service request timeout' })(app_interface_1.HTTPError.REQUEST_TIMEOUT);
103
+ (0, utils_1.throwHTTPError)({
104
+ code: '4080001',
105
+ message: 'Internal service request timeout'
106
+ })(app_interface_1.HTTPError.REQUEST_TIMEOUT);
99
107
  }
100
108
  if (error.status) {
101
109
  (0, utils_1.throwHTTPError)({
102
- code: response?.data?.code ?? `${error.status}999`,
110
+ code: response?.data?.code ??
111
+ `${error.status}999`,
103
112
  error: response?.data,
104
113
  message: response?.data?.message ?? error.message,
105
114
  service: `${method}:${url}`,