rez_core 2.1.152 → 2.1.154

package/package.json

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

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

@@ -31,4 +31,13 @@ export class ActionDataEntity extends BaseEntity {
 
   @Column({ nullable: true })
   mapped_entity_type: string;
+
+  @Column({ nullable: true })
+  sequence: number;
+
+  @Column({ default: 0 })
+  is_done: boolean;
+
+  @Column({ type: 'varchar', nullable: true })
+  is_current: string;
 }

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

@@ -12,8 +12,8 @@ export class ActionEntity extends BaseEntity {
   @Column({ type: 'int', nullable: true })
   workflow_id: number;
 
-  @Column({ type: 'int', nullable: true })
-  action_category: number;
+  @Column({ type: 'varchar', nullable: true })
+  action_category: string;
 
   @Column({ type: 'varchar', nullable: true })
   action_requirement: string;
@@ -24,8 +24,8 @@ export class ActionEntity extends BaseEntity {
   @Column({ type: 'varchar', nullable: true })
   reason_code: string;
 
-  @Column({ type: 'int', nullable: true })
-  default_reason_code: number;
+  @Column({ type: 'varchar', nullable: true })
+  default_reason_code: string;
 
   @Column({ default: 0, type: 'boolean' })
   default_value: boolean;

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

@@ -5,20 +5,20 @@ import { Column, Entity } from 'typeorm';
 export class TaskDataEntity extends BaseEntity {
   constructor() {
     super();
-    this.entity_type = 'TASK_DATA';
+    this.entity_type = 'TASK';
   }
 
   @Column({ nullable: true })
-  task_id: number;
+  task_id: string;
 
   @Column({ nullable: true })
-  user_id: number;
+  user_id: string;
 
   @Column({ nullable: true })
-  stage_id: number;
+  stage_id: string;
 
   @Column({ nullable: true })
-  action_id: number;
+  action_id: string;
 
   @Column({ nullable: true })
   start_time: Date;
@@ -40,4 +40,28 @@ export class TaskDataEntity extends BaseEntity {
 
   @Column({ nullable: true })
   mapped_entity_type: string;
+
+  @Column({ nullable: true })
+  sequence: number;
+
+  @Column({ default: 0 })
+  is_done: boolean;
+
+  @Column({ nullable: true })
+  task_status: string;
+
+  @Column({ nullable: true })
+  task_name: string;
+
+  @Column({ nullable: true, type: 'varchar', length: 1000 })
+  description: string;
+
+  @Column({ nullable: true })
+  task_owner: string;
+
+  @Column({ nullable: true, type: 'varchar' })
+  due_date: Date;
+
+  @Column({ nullable: true, type: 'varchar' })
+  due_time: string;
 }

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

@@ -11,10 +11,10 @@ export class TaskRepository {
   ) {}
 
   async getAllTaskByUserIdAndStageId(
-    userId: number,
-    stageId: number,
-    mapped_entity_type: string,
-    mapped_entity_id: number,
+    userId,
+    stageId,
+    mapped_entity_type,
+    mapped_entity_id,
   ) {
     const result = await this.TaskRepository.find({
       where: {

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

@@ -57,6 +57,7 @@ export class WorkflowService extends EntityServiceImpl {
     );
 
     const workflowId = entityData.id;
+    const { level_id, level_type, organization_id } = loggedInUser;
 
     // Handle INACTIVE status validation
     if (entityData.status == resolveStatus.id) {
@@ -85,15 +86,40 @@ export class WorkflowService extends EntityServiceImpl {
       }
     }
 
-    // Handle is_default uniqueness logic
+    // Handle is_default uniqueness logic within same level
     if ((entityData as Workflow).is_default == true) {
-      await this.dataSource
-        .createQueryBuilder()
-        .update(Workflow)
-        .set({ is_default: 0 })
-        .where('is_default = :isDefault', { isDefault: 1 })
-        .execute();
+      // Step 1: Get previous default workflow for same level_id and level_type
+      const oldDefault = await this.dataSource.query(
+        `
+      SELECT id FROM cr_workflow
+      WHERE level_id = ? AND level_type = ?
+      `,
+        [level_id, level_type],
+      );
+
+      if (oldDefault?.length) {
+        const oldWorkflowId = oldDefault[0].id;
+
+        // Step 2: Update old workflow to is_default = 0
+        await this.dataSource
+          .createQueryBuilder()
+          .update(Workflow)
+          .set({ is_default: 0 })
+          .where('id = :id', { id: oldWorkflowId })
+          .execute();
+
+        // Step 3: Update cr_workflow_level_mapping to point to new workflowId
+        await this.dataSource.query(
+          `
+        UPDATE cr_workflow_level_mapping
+        SET workflow_id = ?
+        WHERE mapped_level_id = ? AND mapped_level_type = ?
+        `,
+          [workflowId, level_id, level_type],
+        );
+      }
     }
+
     // Final update
     return super.updateEntity(entityData, loggedInUser);
   }