rez_core 6.5.67 → 6.5.69

package/src/module/workflow/entity/action.entity.ts

@@ -1,13 +1,8 @@
-import { ACTION } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_action' })
 export class ActionEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ACTION;
-  }
 
   @Column({ type: 'int', nullable: true })
   workflow_id: number;

package/src/module/workflow/entity/activity-log.entity.ts

@@ -3,10 +3,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_activity_log' })
 export class ActivityLog extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'ACLG';
-  }
 
   @Column({ type: 'varchar', nullable: true })
   mapped_entity_type: string;

package/src/module/workflow/entity/comm-template.entity.ts

@@ -1,13 +1,8 @@
-import { COMM_TEMPLATE } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_comm_template' })
 export class CommTemplate extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = COMM_TEMPLATE;
-  }
 
   @Column({ nullable: true })
   mode: string;

package/src/module/workflow/entity/entity-modification.entity.ts

@@ -1,13 +1,8 @@
-import { ENTITY_MODIFICATION } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_entity_modification' })
 export class EntityModification extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITY_MODIFICATION;
-  }
 
   @Column({ type: 'int', nullable: true })
   mapped_entity_id: number;

package/src/module/workflow/entity/form.entity.ts

@@ -3,10 +3,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_form' })
 export class FormDataEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'FORM';
-  }
 
   @Column({ nullable: true })
   mapped_entity_id: number;

package/src/module/workflow/entity/stage-action-mapping.entity.ts

@@ -1,13 +1,8 @@
-import { STAGE_ACTION_MAPPING } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_stage_action_mapping' })
 export class StageActionMapping extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = STAGE_ACTION_MAPPING;
-  }
 
   @Column({ type: 'int', nullable: true })
   stage_id: number;

package/src/module/workflow/entity/stage-group.entity.ts

@@ -1,13 +1,8 @@
-import { STAGE_GROUP } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_stage_group' })
 export class StageGroup extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = STAGE_GROUP;
-  }
 
   @Column({ type: 'int', nullable: true })
   workflow_id: number;

package/src/module/workflow/entity/stage-movement-data.entity.ts

@@ -1,13 +1,8 @@
-import { STAGE_MOVEMENT_DATA } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_stage_movement_data' })
 export class StageMovementData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = STAGE_MOVEMENT_DATA;
-  }
 
   @Column({ type: 'int', nullable: true })
   current_user_id: number;

package/src/module/workflow/entity/stage.entity.ts

@@ -1,13 +1,8 @@
-import { STAGE } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_stage' })
 export class Stage extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = STAGE;
-  }
 
   @Column({ type: 'int', nullable: true })
   stage_group_id: number;

package/src/module/workflow/entity/task-data.entity.ts

@@ -3,10 +3,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_task_data' })
 export class TaskDataEntity extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'TASK';
-  }
 
   @Column({ nullable: true })
   task_id: string;

package/src/module/workflow/entity/workflow-data.entity.ts

@@ -1,11 +1,6 @@
-import { WORKFLOW_DATA } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_data' })
 export class WorkFlowData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = WORKFLOW_DATA;
-  }
 }

package/src/module/workflow/entity/workflow.entity.ts

@@ -1,13 +1,8 @@
-import { WORKFLOW } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_wf_master' })
 export class Workflow extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = WORKFLOW;
-  }
 
   @Column({ type: 'varchar', nullable: true })
   mapped_entity_type: string;

package/src/module/workflow/repository/comm-template.repository.ts

