rez_core 2.2.70 → 2.2.72

package/package.json

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

package/src/module/workflow/controller/form-master.controller.ts

@@ -37,7 +37,7 @@ export class FormMasterController {
   @HttpCode(HttpStatus.OK)
   async submitForm(@Req() req: Request & { user: any }, @Body() body: any) {
     const loggedInUser = req.user.userData;
-    const result = this.formMasterService.submitForm(body);
+    const result = this.formMasterService.submitForm(body, loggedInUser);
     return result;
   }
 }

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

@@ -7,6 +7,8 @@ export class FormMasterDataEntity extends BaseEntity {
     super();
     this.entity_type = 'FORM';
   }
+  @Column({ nullable: true })
+  mapped_entity_id: number;
 
   @Column({ nullable: true })
   mapped_entity_type: string;
@@ -15,8 +17,11 @@ export class FormMasterDataEntity extends BaseEntity {
   source_entity_type: string;
 
   @Column({ nullable: true })
-  view_id: string;
+  view_id: number;
 
   @Column({ nullable: true })
   form_name: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  form_url: string;
 }

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

@@ -1,4 +1,5 @@
 import { InjectRepository } from '@nestjs/typeorm';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import { ActivityLog } from '../entity/activity-log.entity';
 import { Repository } from 'typeorm';
 import * as moment from 'moment';
