rez_core 5.0.286 → 5.0.288
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/meta/service/view-master.service.d.ts +1 -1
- package/dist/module/meta/service/view-master.service.js +15 -12
- package/dist/module/meta/service/view-master.service.js.map +1 -1
- package/dist/module/workflow-automation/service/schedule-handler.service.js +9 -5
- package/dist/module/workflow-automation/service/schedule-handler.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/service/view-master.service.ts +23 -32
- package/src/module/workflow-automation/service/schedule-handler.service.ts +14 -6
|
@@ -23,7 +23,7 @@ export declare class ViewMasterService extends EntityServiceImpl {
|
|
|
23
23
|
formLayoutJson?: undefined;
|
|
24
24
|
formFieldJson?: undefined;
|
|
25
25
|
}>;
|
|
26
|
-
getEntityData(entityType: string, id: number,
|
|
26
|
+
getEntityData(entityType: string, id: number, loggedInUserData?: UserData | null): Promise<any>;
|
|
27
27
|
getViewMasterByEntityType(entityType: string, loggedInUser: UserData): Promise<{
|
|
28
28
|
label: string;
|
|
29
29
|
value: number;
|
|
@@ -18,7 +18,7 @@ const entity_service_impl_service_1 = require("./entity-service-impl.service");
|
|
|
18
18
|
const typeorm_1 = require("typeorm");
|
|
19
19
|
const view_master_repository_1 = require("../repository/view-master.repository");
|
|
20
20
|
const config_1 = require("@nestjs/config");
|
|
21
|
-
const
|
|
21
|
+
const axios_1 = require("axios");
|
|
22
22
|
let ViewMasterService = class ViewMasterService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
23
23
|
constructor(viewMasterRepoService, dataSource, configService, factory) {
|
|
24
24
|
super();
|
|
@@ -52,21 +52,24 @@ let ViewMasterService = class ViewMasterService extends entity_service_impl_serv
|
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
async getEntityData(entityType, id,
|
|
55
|
+
async getEntityData(entityType, id, loggedInUserData) {
|
|
56
56
|
let getTheme = null;
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
57
|
+
try {
|
|
58
|
+
const baseUrl = this.configService.get('REDIRECT_BE_URL');
|
|
59
|
+
const response = await axios_1.default.get(`${baseUrl}/school/public/theme_json/${loggedInUserData?.level_id}`, {
|
|
60
|
+
headers: {
|
|
61
|
+
'Content-Type': 'application/json',
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
getTheme = response.data;
|
|
60
65
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}));
|
|
66
|
-
const viewMaster = await super.getEntityData(entityType, id, loggedInUser);
|
|
66
|
+
catch (error) {
|
|
67
|
+
console.error('Internal Entity API call failed:', error.message);
|
|
68
|
+
}
|
|
69
|
+
const viewMaster = await super.getEntityData(entityType, id, loggedInUserData);
|
|
67
70
|
return {
|
|
68
71
|
...viewMaster,
|
|
69
|
-
theme_json: getTheme && getTheme?.theme_json ? getTheme.theme_json : null,
|
|
72
|
+
theme_json: getTheme && getTheme[0]?.theme_json ? getTheme[0].theme_json : null,
|
|
70
73
|
};
|
|
71
74
|
}
|
|
72
75
|
async getViewMasterByEntityType(entityType, loggedInUser) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+EAAkE;AAGlE,qCAAoD;AAMpD,iFAA4E;AAE5E,2CAA+C;
|
|
1
|
+
{"version":3,"file":"view-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/view-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,11 +50,11 @@ let ScheduleHandlerService = ScheduleHandlerService_1 = class ScheduleHandlerSer
|
|
|
50
50
|
mapped_entity_type: entityType,
|
|
51
51
|
organization_id: jobData.organizationId,
|
|
52
52
|
},
|
|
53
|
-
select: ['
|
|
53
|
+
select: ['db_table_name'],
|
|
54
54
|
});
|
|
55
55
|
if (!entity?.data_source)
|
|
56
56
|
throw new Error(`Entity ${entityType} not found`);
|
|
57
|
-
const tableName = entity.
|
|
57
|
+
const tableName = entity.db_table_name;
|
|
58
58
|
const executionDateItem = await this.listMasterRepo.findOne({
|
|
59
59
|
where: {
|
|
60
60
|
id: scheduleJson.executionDate,
|
|
@@ -86,10 +86,14 @@ let ScheduleHandlerService = ScheduleHandlerService_1 = class ScheduleHandlerSer
|
|
|
86
86
|
}
|
|
87
87
|
const qb = this.dataSource
|
|
88
88
|
.createQueryBuilder()
|
|
89
|
-
.from(tableName,
|
|
90
|
-
.
|
|
89
|
+
.from(tableName, 'e')
|
|
90
|
+
.innerJoin('frm_wf_stage_movement_data', 'sm', `
|
|
91
|
+
sm.mapped_entity_id = e.id
|
|
92
|
+
AND sm.is_current = 'Y'
|
|
93
|
+
`)
|
|
94
|
+
.select('e.*')
|
|
91
95
|
.where(comparisonDateCondition)
|
|
92
|
-
.andWhere(
|
|
96
|
+
.andWhere('e.organization_id = :orgId', {
|
|
93
97
|
orgId: jobData.organizationId,
|
|
94
98
|
});
|
|
95
99
|
this.logger.debug(`Executing Scheduler Query: ${qb.getSql()}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-handler.service.js","sourceRoot":"","sources":["../../../../src/module/workflow-automation/service/schedule-handler.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4D;AAC5D,4FAA4F;AAC5F,qCAAiD;AACjD,6FAAuF;AACvF,qFAA0E;AAC1E,6CAAmD;AACnD,iFAA2E;AAC3E,mFAAiF;AAG1E,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAGjC,YACmB,UAAsB,EACtB,eAAuC,EACvC,+BAAgE,EAEjF,kBAAmE,EAEnE,sBAAiE,EAEjE,cAA2D;QAR1C,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAwB;QACvC,oCAA+B,GAA/B,+BAA+B,CAAiC;QAEhE,uBAAkB,GAAlB,kBAAkB,CAAgC;QAElD,2BAAsB,GAAtB,sBAAsB,CAA0B;QAEhD,mBAAc,GAAd,cAAc,CAA4B;QAX5C,WAAM,GAAG,IAAI,eAAM,CAAC,wBAAsB,CAAC,IAAI,CAAC,CAAC;IAY/D,CAAC;IAEJ,KAAK,CAAC,oBAAoB,CAAC,UAAkB,EAAE,OAAY;QAEzD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE;gBACL,EAAE,EAAE,UAAU;gBACd,eAAe,EAAE,OAAO,CAAC,cAAc;aACxC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,UAAU,YAAY,CAAC,CAAC;QAE3E,MAAM,YAAY,GAChB,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ;YACnC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/B,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAExB,MAAM,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC;QAGnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;YACvD,KAAK,EAAE;gBACL,kBAAkB,EAAE,UAAU;gBAC9B,eAAe,EAAE,OAAO,CAAC,cAAc;aACxC;YACD,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"schedule-handler.service.js","sourceRoot":"","sources":["../../../../src/module/workflow-automation/service/schedule-handler.service.ts"],"names":[],"mappings":"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"}
|