rez_core 2.1.149 → 2.1.151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.149",
+  "version": "2.1.151",
   "description": "",
   "author": "",
   "private": false,

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

@@ -0,0 +1,40 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  HttpStatus,
+  Inject,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { TaskService } from '../service/task.service';
+
+@Controller('/task')
+@UseGuards(JwtAuthGuard)
+export class TaskController {
+  constructor(
+    @Inject('TaskService')
+    private readonly taskService: TaskService,
+  ) {}
+
+  @Post('/getTasksbyUserAndStage')
+  @HttpCode(HttpStatus.OK)
+  async getTasksbyUserAndStage(
+    @Req() req: Request & { user: any },
+    @Body()
+    body: {
+      mapped_entity_type: string;
+      mapped_entity_id: number;
+      stage_id: number;
+    },
+  ) {
+    const loggedInUser = req.user.userData;
+    const result = this.taskService.getAllTaskByUserIdandStageId(
+      loggedInUser,
+      body,
+    );
+    return result;
+  }
+}

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

@@ -0,0 +1,34 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_wf_action_data' })
+export class ActionDataEntity extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = 'ACTION_DATA';
+  }
+
+  @Column({ nullable: true })
+  action_id: number;
+
+  @Column({ nullable: true })
+  user_id: number;
+
+  @Column({ nullable: true })
+  stage_id: number;
+
+  @Column({ nullable: true })
+  start_time: Date;
+
+  @Column({ nullable: true })
+  end_time: Date;
+
+  @Column({ nullable: true })
+  is_mandatory: boolean;
+
+  @Column({ nullable: true })
+  mapped_entity_id: number;
+
+  @Column({ nullable: true })
+  mapped_entity_type: string;
+}

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

@@ -13,7 +13,7 @@ export class ActionEntity extends BaseEntity {
   workflow_id: number;
 
   @Column({ type: 'int', nullable: true })
-  action_cat_id: number;
+  action_category: number;
 
   @Column({ type: 'varchar', nullable: true })
   action_requirement: string;
@@ -29,4 +29,7 @@ export class ActionEntity extends BaseEntity {
 
   @Column({ default: 0, type: 'boolean' })
   default_value: boolean;
+
+  @Column({ nullable: true })
+  user_id: number;
 }

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

@@ -0,0 +1,43 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity } from 'typeorm';
+
+@Entity({ name: 'cr_wf_task_data' })
+export class TaskDataEntity extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = 'TASK_DATA';
+  }
+
+  @Column({ nullable: true })
+  task_id: number;
+
+  @Column({ nullable: true })
+  user_id: number;
+
+  @Column({ nullable: true })
+  stage_id: number;
+
+  @Column({ nullable: true })
+  action_id: number;
+
+  @Column({ nullable: true })
+  start_time: Date;
+
+  @Column({ nullable: true })
+  end_time: Date;
+
+  @Column({ nullable: true })
+  is_completed: boolean;
+
+  @Column({ default: 0 })
+  is_system: boolean;
+
+  @Column({ nullable: true })
+  is_mandatory: boolean;
+
+  @Column({ nullable: true })
+  mapped_entity_id: number;
+
+  @Column({ nullable: true })
+  mapped_entity_type: string;
+}

package/src/module/workflow/repository/stage-movement.repository.ts

@@ -6,6 +6,7 @@ import { WorkflowLevelMappingEntity } from '../entity/workflow-level-mapping.ent
 import { StageGroup } from '../entity/stage-group.entity';
 import { Stage } from '../entity/stage.entity';
 import { log } from 'console';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class StageMovementRepository {
@@ -178,4 +179,37 @@ export class StageMovementRepository {
     );
     return nextStageGroupFirstStage || null;
   }
+
+  async getAllActionByStageId(stageId: number): Promise<any[]> {
+    return this.dataSource.query(
+      `SELECT * FROM cr_wf_stage_action_mapping WHERE stage_id = ?`,
+      [stageId],
+    );
+  }
+
+  async saveActionData(action: any, loggedInUser: UserData): Promise<any> {
+    // Implement the logic to save action data
+
+    if (action.length > 0) {
+      for (const act of action) {
+        await this.dataSource.query(
+          `INSERT INTO cr_wf_action_data (stage_id, user_id, action_id) VALUES (?, ?, ?)`,
+          [act.stage_id, loggedInUser.id, act.id],
+        );
+      }
+    }
+  }
+
+  async saveTaskData(actionData: any, loggedInUser: UserData): Promise<any> {
+    // Implement the logic to save task data
+
+    if (actionData.length > 0) {
+      for (const action of actionData) {
+        await this.dataSource.query(
+          `INSERT INTO cr_wf_task_data (action_id, user_id) VALUES (?, ?)`,
+          [action.id, loggedInUser.id],
+        );
+      }
+    }
+  }
 }

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

@@ -0,0 +1,30 @@
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { TaskDataEntity } from '../entity/task-data.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class TaskRepository {
+  constructor(
+    @InjectRepository(TaskDataEntity)
+    private readonly TaskRepository: Repository<TaskDataEntity>,
+  ) {}
+
+  async getAllTaskByUserIdAndStageId(
+    userId: number,
+    stageId: number,
+    mapped_entity_type: string,
+    mapped_entity_id: number,
+  ) {
+    const result = await this.TaskRepository.find({
+      where: {
+        user_id: userId,
+        stage_id: stageId,
+        mapped_entity_type,
+        mapped_entity_id,
+      },
+    });
+
+    return result;
+  }
+}

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

