rez_core 4.0.162 → 4.0.163
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/integration/service/wrapper.service.js +3 -3
- package/dist/module/workflow/repository/action.repository.js +3 -3
- package/dist/module/workflow/repository/stage.repository.js +1 -1
- package/dist/module/workflow/repository/task.repository.js +6 -6
- package/dist/module/workflow/repository/task.repository.js.map +1 -1
- package/dist/module/workflow/service/task.service.js +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/integration/service/wrapper.service.ts +3 -3
- package/src/module/workflow/repository/action.repository.ts +3 -3
- package/src/module/workflow/repository/stage.repository.ts +1 -1
- package/src/module/workflow/repository/task.repository.ts +14 -15
- package/src/module/workflow/service/task.service.ts +1 -1
|
@@ -129,9 +129,9 @@ let WrapperService = WrapperService_1 = class WrapperService {
|
|
|
129
129
|
if (entity.template_code) {
|
|
130
130
|
this.logger.debug(`Looking up template for code=${entity.template_code}, level_id=${level_id}, level_type=${level_type}`);
|
|
131
131
|
let templates = await this.datasource.query(`SELECT id FROM frm_wf_comm_template
|
|
132
|
-
WHERE code =
|
|
133
|
-
AND level_id =
|
|
134
|
-
AND level_type =
|
|
132
|
+
WHERE code = $1
|
|
133
|
+
AND level_id = $2
|
|
134
|
+
AND level_type = $3
|
|
135
135
|
LIMIT 1`, [entity.template_code, level_id, level_type]);
|
|
136
136
|
if (!templates || templates.length === 0) {
|
|
137
137
|
this.logger.warn(`No template found for ${entity.template_code} at provided level. Falling back to ORG-level.`);
|
|
@@ -27,7 +27,7 @@ let ActionRepository = class ActionRepository {
|
|
|
27
27
|
const result = await this.dataSource.query(`
|
|
28
28
|
SELECT name, type
|
|
29
29
|
FROM frm_list_master
|
|
30
|
-
WHERE organization_id =
|
|
30
|
+
WHERE organization_id = $1 AND source = 'master'
|
|
31
31
|
`, [organization_id]);
|
|
32
32
|
const formatted = result.map((item) => ({
|
|
33
33
|
label: item.name,
|
|
@@ -43,7 +43,7 @@ let ActionRepository = class ActionRepository {
|
|
|
43
43
|
const result = await this.dataSource.query(`
|
|
44
44
|
SELECT name, id
|
|
45
45
|
FROM frm_list_master_items
|
|
46
|
-
WHERE listtype =
|
|
46
|
+
WHERE listtype = $1 AND organization_id = $2
|
|
47
47
|
`, [list_type, organization_id]);
|
|
48
48
|
return result.map((row) => ({
|
|
49
49
|
label: row.name,
|
|
@@ -130,7 +130,7 @@ let ActionRepository = class ActionRepository {
|
|
|
130
130
|
const stageActions = await this.dataSource.query(`
|
|
131
131
|
SELECT action_id
|
|
132
132
|
FROM frm_wf_stage_action_mapping
|
|
133
|
-
WHERE stage_id =
|
|
133
|
+
WHERE stage_id = $1
|
|
134
134
|
`, [stage_id]);
|
|
135
135
|
if (!stageActions?.length)
|
|
136
136
|
return [];
|
|
@@ -68,7 +68,7 @@ let StageRepository = class StageRepository {
|
|
|
68
68
|
s.*
|
|
69
69
|
FROM frm_wf_stage_group g
|
|
70
70
|
INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
|
|
71
|
-
WHERE g.workflow_id =
|
|
71
|
+
WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
|
|
72
72
|
ORDER BY g.id, s.id
|
|
73
73
|
`, [stageGroup.workflow_id, organization_id, stage_group_id]);
|
|
74
74
|
if (!rows || rows.length === 0) {
|
|
@@ -33,22 +33,22 @@ let TaskRepository = class TaskRepository {
|
|
|
33
33
|
async saveActionDataInTask(action, loggedInUser, mapped_entity_id, mapped_entity_type) {
|
|
34
34
|
if (!action?.length)
|
|
35
35
|
return;
|
|
36
|
-
const todoListMasterItemId = await this.dataSource.query(`SELECT id FROM frm_list_master_items WHERE code = 'in_progress' and organization_id =
|
|
37
|
-
const leadData = await this.dataSource.query(`SELECT * FROM crm_lead WHERE id =
|
|
36
|
+
const todoListMasterItemId = await this.dataSource.query(`SELECT id FROM frm_list_master_items WHERE code = 'in_progress' and organization_id = $1 and listtype = 'TKST' LIMIT 1;`, [loggedInUser.organization_id]);
|
|
37
|
+
const leadData = await this.dataSource.query(`SELECT * FROM crm_lead WHERE id = $1`, [mapped_entity_id]);
|
|
38
38
|
if (action.length > 0) {
|
|
39
39
|
for (const act of action) {
|
|
40
|
-
const is_mandatory = await this.dataSource.query(`SELECT code FROM frm_list_master_items WHERE id =
|
|
40
|
+
const is_mandatory = await this.dataSource.query(`SELECT code FROM frm_list_master_items WHERE id = $1 and organization_id = $2 LIMIT 1;`, [act.action_requirement, loggedInUser.organization_id]);
|
|
41
41
|
const now = new Date();
|
|
42
42
|
const dueDateTime = new Date(now);
|
|
43
43
|
dueDateTime.setDate(dueDateTime.getDate() + 2);
|
|
44
44
|
const istFormatterDate = new Intl.DateTimeFormat('en-CA', {
|
|
45
|
-
timeZone: 'Asia/Kolkata'
|
|
45
|
+
timeZone: 'Asia/Kolkata',
|
|
46
46
|
});
|
|
47
47
|
const istFormatterTime = new Intl.DateTimeFormat('en-US', {
|
|
48
48
|
timeZone: 'Asia/Kolkata',
|
|
49
49
|
hour: '2-digit',
|
|
50
50
|
minute: '2-digit',
|
|
51
|
-
hour12: true
|
|
51
|
+
hour12: true,
|
|
52
52
|
});
|
|
53
53
|
const due_date = istFormatterDate.format(dueDateTime);
|
|
54
54
|
const due_time = istFormatterTime.format(dueDateTime);
|
|
@@ -85,7 +85,7 @@ let TaskRepository = class TaskRepository {
|
|
|
85
85
|
});
|
|
86
86
|
if (!task)
|
|
87
87
|
return;
|
|
88
|
-
const completedListMasterItemId = await this.dataSource.query(`SELECT id FROM frm_list_master_items WHERE code = 'completed' and organization_id =
|
|
88
|
+
const completedListMasterItemId = await this.dataSource.query(`SELECT id FROM frm_list_master_items WHERE code = 'completed' and organization_id = $1 and listtype = 'TKST' LIMIT 1;`, [loggedInUser.organization_id]);
|
|
89
89
|
task.modified_by = loggedInUser.id;
|
|
90
90
|
task.modified_date = new Date();
|
|
91
91
|
task.is_done = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/task.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,iEAA4D;AAC5D,qCAAiD;AAG1C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAEmB,cAA0C,EAC1C,UAAsB;QADtB,mBAAc,GAAd,cAAc,CAA4B;QAC1C,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,4BAA4B,CAAC,SAAS;QAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE;gBACL,GAAG,SAAS;aACb;SACF,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,MAAW,EACX,YAAY,EACZ,gBAAwB,EACxB,kBAA0B;QAE1B,IAAI,CAAC,MAAM,EAAE,MAAM;YAAE,OAAO;QAE5B,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtD,
|
|
1
|
+
{"version":3,"file":"task.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/task.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -244,7 +244,7 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
|
|
|
244
244
|
const taskStatusQuery = `
|
|
245
245
|
SELECT id, name
|
|
246
246
|
FROM frm_list_master_items
|
|
247
|
-
WHERE organization_id =
|
|
247
|
+
WHERE organization_id = $1
|
|
248
248
|
AND listtype = 'TKST'
|
|
249
249
|
`;
|
|
250
250
|
const taskAllStatus = await this.dataSource.query(taskStatusQuery, [
|