@@ -23,6 +24,7 @@ export class ActivityLogRepository {
   constructor(
     @InjectRepository(ActivityLog)
     private readonly activityLogRepository: Repository<ActivityLog>,
+    private readonly mediaDataService: MediaDataService,
   ) {}
 
   async getAllActivityLog(
@@ -31,12 +33,19 @@ export class ActivityLogRepository {
     category: string | undefined,
     loggedInUser,
   ) {
-    const { organization_id } = loggedInUser;
+    const { organization_id, id: loggedInUserId } = loggedInUser;
 
     const query = this.activityLogRepository
       .createQueryBuilder('log')
       .leftJoin('cr_user', 'user', 'log.created_by = user.id')
+      .leftJoin(
+        'eth_user_profile',
+        'profile',
+        'profile.parent_id = user.id AND profile.parent_id = :loggedInUserId',
+        { loggedInUserId },
+      )
       .addSelect('user.name', 'user_name')
+      .addSelect('profile.profile_image', 'profile_image') // media ID
       .where('log.mapped_entity_type = :mapped_entity_type', {
         mapped_entity_type,
       })
@@ -52,13 +61,30 @@ export class ActivityLogRepository {
     query.orderBy('log.created_date', 'DESC');
     const rows = await query.getRawAndEntities();
 
-    return rows.entities.map((entity, i) => ({
-      ...entity,
-      user_name: rows.raw[i].user_name,
-      created_date: entity.created_date
-        ? moment(entity.created_date).format('DD-MMM, hh:mm A')
-        : null,
-    }));
+    const result = await Promise.all(
+      rows.entities.map(async (entity, i) => {
+        const profileImageId = rows.raw[i].profile_image;
+
+        let profile: any = null;
+        if (profileImageId) {
+          profile = await this.mediaDataService.getMediaDownloadUrl(
+            profileImageId,
+            loggedInUser,
+          );
+        }
+
+        return {
+          ...entity,
+          user_name: rows.raw[i].user_name,
+          profile, // whole JSON from media service
+          created_date: entity.created_date
+            ? moment(entity.created_date).format('DD-MMM, hh:mm A')
+            : null,
+        };
+      }),
+    );
+
+    return result;
   }
 
   async getAllActivityCategory(

package/src/module/workflow/repository/form-master.repository.ts

@@ -8,12 +8,13 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
 import { FormMasterDataEntity } from '../entity/form-master.entity';
 import { FormDataEntity } from '../entity/form.entity';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class FormMasterRepository {
   constructor(
     @InjectRepository(FormMasterDataEntity)
-    private readonly formMasterRepository: Repository<FormMasterDataEntity>,
+    private readonly formMasterEntity: Repository<FormMasterDataEntity>,
     private readonly dataSource: DataSource,
     @InjectRepository(FormDataEntity)
     private readonly formRepo: Repository<FormDataEntity>,
@@ -38,19 +39,26 @@ export class FormMasterRepository {
     return formatted;
   }
 
-  async submitForm(formData: any) {
-    const currentForm = await this.formRepo.findOneBy({
-      mapped_entity_id: formData.entity_id,
-      mapped_entity_type: formData.entity_type,
-      view_id: formData.view_id,
+  // to_be_sent
+  // saved
+  // sent
+  // submitted
+  // resubmit_requested
+  // accepted
+
+  async submitForm(redirect_data: any, loggedInUser: UserData) {
+    const currentForm = await this.formMasterEntity.findOneBy({
+      mapped_entity_id: redirect_data.entity_id,
+      mapped_entity_type: redirect_data.entity_type,
+      view_id: redirect_data.view_id,
     });
 
     if (!currentForm) {
       throw new NotFoundException('Form not found');
     }
 
-    currentForm.status = 'Y';
+    currentForm.status = 'submitted';
 
-    return this.formRepo.save(currentForm);
+    return this.formMasterEntity.update(currentForm.id, currentForm);
   }
 }

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

@@ -7,6 +7,7 @@ import {
 import { StageGroup } from '../entity/stage-group.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
 
 @Injectable()
 export class StageGroupRepository {
@@ -14,6 +15,7 @@ export class StageGroupRepository {
     @InjectRepository(StageGroup)
     private readonly stageGroupRepository: Repository<StageGroup>,
     private readonly dataSource: DataSource,
+    private readonly mediaDataService: MediaDataService,
   ) {}
 
   async getAllStageGroup(workflow_id: number, organization_id: number) {
@@ -43,6 +45,7 @@ export class StageGroupRepository {
   async getAllStageGroupAndStageHierarchy(
     workflow_id: number,
     organization_id: number,
+    loggedInUser: any, // required for media service
     lead_id: number,
   ) {
     if (!workflow_id) {
@@ -54,28 +57,27 @@ export class StageGroupRepository {
       workflow_id,
       organization_id,
     );
-
     if (!stageGroups.length) return [];
 
     // Step 2: Get all stages for these stage groups
     const stageGroupIds = stageGroups.map((sg) => sg.id);
-
-    const stages = await this.dataSource.query(
+    const stagesRaw = await this.dataSource.query(
       `
-    SELECT
-      cr_wf_stage.*,
-      cr_user.name AS created_by_name
-    FROM cr_wf_stage
-    LEFT JOIN cr_user ON cr_wf_stage.created_by = cr_user.id
-    WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-      AND cr_wf_stage.organization_id = ?
-    ORDER BY cr_wf_stage.sequence ASC
+      SELECT
+        cr_wf_stage.*,
+        eth_user_profile.name AS created_by_name,
+        eth_user_profile.profile_image AS profile_image
+      FROM cr_wf_stage
+      LEFT JOIN eth_user_profile 
+        ON cr_wf_stage.created_by = eth_user_profile.parent_id
+      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
+        AND cr_wf_stage.organization_id = ?
+      ORDER BY cr_wf_stage.sequence ASC
     `,
       [...stageGroupIds, organization_id],
     );
 
-    // Step 3: Get all counts in bulk
-    const stageIds = stages.map((s) => s.id);
+    const stageIds = stagesRaw.map((s) => s.id);
 
     // Task counts
     const taskCounts = await this.dataSource.query(
@@ -111,7 +113,6 @@ export class StageGroupRepository {
       [...stageIds, lead_id],
     );
 
-    // Convert to maps for quick lookup
     // Convert to maps for quick lookup
     const taskCountMap = new Map(
       taskCounts.map((row) => [Number(row.stage_id), Number(row.task_count)]),
@@ -129,7 +130,25 @@ export class StageGroupRepository {
       ]),
     );
 
-    // Step 4: Add counts to each stage
+    // Step 4: Add counts & profile to each stage
+    const stages = await Promise.all(
+      stagesRaw.map(async (stage) => {
+        const profileImageId = stage.profile_image;
+        let profile: any = null;
+        if (profileImageId) {
+          profile = await this.mediaDataService.getMediaDownloadUrl(
+            profileImageId,
+            loggedInUser,
+          );
+        }
+        return {
+          ...stage,
+          profile, // enriched profile object
+        };
+      }),
+    );
+
+    // Step 5: Group stages by stage_group_id
     const stageMap = new Map<number, any[]>();
     for (const stage of stages) {
       const stageId = Number(stage.id); // ensure number

package/src/module/workflow/service/form-master.service.ts

@@ -1,10 +1,13 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { FormMasterRepository } from '../repository/form-master.repository';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 
 @Injectable()
-export class FormMasterService {
-  constructor(private readonly formMasterRepository: FormMasterRepository) {}
+export class FormMasterService extends EntityServiceImpl {
+  constructor(private readonly formMasterRepository: FormMasterRepository) {
+    super();
+  }
 
   async getForms(loggedInUser: UserData, source_entity_type: string) {
     const { organization_id } = loggedInUser;
@@ -14,13 +17,19 @@ export class FormMasterService {
     );
   }
 
-  async submitForm(data: any) {
-    const { entity_id, entity_type, view_id } = data;
+  async saveForm(
+    data: { entity_id: number; entity_type: string; view_id: number },
+    loggedInUser: UserData,
+  ) {
+    // return this.formMasterRepository.saveForm(data, loggedInUser);
+  }
+
+  async submitForm(data: any, loggedInUser: UserData) {
+    const { form_data, redirect_data } = data;
+
+    // update from
+    super.updateEntity(form_data, loggedInUser);
 
-    return this.formMasterRepository.submitForm({
-      entity_id,
-      entity_type,
-      view_id,
-    });
+    return this.formMasterRepository.submitForm(redirect_data, loggedInUser);
   }
 }

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

@@ -75,6 +75,7 @@ export class StageGroupService extends EntityServiceImpl {
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
         workflowLevelMapping.workflow_id,
         loggedInUser.organization_id,
+        loggedInUser,
         lead_id,
       )) as Array<{
         stages: any[];

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

@@ -59,10 +59,32 @@ export class TaskService extends EntityServiceImpl {
   }
 
   async updateEntity(
-    entityData: BaseEntity,
+    entityData,
     loggedInUser: UserData,
     appcode?: string,
   ): Promise<any> {
+    const taskStatusQuery = `
+    SELECT name 
+    FROM cr_list_master_items 
+    WHERE id = ? 
+      AND organization_id = ? 
+      AND listtype = 'TKST'
+    LIMIT 1;
+  `;
+
+    const statusRows = await this.dataSource.query(taskStatusQuery, [
+      entityData.status,
+      loggedInUser.organization_id,
+    ]);
+
+    const isCompletedStatus =
+      statusRows.length > 0 &&
+      statusRows[0].name?.toLowerCase() === 'completed';
+
+    // Sync flags based on status
+    entityData.is_completed = isCompletedStatus;
+    entityData.is_done = isCompletedStatus;
+
     const updatedEntity = await super.updateEntity(
       entityData,
       loggedInUser,
@@ -88,24 +110,7 @@ export class TaskService extends EntityServiceImpl {
 
       await this.activityLogService.logActivity(editLogData, loggedInUser);
 
-      const taskStatusQuery = `
-  SELECT name 
-  FROM cr_list_master_items 
-  WHERE id = ? 
-    AND organization_id = ? 
-    AND listtype = 'TKST'
-  LIMIT 1;
-`;
-
-      const statusRows = await this.dataSource.query(taskStatusQuery, [
-        entityData.status,
-        loggedInUser.organization_id,
-      ]);
-
-      if (
-        statusRows.length > 0 &&
-        statusRows[0].name?.toLowerCase() === 'completed'
-      ) {
+      if (isCompletedStatus) {
         const completedLogData = {
           mapped_entity_id: updatedEntity.mapped_entity_id,
           mapped_entity_type: updatedEntity.mapped_entity_type,