@@ -0,0 +1,25 @@
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { TaskRepository } from '../repository/task.repository';
+
+@Injectable()
+export class TaskService extends EntityServiceImpl {
+  constructor(private readonly taskRepository: TaskRepository) {
+    super();
+  }
+
+  async getAllTaskByUserIdandStageId(
+    loggedInUser: UserData,
+    data,
+  ): Promise<any> {
+    const taskData = await this.taskRepository.getAllTaskByUserIdAndStageId(
+      loggedInUser.id,
+      data.stage_id,
+      data.mapped_entity_type,
+      data.mapped_entity_id,
+    );
+
+    return taskData;
+  }
+}

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

@@ -113,8 +113,14 @@ export class WorkflowMetaService extends EntityServiceImpl {
         start_date: new Date(),
         is_current: 'Y',
       });
+
+      this.populateActionService(currentStage.stage_id, loggedInUser);
+
+      return `Initialized workflow with first stage (Stage ID: ${firstStage.id}).`;
     }
 
+    //idhr
+
     // Case 2: Has next stage – move forward
     const stageDate = await this.getNextStage(currentStage);
 
@@ -143,6 +149,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
       return `Moved to next stage (Stage ID: ${nextStage.id}).`;
     }
 
+    //idhr
+
     // Case 3: No next stage – mark workflow as done
     currentStage.end_date = now;
     currentStage.is_current = 'N';
@@ -150,4 +158,46 @@ export class WorkflowMetaService extends EntityServiceImpl {
 
     return 'Workflow completed. No next stage available.';
   }
+
+  async populateActionService(stage_id: number, loggedInUser: UserData) {
+    const actions =
+      await this.stageMovementRepository.getAllActionByStageId(stage_id);
+    // Populate the action service with the retrieved actions
+
+    if (!actions || actions.length === 0) {
+      return 'No actions found for this stage.';
+    }
+
+    await this.stageMovementRepository.saveActionData(actions, loggedInUser);
+    await this.stageMovementRepository.saveTaskData(actions, loggedInUser);
+
+    // // loop through each action and get the action data and populate the task data
+    // for (const action of actions) {
+    //   const actionData = await super.getEntityData(
+    //     'STAGE_ACTION',
+    //     action.id,
+    //     loggedInUser,
+    //   );
+
+    //   await super.createEntity(
+    //     {
+    //       user_id: loggedInUser.id,
+    //       stage_id: action.stage_id,
+    //       action_id: action.id,
+    //     } as any,
+    //     loggedInUser,
+    //   );
+
+    //   await super.createEntity(
+    //     {
+    //       user_id: loggedInUser.id,
+    //       stage_id: action.stage_id,
+    //       action_id: action.id,
+    //       mapped_entity_type: actionData?.entity_type,
+    //       mapped_entity_id: actionData?.entity_id,
+    //     } as any,
+    //     loggedInUser,
+    //   );
+    // }
+  }
 }

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

@@ -41,6 +41,11 @@ import { WorkflowService } from './service/workflow.service';
 import { ActionCategoryController } from './controller/action-category.controller';
 import { StageMovementRepository } from './repository/stage-movement.repository';
 import { WorkflowLevelMappingEntity } from './entity/workflow-level-mapping.entity';
+import { TaskDataEntity } from './entity/task-data.entity';
+import { ActionDataEntity } from './entity/action-data.entity';
+import { TaskController } from './controller/task.controller';
+import { TaskService } from './service/task.service';
+import { TaskRepository } from './repository/task.repository';
 
 @Module({
   imports: [
@@ -57,6 +62,8 @@ import { WorkflowLevelMappingEntity } from './entity/workflow-level-mapping.enti
       EntityModification,
       TemplateAttach,
       WorkflowLevelMappingEntity,
+      TaskDataEntity,
+      ActionDataEntity,
     ]),
     EntityModule,
     ListMasterModule,
@@ -70,6 +77,7 @@ import { WorkflowLevelMappingEntity } from './entity/workflow-level-mapping.enti
     },
     { provide: 'ActionService', useClass: ActionService },
     { provide: 'StageService', useClass: StageService },
+    { provide: 'TaskService', useClass: TaskService },
     { provide: 'StageGroupService', useClass: StageGroupService },
     { provide: 'WorkflowService', useClass: WorkflowService },
     {
@@ -87,6 +95,7 @@ import { WorkflowLevelMappingEntity } from './entity/workflow-level-mapping.enti
     WorkflowMetaService,
     PopulateWorkflowService,
     StageMovementRepository,
+    TaskRepository,
   ],
   exports: [
     'ActionCategoryService',
@@ -113,6 +122,7 @@ import { WorkflowLevelMappingEntity } from './entity/workflow-level-mapping.enti
     WorkflowMetaController,
     EntityModificationController,
     ActionCategoryController,
+    TaskController,
   ],
 })
 export class WorkflowModule {}