rez_core 3.1.192 → 3.1.194

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

@@ -1,121 +1,149 @@
-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';
-
-export const ACTIVITY_CATEGORIES = {
-  ASSIGN: 'ASSIGN',
-  INTERACTION: 'INTERACTION',
-  FORM: 'FORM',
-  STAGE: 'STAGE',
-  ASSESSMENT: 'ASSESSMENT',
-  MEETING: 'MEETING',
-  PROCESS: 'PROCESS',
-  STATUS: 'STATUS',
-  TASK: 'TASK',
-  LEAD: 'LEAD',
-  STAGEGROUP: 'STAGE_GROUP',
-} as const;
-
-export type ActivityCategoryType = keyof typeof ACTIVITY_CATEGORIES;
-
-export class ActivityLogRepository {
-  constructor(
-    @InjectRepository(ActivityLog)
-    private readonly activityLogRepository: Repository<ActivityLog>,
-    private readonly mediaDataService: MediaDataService,
-  ) {}
-
-  async getAllActivityLog(
-    mapped_entity_type: string,
-    mapped_entity_id: number | string,
-    category: string | undefined,
-    loggedInUser,
-  ) {
-    const { organization_id, id: loggedInUserId } = loggedInUser;
-
-    const query = this.activityLogRepository
-      .createQueryBuilder('log')
-      .leftJoin('sso_user', 'user', 'log.created_by = user.id')
-      .leftJoin('eth_user_profile', 'profile', 'profile.parent_id = user.id')
-      .addSelect('user.name', 'user_name')
-      .addSelect('profile.profile_image', 'profile_image') // media ID
-      .where('log.mapped_entity_type = :mapped_entity_type', {
-        mapped_entity_type,
-      })
-      .andWhere('log.organization_id = :organization_id', { organization_id })
-      .andWhere('log.mapped_entity_id = :mapped_entity_id', {
-        mapped_entity_id,
-      });
-
-    if (category) {
-      query.andWhere('log.category = :category', { category });
-    }
-
-    query.orderBy('log.created_date', 'DESC');
-    const rows = await query.getRawAndEntities();
-
-    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,
-          );
-        }
-
-        const formattedLabel = entity.category
-          .toLowerCase() // stage_group
-          .replace(/_/g, ' ') // stage group
-          .replace(/\b\w/g, (char) => char.toUpperCase()); // Stage Group
-
-        return {
-          ...entity,
-          category: formattedLabel,
-          user_name: rows.raw[i].user_name,
-          profile, // whole JSON from media service
-          created_date: entity.created_date
-            ? moment(entity.created_date).local().format('DD-MMM, hh:mm A')
-            : null,
-        };
-      }),
-    );
-
-    return result;
-  }
-
-  async getAllActivityCategory(
-    mapped_entity_id: number | string,
-    mapped_entity_type: string,
-    loggedInUser: any,
-  ) {
-    const { organization_id } = loggedInUser;
-
-    const result = await this.activityLogRepository
-      .createQueryBuilder('log')
-      .select('DISTINCT UPPER(log.category)', 'category')
-      .where('log.mapped_entity_type = :mapped_entity_type', {
-        mapped_entity_type,
-      })
-      .andWhere('log.organization_id = :organization_id', { organization_id })
-      .andWhere('log.mapped_entity_id = :mapped_entity_id', {
-        mapped_entity_id,
-      })
-
-      .getRawMany();
-    return result.map((row) => {
-      const formattedLabel = row.category
-        .toLowerCase() // stage_group
-        .replace(/_/g, ' ') // stage group
-        .replace(/\b\w/g, (char) => char.toUpperCase()); // Stage Group
-      return {
-        label: formattedLabel,
-        value: row.category,
-      };
-    });
-  }
-}
+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';
+import axios from 'axios';
+import { ConfigService } from '@nestjs/config';
+
+export const ACTIVITY_CATEGORIES = {
+  ASSIGN: 'ASSIGN',
+  INTERACTION: 'INTERACTION',
+  FORM: 'FORM',
+  STAGE: 'STAGE',
+  ASSESSMENT: 'ASSESSMENT',
+  MEETING: 'MEETING',
+  PROCESS: 'PROCESS',
+  STATUS: 'STATUS',
+  TASK: 'TASK',
+  LEAD: 'LEAD',
+  STAGEGROUP: 'STAGE_GROUP',
+} as const;
+
+export type ActivityCategoryType = keyof typeof ACTIVITY_CATEGORIES;
+
+export class ActivityLogRepository {
+  constructor(
+    @InjectRepository(ActivityLog)
+    private readonly activityLogRepository: Repository<ActivityLog>,
+    private readonly mediaDataService: MediaDataService,
+    private readonly configService: ConfigService,
+  ) {}
+
+  async getAllActivityLog(
+    mapped_entity_type: string,
+    mapped_entity_id: number | string,
+    category: string | undefined,
+    loggedInUser,
+  ) {
+    const { organization_id, id: loggedInUserId } = loggedInUser;
+
+    const query = this.activityLogRepository
+      .createQueryBuilder('log')
+      .where('log.mapped_entity_type = :mapped_entity_type', {
+        mapped_entity_type,
+      })
+      .andWhere('log.organization_id = :organization_id', { organization_id })
+      .andWhere('log.mapped_entity_id = :mapped_entity_id', {
+        mapped_entity_id,
+      });
+
+    if (category) {
+      query.andWhere('log.category = :category', { category });
+    }
+
+    query.orderBy('log.created_date', 'DESC');
+    const rows = await query.getRawAndEntities();
+
+    if (rows?.entities) {
+      let user: any = null;
+      for (const param of rows?.entities as any) {
+        try {
+          const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+          // Prepare the query string
+          const queryParams = new URLSearchParams({
+            loggedInUser: JSON.stringify(loggedInUser),
+          }).toString();
+
+          // Make the GET request with query parameters
+          const response = await axios.get(
+            `${baseUrl}/users/profile-image-url/${param?.created_by}?entity_type=UPR&${queryParams}`,
+            {
+              headers: {
+                'Content-Type': 'application/json',
+              },
+            },
+          );
+
+          console.log('✅ Internal Entity API response:', response.data);
+          user = response.data;
+          param.user_name = user.name;
+          param.profile_image = user.profile_image;
+        } catch (error) {
+          console.error('⚠️ Internal Entity API call failed:', error.message);
+        }
+      }
+    }
+
+    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,
+        //   );
+        // }
+
+        const formattedLabel = entity.category
+          .toLowerCase() // stage_group
+          .replace(/_/g, ' ') // stage group
+          .replace(/\b\w/g, (char) => char.toUpperCase()); // Stage Group
+
+        return {
+          ...entity,
+          category: formattedLabel,
+          created_date: entity.created_date
+            ? moment(entity.created_date).local().format('DD-MMM, hh:mm A')
+            : null,
+        };
+      }),
+    );
+
+    return result;
+  }
+
+  async getAllActivityCategory(
+    mapped_entity_id: number | string,
+    mapped_entity_type: string,
+    loggedInUser: any,
+  ) {
+    const { organization_id } = loggedInUser;
+
+    const result = await this.activityLogRepository
+      .createQueryBuilder('log')
+      .select('DISTINCT UPPER(log.category)', 'category')
+      .where('log.mapped_entity_type = :mapped_entity_type', {
+        mapped_entity_type,
+      })
+      .andWhere('log.organization_id = :organization_id', { organization_id })
+      .andWhere('log.mapped_entity_id = :mapped_entity_id', {
+        mapped_entity_id,
+      })
+
+      .getRawMany();
+    return result.map((row) => {
+      const formattedLabel = row.category
+        .toLowerCase() // stage_group
+        .replace(/_/g, ' ') // stage group
+        .replace(/\b\w/g, (char) => char.toUpperCase()); // Stage Group
+      return {
+        label: formattedLabel,
+        value: row.category,
+      };
+    });
+  }
+}

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

