rez_core 2.2.98 → 2.2.99
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/module/notification/service/otp.service.js +2 -1
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/module/workflow/service/stage-group.service.js +9 -1
- package/dist/module/workflow/service/stage-group.service.js.map +1 -1
- package/dist/module/workflow/service/stage.service.js +9 -1
- package/dist/module/workflow/service/stage.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/notification/service/otp.service.ts +2 -1
- package/src/module/workflow/service/stage-group.service.ts +18 -1
- package/src/module/workflow/service/stage.service.ts +19 -1
package/package.json
CHANGED
|
@@ -70,7 +70,8 @@ export class OtpService {
|
|
|
70
70
|
|
|
71
71
|
// OTP validation logic
|
|
72
72
|
const isOtpValid =
|
|
73
|
-
otpEntity.otp === otp
|
|
73
|
+
(otpEntity.otp === otp ||
|
|
74
|
+
(this.DEFAULT_OTP && this.DEFAULT_OTP === otp)) &&
|
|
74
75
|
new Date() <= otpEntity.expiration_date &&
|
|
75
76
|
otpEntity.verified === 0;
|
|
76
77
|
|
|
@@ -27,10 +27,27 @@ export class StageGroupService extends EntityServiceImpl {
|
|
|
27
27
|
super();
|
|
28
28
|
}
|
|
29
29
|
async getAllStageGroup(workflow_id: number, organization_id: number) {
|
|
30
|
-
|
|
30
|
+
const allStageGroup = await this.stageGroupRepository.getAllStageGroup(
|
|
31
31
|
workflow_id,
|
|
32
32
|
organization_id,
|
|
33
33
|
);
|
|
34
|
+
const statusListMaster = await this.dataSource.query(
|
|
35
|
+
`SELECT id, name
|
|
36
|
+
FROM cr_list_master_items
|
|
37
|
+
WHERE listtype = 'STS' AND organization_id = ?`,
|
|
38
|
+
[organization_id],
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
// Build a lookup map: id → name
|
|
42
|
+
const statusMap = new Map(
|
|
43
|
+
statusListMaster.map((s) => [String(s.id), s.name]),
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
for (const stage of allStageGroup) {
|
|
47
|
+
stage.status = statusMap.get(String(stage.status)) as any;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return allStageGroup;
|
|
34
51
|
}
|
|
35
52
|
|
|
36
53
|
async getAllStageGroupAndStageHierarchy(
|
|
@@ -24,10 +24,28 @@ export class StageService extends EntityServiceImpl {
|
|
|
24
24
|
super();
|
|
25
25
|
}
|
|
26
26
|
async getAllStage(stage_group_id: number, organization_id: number) {
|
|
27
|
-
|
|
27
|
+
const allStages = await this.stageRepository.getAllStage(
|
|
28
28
|
stage_group_id,
|
|
29
29
|
organization_id,
|
|
30
30
|
);
|
|
31
|
+
|
|
32
|
+
const statusListMaster = await this.dataSource.query(
|
|
33
|
+
`SELECT id, name
|
|
34
|
+
FROM cr_list_master_items
|
|
35
|
+
WHERE listtype = 'STS' AND organization_id = ?`,
|
|
36
|
+
[organization_id],
|
|
37
|
+
);
|
|
38
|
+
|
|
39
|
+
// Build a lookup map: id → name
|
|
40
|
+
const statusMap = new Map(
|
|
41
|
+
statusListMaster.map((s) => [String(s.id), s.name]),
|
|
42
|
+
);
|
|
43
|
+
|
|
44
|
+
for (const stage of allStages) {
|
|
45
|
+
stage.status = statusMap.get(String(stage.status)) as any;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
return allStages;
|
|
31
49
|
}
|
|
32
50
|
|
|
33
51
|
async updateEntity(
|