@servicelabsco/nestjs-utility-services 1.0.176 → 1.0.177
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/auth/services/access.manager.js +12 -13
- package/dist/auth/services/access.manager.js.map +1 -1
- package/dist/auth/services/role.manager.js +3 -4
- package/dist/auth/services/role.manager.js.map +1 -1
- package/dist/common/dtos/capture.record.index.dto.js +1 -2
- package/dist/common/dtos/capture.record.index.dto.js.map +1 -1
- package/dist/common/dtos/capture.record.show.dto.js +1 -2
- package/dist/common/dtos/capture.record.show.dto.js.map +1 -1
- package/dist/common/dtos/index.params.dto.js +1 -2
- package/dist/common/dtos/index.params.dto.js.map +1 -1
- package/dist/system/services/scheduled.event.service.js +2 -4
- package/dist/system/services/scheduled.event.service.js.map +1 -1
- package/package.json +1 -2
|
@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AccessManager = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
-
const _ = require("lodash");
|
|
12
11
|
const auth_1 = require("../../common/libraries/auth");
|
|
13
12
|
let AccessManager = class AccessManager {
|
|
14
13
|
getUser() {
|
|
@@ -20,9 +19,9 @@ let AccessManager = class AccessManager {
|
|
|
20
19
|
const user = this.getUser();
|
|
21
20
|
if (!user)
|
|
22
21
|
return false;
|
|
23
|
-
if (
|
|
22
|
+
if (user.roles.indexOf(1) !== -1)
|
|
24
23
|
return true;
|
|
25
|
-
if (
|
|
24
|
+
if (user.roles.indexOf(roleId) !== -1)
|
|
26
25
|
return true;
|
|
27
26
|
return false;
|
|
28
27
|
}
|
|
@@ -32,9 +31,9 @@ let AccessManager = class AccessManager {
|
|
|
32
31
|
const user = this.getUser();
|
|
33
32
|
if (!user)
|
|
34
33
|
return false;
|
|
35
|
-
if (
|
|
34
|
+
if (user.roles.indexOf(1) !== -1)
|
|
36
35
|
return true;
|
|
37
|
-
if (
|
|
36
|
+
if (user.role_identifiers.indexOf(role) !== -1)
|
|
38
37
|
return true;
|
|
39
38
|
return false;
|
|
40
39
|
}
|
|
@@ -44,7 +43,7 @@ let AccessManager = class AccessManager {
|
|
|
44
43
|
const user = this.getUser();
|
|
45
44
|
if (!user)
|
|
46
45
|
return false;
|
|
47
|
-
if (
|
|
46
|
+
if (user.roles.indexOf(roleId) !== -1)
|
|
48
47
|
return true;
|
|
49
48
|
return false;
|
|
50
49
|
}
|
|
@@ -54,7 +53,7 @@ let AccessManager = class AccessManager {
|
|
|
54
53
|
const user = this.getUser();
|
|
55
54
|
if (!user)
|
|
56
55
|
return false;
|
|
57
|
-
if (
|
|
56
|
+
if (user.role_identifiers.indexOf(role) !== -1)
|
|
58
57
|
return true;
|
|
59
58
|
return false;
|
|
60
59
|
}
|
|
@@ -62,9 +61,9 @@ let AccessManager = class AccessManager {
|
|
|
62
61
|
const user = this.getUser();
|
|
63
62
|
if (!user)
|
|
64
63
|
return false;
|
|
65
|
-
if (
|
|
64
|
+
if (user.roles.indexOf(1) !== -1)
|
|
66
65
|
return true;
|
|
67
|
-
if (
|
|
66
|
+
if (user.permissions.indexOf(permissionId) !== -1)
|
|
68
67
|
return true;
|
|
69
68
|
return false;
|
|
70
69
|
}
|
|
@@ -72,9 +71,9 @@ let AccessManager = class AccessManager {
|
|
|
72
71
|
const user = this.getUser();
|
|
73
72
|
if (!user)
|
|
74
73
|
return false;
|
|
75
|
-
if (
|
|
74
|
+
if (user.roles.indexOf(1) !== -1)
|
|
76
75
|
return true;
|
|
77
|
-
if (
|
|
76
|
+
if (user.permission_identifiers.indexOf(permission) !== -1)
|
|
78
77
|
return true;
|
|
79
78
|
return false;
|
|
80
79
|
}
|
|
@@ -82,7 +81,7 @@ let AccessManager = class AccessManager {
|
|
|
82
81
|
const user = this.getUser();
|
|
83
82
|
if (!user)
|
|
84
83
|
return false;
|
|
85
|
-
if (
|
|
84
|
+
if (user.permissions.indexOf(permissionId) !== -1)
|
|
86
85
|
return true;
|
|
87
86
|
return false;
|
|
88
87
|
}
|
|
@@ -90,7 +89,7 @@ let AccessManager = class AccessManager {
|
|
|
90
89
|
const user = this.getUser();
|
|
91
90
|
if (!user)
|
|
92
91
|
return false;
|
|
93
|
-
if (
|
|
92
|
+
if (user.permission_identifiers.indexOf(permission) !== -1)
|
|
94
93
|
return true;
|
|
95
94
|
return false;
|
|
96
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.manager.js","sourceRoot":"","sources":["../../../src/auth/services/access.manager.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"access.manager.js","sourceRoot":"","sources":["../../../src/auth/services/access.manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.RoleManager = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
-
const _ = require("lodash");
|
|
12
11
|
const auth_1 = require("../../common/libraries/auth");
|
|
13
12
|
let RoleManager = class RoleManager {
|
|
14
13
|
_getUser() {
|
|
@@ -48,7 +47,7 @@ let RoleManager = class RoleManager {
|
|
|
48
47
|
const user = this._getUser();
|
|
49
48
|
if (!user)
|
|
50
49
|
return false;
|
|
51
|
-
if (
|
|
50
|
+
if (user.roles.indexOf(1) !== -1)
|
|
52
51
|
return true;
|
|
53
52
|
return false;
|
|
54
53
|
}
|
|
@@ -58,7 +57,7 @@ let RoleManager = class RoleManager {
|
|
|
58
57
|
const user = this._getUser();
|
|
59
58
|
if (!user)
|
|
60
59
|
return false;
|
|
61
|
-
if (
|
|
60
|
+
if (user.roles.indexOf(roleId) !== -1)
|
|
62
61
|
return true;
|
|
63
62
|
return false;
|
|
64
63
|
}
|
|
@@ -68,7 +67,7 @@ let RoleManager = class RoleManager {
|
|
|
68
67
|
const user = this._getUser();
|
|
69
68
|
if (!user)
|
|
70
69
|
return false;
|
|
71
|
-
if (
|
|
70
|
+
if (user.role_identifiers.indexOf(role) !== -1)
|
|
72
71
|
return true;
|
|
73
72
|
return false;
|
|
74
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.manager.js","sourceRoot":"","sources":["../../../src/auth/services/role.manager.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"role.manager.js","sourceRoot":"","sources":["../../../src/auth/services/role.manager.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,sDAAmD;AAWnD,IAAa,WAAW,GAAxB,MAAa,WAAW;IAMpB,QAAQ;QACJ,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAQD,QAAQ,CAAC,KAA4C;QAEjD,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAAE,OAAO,IAAI,CAAC;QAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;oBAAE,SAAS;gBACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAEtB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC1B,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC;wBAAE,OAAO,IAAI,CAAC;iBACvD;qBAAM;oBACH,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;wBAAE,OAAO,IAAI,CAAC;iBAC/C;aACJ;SACJ;aAAM;YACH,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC3B,IAAI,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;oBAAE,OAAO,IAAI,CAAC;aACxD;iBAAM;gBACH,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;oBAAE,OAAO,IAAI,CAAC;aAChD;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAOD,kBAAkB;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9C,OAAO,KAAK,CAAC;IACjB,CAAC;IASD,eAAe,CAAC,MAAc;QAC1B,IAAI,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE7B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnD,OAAO,KAAK,CAAC;IACjB,CAAC;IASD,uBAAuB,CAAC,IAAY;QAChC,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE7B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QAExB,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAE5D,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AA7FY,WAAW;IADvB,IAAA,mBAAU,GAAE;GACA,WAAW,CA6FvB;AA7FY,kCAAW"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CaptureRecordIndexDto = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
class CaptureRecordIndexDto {
|
|
6
5
|
constructor(params) {
|
|
7
6
|
this.page = 0;
|
|
@@ -46,7 +45,7 @@ class CaptureRecordIndexDto {
|
|
|
46
45
|
relation = relation + '.' + record;
|
|
47
46
|
else
|
|
48
47
|
relation = record;
|
|
49
|
-
if (
|
|
48
|
+
if (this.options.relations.indexOf(relation) === -1)
|
|
50
49
|
this.options.relations.push(relation);
|
|
51
50
|
});
|
|
52
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.record.index.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/capture.record.index.dto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"capture.record.index.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/capture.record.index.dto.ts"],"names":[],"mappings":";;;AAUA,MAAa,qBAAqB;IAiB9B,YAAY,MAAW;QAfhB,SAAI,GAAG,CAAC,CAAC;QACT,UAAK,GAAG,EAAE,CAAC;QAEX,UAAK,GAAG,KAAK,CAAC;QAKd,YAAO,GAAuB,EAAE,CAAC;QAQpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IAOD,QAAQ;QAEJ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAElE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1D,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,aAAa,EAAE,CAAC;IACzB,CAAC;IAQD,UAAU;QACN,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAQD,aAAa;QACT,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAEb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC;YAC1C,OAAO;SACV;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACtD,CAAC;IAQD,eAAe;QACX,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;QAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACpB,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACzB,IAAI,QAAQ;oBAAE,QAAQ,GAAG,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC;;oBAC5C,QAAQ,GAAG,MAAM,CAAC;gBAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/F,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA/FD,sDA+FC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CaptureRecordShowDto = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
class CaptureRecordShowDto {
|
|
6
5
|
constructor(params) {
|
|
7
6
|
this.options = {};
|
|
@@ -32,7 +31,7 @@ class CaptureRecordShowDto {
|
|
|
32
31
|
relation = relation + '.' + relations[j];
|
|
33
32
|
else
|
|
34
33
|
relation = relations[j];
|
|
35
|
-
if (
|
|
34
|
+
if (this.options.relations.indexOf(relation) === -1)
|
|
36
35
|
this.options.relations.push(relation);
|
|
37
36
|
}
|
|
38
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.record.show.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/capture.record.show.dto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"capture.record.show.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/capture.record.show.dto.ts"],"names":[],"mappings":";;;AAGA,MAAa,oBAAoB;IAU7B,YAAY,MAAW;QARvB,YAAO,GAAsB,EAAE,CAAC;QAS5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IAOD,QAAQ;QACJ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,CAAC,eAAe,EAAE,CAAC;IAC3B,CAAC;IAQD,UAAU;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAQD,eAAe;QACX,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC3B,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;QAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErC,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;YACjB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;gBAAE,SAAS;YAErC,MAAM,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,QAAQ,GAAG,IAAI,CAAC;YAEpB,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;gBACvB,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;oBAAE,SAAS;gBAE3C,IAAI,QAAQ;oBAAE,QAAQ,GAAG,QAAQ,GAAG,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;;oBAClD,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBAE7B,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC9F;SACJ;IACL,CAAC;CACJ;AA/DD,oDA+DC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.IndexParamsDto = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
6
5
|
class IndexParamsDto {
|
|
7
6
|
constructor(params) {
|
|
@@ -48,7 +47,7 @@ class IndexParamsDto {
|
|
|
48
47
|
relation = relation + '.' + record;
|
|
49
48
|
else
|
|
50
49
|
relation = record;
|
|
51
|
-
if (
|
|
50
|
+
if (this.options.relations.indexOf(relation) === -1)
|
|
52
51
|
this.options.relations.push(relation);
|
|
53
52
|
});
|
|
54
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.params.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/index.params.dto.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.params.dto.js","sourceRoot":"","sources":["../../../src/common/dtos/index.params.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,6 @@ const scheduled_event_entity_1 = require("../entities/scheduled.event.entity");
|
|
|
23
23
|
const SOURCEHASH = require("../../config/source.hash");
|
|
24
24
|
const date_util_1 = require("../../common/libraries/date.util");
|
|
25
25
|
const parser = require("cron-parser");
|
|
26
|
-
const _ = require("lodash");
|
|
27
|
-
const date_fns_1 = require("date-fns");
|
|
28
26
|
let ScheduledEventService = class ScheduledEventService {
|
|
29
27
|
getActiveEvents(id) {
|
|
30
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -73,7 +71,7 @@ let ScheduledEventService = class ScheduledEventService {
|
|
|
73
71
|
record.name = job.event.name;
|
|
74
72
|
record.event_id = job.event_id;
|
|
75
73
|
record.parameter = job.parameter;
|
|
76
|
-
record.scheduled_start_time =
|
|
74
|
+
record.scheduled_start_time = scheduledTime;
|
|
77
75
|
record.source_type = SOURCEHASH.scheduledEvent;
|
|
78
76
|
record.source_id = job.id;
|
|
79
77
|
yield record.save();
|
|
@@ -88,7 +86,7 @@ let ScheduledEventService = class ScheduledEventService {
|
|
|
88
86
|
let inQueue = events.length;
|
|
89
87
|
if (inQueue > 6)
|
|
90
88
|
return job;
|
|
91
|
-
let lastRunTime = inQueue ?
|
|
89
|
+
let lastRunTime = inQueue ? events.slice(-1)[0].scheduled_start_time : date_util_1.DateUtil.getDateTime();
|
|
92
90
|
lastRunTime = lastRunTime < job.start_time ? job.start_time : lastRunTime;
|
|
93
91
|
if (lastRunTime > job.end_time)
|
|
94
92
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAgD;AAChD,uEAAkE;AAClE,+EAA0E;AAC1E,uDAAwD;AACxD,gEAA4D;AAC5D,sCAAsC;
|
|
1
|
+
{"version":3,"file":"scheduled.event.service.js","sourceRoot":"","sources":["../../../src/system/services/scheduled.event.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicelabsco/nestjs-utility-services",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.177",
|
|
4
4
|
"description": "NestJS generic packages to support development",
|
|
5
5
|
"author": "Hemant Kumar Sah <hemantanshu@gmail.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -49,7 +49,6 @@
|
|
|
49
49
|
"@nestjs/swagger": "^5.1.1",
|
|
50
50
|
"@sendgrid/mail": "^7.6.0",
|
|
51
51
|
"@types/jest": "^27.0.2",
|
|
52
|
-
"@types/lodash": "^4.14.175",
|
|
53
52
|
"aws-sdk": "^2.1010.0",
|
|
54
53
|
"bcryptjs": "^2.4.3",
|
|
55
54
|
"cache-manager": "^3.4.4",
|