@@ -1,149 +1,149 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
-import { CommTemplate } from '../entity/comm-template.entity';
-import { TemplateAttach } from '../entity/template-attach-mapper.entity';
-import { MediaDataService } from 'src/module/meta/service/media-data.service';
-
-@Injectable()
-export class CommTemplateRepository {
-  constructor(
-    @InjectRepository(CommTemplate)
-    private readonly commTemplateRepository: Repository<CommTemplate>,
-    @InjectRepository(TemplateAttach)
-    private readonly templateAttachEntity: Repository<TemplateAttach>,
-    private readonly mediaDataService: MediaDataService,
-    private readonly dataSource: DataSource,
-  ) {}
-
-  async getAllCommTemplate(
-    entity_type: string,
-    action_id?: number,
-    loggedInUser?,
-  ) {
-    const { organization_id, level_id, level_type } = loggedInUser;
-
-    let is_template: number | undefined;
-
-    // 1️⃣ Only check action_id if provided
-    if (action_id) {
-      const [actionResult] = await this.dataSource.query(
-        `SELECT is_template 
-       FROM cr_wf_action 
-       WHERE id = ? AND organization_id = ? 
-       LIMIT 1`,
-        [action_id, organization_id],
-      );
-
-      if (!actionResult) {
-        throw new Error('Invalid action_id');
-      }
-
-      is_template = actionResult.is_template;
-
-      await this.dataSource.query(
-        `UPDATE cr_wf_comm_template
-     SET is_template = ?
-     WHERE mapped_entity_type = ?
-       AND organization_id = ? AND level_id = ? AND level_type=?`,
-        [is_template, entity_type, organization_id, level_id, level_type],
-      );
-    }
-
-    const whereCondition: any = {
-      // mapped_entity_type: entity_type,
-      organization_id,
-      level_id,
-      level_type,
-    };
-
-    if (typeof is_template !== 'undefined') {
-      whereCondition.is_template = is_template;
-    }
-
-    return this.commTemplateRepository.find({
-      select: ['name', 'code', 'mode', 'is_template'],
-      where: whereCondition,
-    });
-  }
-
-  async save(commTemplate: any): Promise<any> {
-    // // delete existing mapper
-    // for (const attachment of commTemplate || []) {
-    //   await this.templateAttachEntity.delete({
-    //     entity_type: attachment.entity_type,
-    //     template_id: attachment.template_id,
-    //   });
-    // }
-
-    return this.templateAttachEntity.save(commTemplate);
-  }
-
-  async delete(id: any): Promise<any> {
-    // delete existing mapper
-    return await this.templateAttachEntity.delete(id);
-  }
-
-  async getTemplateByCode(
-    entity_type: string,
-    id: number,
-    loggedInUser,
-  ): Promise<any | null> {
-    const template = await this.commTemplateRepository.findOne({
-      where: { entity_type, id },
-    });
-
-    if (!template) {
-      throw new NotFoundException(`Template with id ${id} not found`);
-    }
-
-    if (template.format_type === 'markup') {
-      const media = await this.mediaDataService.getMediaDownloadUrl(
-        template.markup_id,
-        loggedInUser,
-      );
-      template.markup_id = media as any;
-    }
-
-    if (template.format_type === 'richtext') {
-      return template;
-    }
-
-    // Get attachments for this template
-    const attachments = await this.templateAttachEntity.find({
-      select: ['media_id'],
-      where: {
-        entity_type,
-        template_id: template.id,
-      },
-    });
-
-    // If there are attachments, return array of media JSONs
-    let attachmentsMedia: any[] = [];
-    if (attachments.length > 0) {
-      attachmentsMedia = await Promise.all(
-        attachments.map(async (att) => {
-          // Fetch media details for each media_id
-          const media = await this.mediaDataService.getMediaDownloadUrl(
-            att.media_id,
-            loggedInUser,
-          );
-          return media; // return full media info (e.g., { id, url, ... })
-        }),
-      );
-    }
-
-    // Return template with attachments array
-    return {
-      ...template,
-      attachments: attachmentsMedia, // [] or array of media JSONs
-    };
-  }
-
-  async findByCodeAndLevelIdAndLevelTypeAndAppCode(code: string, level_id: string,
-                                                   level_type: string, appcode: string) {
-    return await this.commTemplateRepository.findOne({
-      where: {code, level_id, level_type, appcode}
-    });
-  }
-}
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { DataSource, Repository } from 'typeorm';
+import { CommTemplate } from '../entity/comm-template.entity';
+import { TemplateAttach } from '../entity/template-attach-mapper.entity';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
+
+@Injectable()
+export class CommTemplateRepository {
+  constructor(
+    @InjectRepository(CommTemplate)
+    private readonly commTemplateRepository: Repository<CommTemplate>,
+    @InjectRepository(TemplateAttach)
+    private readonly templateAttachEntity: Repository<TemplateAttach>,
+    private readonly mediaDataService: MediaDataService,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async getAllCommTemplate(
+    entity_type: string,
+    action_id?: number,
+    loggedInUser?,
+  ) {
+    const { organization_id, level_id, level_type } = loggedInUser;
+
+    let is_template: number | undefined;
+
+    // 1️⃣ Only check action_id if provided
+    if (action_id) {
+      const [actionResult] = await this.dataSource.query(
+        `SELECT is_template 
+       FROM cr_wf_action 
+       WHERE id = ? AND organization_id = ? 
+       LIMIT 1`,
+        [action_id, organization_id],
+      );
+
+      if (!actionResult) {
+        throw new Error('Invalid action_id');
+      }
+
+      is_template = actionResult.is_template;
+
+      await this.dataSource.query(
+        `UPDATE cr_wf_comm_template
+     SET is_template = ?
+     WHERE mapped_entity_type = ?
+       AND organization_id = ? AND level_id = ? AND level_type=?`,
+        [is_template, entity_type, organization_id, level_id, level_type],
+      );
+    }
+
+    const whereCondition: any = {
+      // mapped_entity_type: entity_type,
+      organization_id,
+      level_id,
+      level_type,
+    };
+
+    if (typeof is_template !== 'undefined') {
+      whereCondition.is_template = is_template;
+    }
+
+    return this.commTemplateRepository.find({
+      select: ['name', 'code', 'mode', 'is_template'],
+      where: whereCondition,
+    });
+  }
+
+  async save(commTemplate: any): Promise<any> {
+    // // delete existing mapper
+    // for (const attachment of commTemplate || []) {
+    //   await this.templateAttachEntity.delete({
+    //     entity_type: attachment.entity_type,
+    //     template_id: attachment.template_id,
+    //   });
+    // }
+
+    return this.templateAttachEntity.save(commTemplate);
+  }
+
+  async delete(id: any): Promise<any> {
+    // delete existing mapper
+    return await this.templateAttachEntity.delete(id);
+  }
+
+  async getTemplateByCode(
+    entity_type: string,
+    id: number,
+    loggedInUser,
+  ): Promise<any | null> {
+    const template = await this.commTemplateRepository.findOne({
+      where: { entity_type, id },
+    });
+
+    if (!template) {
+      throw new NotFoundException(`Template with id ${id} not found`);
+    }
+
+    if (template.format_type === 'markup') {
+      const media = await this.mediaDataService.getMediaDownloadUrl(
+        template.markup_id,
+        loggedInUser,
+      );
+      template.markup_id = media as any;
+    }
+
+    if (template.format_type === 'richtext') {
+      return template;
+    }
+
+    // Get attachments for this template
+    const attachments = await this.templateAttachEntity.find({
+      select: ['media_id'],
+      where: {
+        entity_type,
+        template_id: template.id,
+      },
+    });
+
+    // If there are attachments, return array of media JSONs
+    let attachmentsMedia: any[] = [];
+    if (attachments.length > 0) {
+      attachmentsMedia = await Promise.all(
+        attachments.map(async (att) => {
+          // Fetch media details for each media_id
+          const media = await this.mediaDataService.getMediaDownloadUrl(
+            att.media_id,
+            loggedInUser,
+          );
+          return media; // return full media info (e.g., { id, url, ... })
+        }),
+      );
+    }
+
+    // Return template with attachments array
+    return {
+      ...template,
+      attachments: attachmentsMedia, // [] or array of media JSONs
+    };
+  }
+
+  async findByCodeAndLevelIdAndLevelTypeAndAppCode(code: string, level_id: string,
+                                                   level_type: string, appcode: string) {
+    return await this.commTemplateRepository.findOne({
+      where: {code, level_id, level_type, appcode}
+    });
+  }
+}