@@ -98,7 +98,7 @@ export class CommTemplateRepository {
     loggedInUser,
   ): Promise<any | null> {
     const template = await this.commTemplateRepository.findOne({
-      where: { entity_type, id },
+      where: { id },
     });
 
     if (!template) {
@@ -151,7 +151,7 @@ export class CommTemplateRepository {
   async findByCodeAndLevelIdAndLevelTypeAndAppCode(code: string, level_id: string,
                                                    level_type: string, appcode: string) {
     return await this.commTemplateRepository.findOne({
-      where: { code, level_id, level_type, appcode },
+      where: { code, level_id: Number(level_id), level_type },
     });
   }
 }

package/src/module/workflow/repository/task.repository.ts

@@ -95,7 +95,6 @@ export class TaskRepository {
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
           action_id: act.id,
-          organization_id: loggedInUser.organization_id,
           level_type: loggedInUser.level_type,
           level_id: loggedInUser.level_id,
           enterprise_id: loggedInUser.enterprise_id,

package/src/module/workflow/repository/workflow.repository.ts

@@ -22,7 +22,7 @@ export class WorkflowRepository {
     return this.workflowRepository.find({
       where: {
         mapped_entity_type: entity_type,
-        level_id,
+        level_id: Number(level_id),
         level_type,
       },
     });

package/src/module/workflow/service/action.service.ts

@@ -86,8 +86,8 @@ export class ActionService extends EntityServiceImpl {
       entity_type: 'WFSA',
     } as any;
 
-    if (entityData?.organization_id) {
-      stageActionMapping.organization_id = entityData.organization_id;
+    if (entityData?.enterprise_id) {
+      stageActionMapping.enterprise_id = entityData.enterprise_id;
     }
 
     const stageActionMappingData = await super.createEntity(
@@ -106,8 +106,8 @@ export class ActionService extends EntityServiceImpl {
           entity_type: 'WFAR',
         } as any;
 
-        if (entityData?.organization_id) {
-          resourceMapping.organization_id = entityData.organization_id;
+        if (entityData?.enterprise_id) {
+          resourceMapping.organization_id = entityData.enterprise_id;
         }
 
         await super.createEntity(resourceMapping, loggedInUser);
@@ -122,7 +122,7 @@ export class ActionService extends EntityServiceImpl {
     if (actionData.form) {
       const resourceMapping = {
         stg_act_mapping_id: stageActionMappingData.id,
-        organization_id: entityData.organization_id,
+        enterprise_id: entityData.enterprise_id,
         level_id: entityData.level_id,
         form_id: actionData.form,
         type: 'form',
@@ -156,8 +156,7 @@ export class ActionService extends EntityServiceImpl {
 
     const stageMap = await this.stageActionMappingRepository.findOne({
       where: {
-        action_id: action.id,
-        entity_type: 'WFSA',
+        action_id: action.id
       },
     });
 
@@ -182,7 +181,7 @@ export class ActionService extends EntityServiceImpl {
         action_id: action.id,
         stage_id,
         entity_type: 'WFSA',
-        organization_id: entityData.organization_id,
+        enterprise_id: entityData.enterprise_id,
       } as any;
 
       stageActionMappingData = await super.createEntity(
@@ -252,8 +251,7 @@ export class ActionService extends EntityServiceImpl {
       .execute();
 
     await this.stageActionMappingRepository.delete({
-      action_id: id,
-      entity_type: 'WFSA',
+      action_id: id
     });
 
     const deleteAction = await super.deleteEntity(entityType, id, loggedInUser);

package/src/module/workflow-automation/service/schedule-handler.service.ts

@@ -27,8 +27,7 @@ export class ScheduleHandlerService {
     // 1️⃣ Fetch workflow automation config
     const workflow = await this.workflowAutomation.findOne({
       where: {
-        id: workflowId,
-        organization_id: jobData.organizationId,
+        id: workflowId
       },
     });
 
@@ -45,7 +44,7 @@ export class ScheduleHandlerService {
     const entity = await this.entityMasterRepository.findOne({
       where: {
         mapped_entity_type: entityType,
-        organization_id: jobData.organizationId,
+        enterprise_id: jobData.enterprise_id,
       },
       select: ['data_source'],
     });

package/src/module/workflow-schedule/interfaces/schedule-job-data.interface.ts

@@ -8,9 +8,8 @@ export interface ScheduleJobData {
   scheduleId: number;
   workflowId: number;
   workflowName: string;
-  organizationId: number;
   enterpriseId: number;
-  levelId?: string;
+  levelId?: number;
   levelType?: string;
   appcode?: string;
   createdBy: number;

package/src/module/workflow-schedule/processors/schedule.processor.ts

@@ -52,7 +52,7 @@ export class ScheduleProcessor {
    */
   @Process(EXECUTE_SCHEDULED_WORKFLOW_JOB)
   async handleScheduledWorkflowExecution(job: Job<ScheduleJobData>) {
-    const { scheduleId, workflowId, organizationId, triggeredBy, createdBy } =
+    const { scheduleId, workflowId, enterpriseId, triggeredBy, createdBy } =
       job.data;
 
     this.logger.log(
@@ -67,10 +67,8 @@ export class ScheduleProcessor {
       execution_status: EXECUTION_STATUS_PENDING,
       triggered_by: triggeredBy,
       triggered_by_user_id: triggeredBy === 'MANUAL' ? createdBy : null,
-      organization_id: organizationId,
       enterprise_id: job.data.enterpriseId,
-      created_by: createdBy,
-      entity_type: 'WFEL',
+      created_by: createdBy
     });
 
     this.logger.debug(`🧾 Creating execution log for jobId=${job.id}`);
@@ -425,11 +423,9 @@ export class ScheduleProcessor {
               status: 'PENDING',
               mapped_entity_id: record.id,
               mapped_entity_type: action.targetEntityType,
-              organization_id: jobData.organizationId,
               enterprise_id: jobData.enterpriseId,
               created_by: jobData.createdBy,
               created_date: new Date(), // NOW()
-              entity_type: 'WFTK',
             };
 
             // Insert using TypeORM repository
@@ -500,7 +496,7 @@ export class ScheduleProcessor {
               mapped_entity_id: record.id,
               mapped_entity_type: action.targetEntityType,
               is_read: 0,
-              organization_id: jobData.organizationId,
+              enterprise_id: jobData.enterpriseId,
               created_date: new Date(), // NOW()
               entity_type: 'NOTF',
               status: 'ACTIVE',
@@ -544,8 +540,8 @@ export class ScheduleProcessor {
     const qb = repo.createQueryBuilder('e');
 
     // Mandatory organization filter
-    qb.where('e.organization_id = :orgId', {
-      orgId: jobData.organizationId,
+    qb.where('e.enterprise_id = :entId', {
+      entId: jobData.enterpriseId,
     });
 
     // Apply additional filters

package/src/module/workflow-schedule/service/workflow-schedule.service.ts

@@ -85,12 +85,11 @@ export class WorkflowScheduleService {
         metadata: createScheduleDto.metadata || {},
         is_enabled: createScheduleDto.is_enabled !== false,
         enterprise_id: createScheduleDto.enterprise_id || loggedInUser.enterprise_id,
-        level_id: createScheduleDto.level_id || loggedInUser.level_id,
+        level_id: Number(createScheduleDto.level_id) || Number(loggedInUser.level_id),
         level_type: createScheduleDto.level_type || loggedInUser.level_type,
         created_by: loggedInUser.id,
         created_date: new Date(),
         status: createScheduleDto.status || 'ACTIVE',
-        entity_type: 'WFSC',
       });
 
       const savedSchedule = await this.scheduledWorkflowRepository.save(schedule);
@@ -369,11 +368,9 @@ export class WorkflowScheduleService {
       scheduleId: schedule.id,
       workflowId: schedule.workflow_id,
       workflowName: schedule.workflow_name,
-      organizationId: schedule.organization_id,
       enterpriseId: schedule.enterprise_id,
-      levelId: schedule.level_id,
+      levelId: Number(schedule.level_id),
       levelType: schedule.level_type,
-      appcode: schedule.appcode,
       createdBy: loggedInUser.id,
       triggeredBy: 'MANUAL',
       triggeredAt: new Date(),
@@ -397,11 +394,9 @@ export class WorkflowScheduleService {
       execution_status: 'PENDING',
       triggered_by: 'MANUAL',
       triggered_by_user_id: loggedInUser.id,
-      organization_id: schedule.organization_id,
       enterprise_id: schedule.enterprise_id,
-      created_by: loggedInUser.id,
+      created_by: Number(loggedInUser.id),
       created_date: new Date(),
-      entity_type: 'WFEL',
       status: 'ACTIVE',
     });
 
@@ -521,11 +516,9 @@ export class WorkflowScheduleService {
       scheduleId: schedule.id,
       workflowId: schedule.workflow_id,
       workflowName: schedule.workflow_name,
-      organizationId: schedule.organization_id,
       enterpriseId: schedule.enterprise_id,
-      levelId: schedule.level_id,
+      levelId: Number(schedule.level_id),
       levelType: schedule.level_type,
-      appcode: schedule.appcode,
       createdBy: loggedInUser.id,
       triggeredBy: 'SCHEDULE',
       triggeredAt: new Date(),