rez_core 5.0.55 → 5.0.57

package/package.json

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

package/src/module/meta/service/resolver.service.ts

@@ -18,7 +18,8 @@ export class ResolverService {
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+  ) {
+  }
 
   private async getMediaDataService() {
     if (!this.mediaDataService) {
@@ -139,7 +140,11 @@ export class ResolverService {
 
     // fetch attribute meta only for the given attributeKey
     const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
+      `SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -148,7 +153,10 @@ export class ResolverService {
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
-        `SELECT * FROM frm_entity_master WHERE mapped_entity_type = $1 AND organization_id = $2`,
+        `SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -161,8 +169,13 @@ export class ResolverService {
         for (const code of rawValue) {
           const query =
             tableName === 'sso_organization'
-              ? `SELECT * FROM ${tableName} WHERE code = $1`
-              : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+              ? `SELECT *
+                 FROM ${tableName}
+                 WHERE code = $1`
+              : `SELECT *
+                 FROM ${tableName}
+                 WHERE id = $1
+                   AND organization_id = $2`;
 
           const params =
             tableName === 'sso_organization'
@@ -176,8 +189,13 @@ export class ResolverService {
       } else {
         const query =
           tableName === 'sso_organization'
-            ? `SELECT * FROM ${tableName} WHERE id = $1`
-            : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+            ? `SELECT *
+               FROM ${tableName}
+               WHERE id = $1`
+            : `SELECT *
+               FROM ${tableName}
+               WHERE id = $1
+                 AND organization_id = $2`;
 
         const params =
           tableName === 'sso_organization'
@@ -197,7 +215,7 @@ export class ResolverService {
           const repo =
             await this.reflectionHelper.getRepoService('ListMasterItems');
 
-          let item = await repo.findOne({
+          let item = repo.findOne({
             where: {
               id: code,
               organization_id: loggedInUser.organization_id,
@@ -207,16 +225,11 @@ export class ResolverService {
         }
         return resolvedValues;
       } else {
-        // const [item] = await this.dataSource.query(
-        //   `SELECT * FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
-        //   [rawValue, loggedInUser.organization_id],
-        // );
-
         const repo =
           await this.reflectionHelper.getRepoService('ListMasterItems');
-        let item = await repo.findOne({
+        let item = repo.findOne({
           where: {
-            id: rawValue,
+            id: Number(rawValue),
             organization_id: loggedInUser.organization_id,
           },
         });
@@ -243,8 +256,11 @@ export class ResolverService {
 
     // fetch attribute meta
     const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute 
-       WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
+      `SELECT *
+       FROM frm_entity_attribute
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2
+         AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -253,8 +269,10 @@ export class ResolverService {
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
-        `SELECT * FROM frm_entity_master 
-         WHERE mapped_entity_type = $1 AND organization_id = $2`,
+        `SELECT *
+         FROM frm_entity_master
+         WHERE mapped_entity_type = $1
+           AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -264,8 +282,13 @@ export class ResolverService {
 
       const query =
         tableName === 'sso_organization'
-          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1`
-          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2`;
+          ? `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1`
+          : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1
+               AND organization_id = $2`;
 
       const params =
         tableName === 'sso_organization'
@@ -279,8 +302,11 @@ export class ResolverService {
     // -------- MASTER data_source_type --------
     else if (attr.data_source_type === 'master') {
       const [item] = await this.dataSource.query(
-        `SELECT id FROM frm_list_master_items 
-         WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2 AND listtype = $3`,
+        `SELECT id
+         FROM frm_list_master_items
+         WHERE ${attr.data_source_attribute} = $1
+           AND organization_id = $2
+           AND listtype = $3`,
         [displayValue, loggedInUser.organization_id, attr.datasource_list],
       );
       return item?.id ?? displayValue;

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

@@ -12,6 +12,7 @@ import * as moment from 'moment';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 import { ChecksumAlgorithm } from '@aws-sdk/client-s3';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 @ActionHandler('add_task')
@@ -23,7 +24,7 @@ export class TaskService extends EntityServiceImpl {
     @Inject('ActivityLogService')
     private readonly activityLogService: ActivityLogService,
     private readonly mediaDataService: MediaDataService,
-    private readonly configService: ConfigService,
+    private readonly configService: ConfigService
   ) {
     super();
   }
@@ -278,70 +279,57 @@ export class TaskService extends EntityServiceImpl {
   ): Promise<any[]> {
     const { mapped_entity_type, mapped_entity_id, status, mandatory, overdue } =
       data;
+    const taskRepo = this.reflectionHelper.getRepoService('TaskDataEntity');
+    const qb = taskRepo
+      .createQueryBuilder("t")
+      .select("t.*")
+      .leftJoinAndSelect("frm_wf_stage", "s", "t.stage_id::text = s.id::text")
+      .leftJoinAndSelect("frm_wf_stage_group", "sg", "s.stage_group_id = sg.id")
+      .leftJoinAndSelect("frm_wf_action", "a", "t.action_id::text = a.id::text")
+      .where("t.mapped_entity_type = :mapped_entity_type", {
+        mapped_entity_type,
+      })
+      .andWhere("t.mapped_entity_id::text = :mapped_entity_id", {
+        mapped_entity_id: String(mapped_entity_id),
+      });
+
+    // ---------------------------
+    // OPTIONAL FILTERS
+    // ---------------------------
 
-    const whereClauses: string[] = [];
-    const params: any[] = [];
-    let idx = 1;
-
-    // Required filters
-    whereClauses.push(`t.mapped_entity_type = $${idx++}`);
-    params.push(mapped_entity_type);
-
-    whereClauses.push(`t.mapped_entity_id::text = $${idx++}`);
-    params.push(String(mapped_entity_id));
-
-    // Optional: status (stored as varchar)
     if (status) {
-      whereClauses.push(`t.status::text = $${idx++}`);
-      params.push(String(status));
+      qb.andWhere("t.status::text = :status", { status: String(status) });
     }
 
-    // Optional: mandatory (stored as varchar '0' / '1')
     if (mandatory !== undefined) {
-      whereClauses.push(`t.is_mandatory::text = $${idx++}`);
-      params.push(mandatory ? "1" : "0");
+      qb.andWhere("t.is_mandatory = :mandatory", {
+        mandatory: mandatory ? "1" : "0",
+      });
     }
 
-    // Optional: overdue
     if (overdue) {
-      whereClauses.push(`
-      (
-        t.due_date < CURRENT_DATE
-        OR (t.due_date = CURRENT_DATE AND t.due_time < CURRENT_TIME)
-      )
-    `);
-
-      // Only include tasks NOT done
-      whereClauses.push(`t.is_done::text = $${idx++}`);
-      params.push("0"); // varchar field
+      qb.andWhere(
+        `
+        (
+          t.due_date < CURRENT_DATE
+          OR (t.due_date = CURRENT_DATE AND t.due_time < CURRENT_TIME)
+        )
+      `,
+      ).andWhere("t.is_done::text = :is_done", { is_done: "0" });
     }
 
-    // Final SQL
-    const sql = `
-        SELECT
-            t.*,
-            sg.name AS stage_group_name,
-            s.name AS stage_name,
-            a.name AS action_name
-        FROM frm_wf_task_data t
-                 LEFT JOIN frm_wf_stage s ON t.stage_id::text = s.id::text
-        LEFT JOIN frm_wf_stage_group sg ON s.stage_group_id = sg.id
-            LEFT JOIN frm_wf_action a ON t.action_id::text = a.id::text
-        WHERE ${whereClauses.join(" AND ")}
-        ORDER BY t.created_date DESC
-    `;
-
-    const taskData = await this.dataSource.query(sql, params);
-
-    // -------------------------------
-    // PROFILE IMAGE MAPPING
-    // -------------------------------
+    qb.orderBy("t.created_date", "DESC");
+
+    const taskData = await qb.getRawMany();
+
+    // ------------------------------------------------
+    // PROFILE IMAGE LOGIC (same as your code)
+    // ------------------------------------------------
+
     if (taskData?.length) {
       for (const task of taskData) {
         try {
-          const baseUrl =
-            this.configService.get<string>("REDIRECT_BE_URL");
-
+          const baseUrl = this.configService.get<string>("REDIRECT_BE_URL");
           const queryParams = new URLSearchParams({
             loggedInUser: JSON.stringify(loggedInUser),
           }).toString();
@@ -362,27 +350,21 @@ export class TaskService extends EntityServiceImpl {
 
     if (!taskData.length) return [];
 
-    // -------------------------------
-    // FETCH TKST STATUS LABELS
-    // -------------------------------
-    const statusSql = `
-        SELECT id, name
-        FROM frm_list_master_items
-        WHERE organization_id = $1
-          AND listtype = 'TKST'
-    `;
-
-    const allStatuses = await this.dataSource.query(statusSql, [
-      loggedInUser.organization_id,
-    ]);
+    // ------------------------------------------------
+    // STATUS LOOKUP
+    // ------------------------------------------------
+    const listMasterRepo = this.reflectionHelper.getRepoService('ListMasterItem');
 
-    const statusMap = new Map(
-      allStatuses.map((row) => [String(row.id), row.name]),
-    );
+    const statuses = await listMasterRepo.find({
+      where: {
+        organization_id: loggedInUser.organization_id,
+        listtype: "TKST",
+      },
+      select: ["id", "name"],
+    });
+
+    const statusMap = new Map(statuses.map((row) => [String(row.id), row.name]));
 
-    // -------------------------------
-    // FINAL MAPPING
-    // -------------------------------
     return taskData.map((task) => ({
       ...task,
       task_status: statusMap.get(String(task.status)) || null,

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

@@ -105,13 +105,17 @@ export class WorkflowService extends EntityServiceImpl {
         )
         .execute();
 
-      // Update frm_wf_level_mapping to point to the new workflow
-      await this.dataSource.query(
-        `UPDATE frm_wf_level_mapping
-     SET workflow_id = $1
-     WHERE mapped_level_id = $2 AND mapped_level_type = $3`,
-        [workflowId, level_id, level_type],
-      );
+      await this.reflectionHelper
+        .getRepoService('WorkflowLevelMappingEntity')
+        .update(
+          {
+            mapped_level_id: level_id,
+            mapped_level_type: level_type,
+          },
+          {
+            workflow_id: workflowId,
+          },
+        );
     }
 
     // Final update

package/src/resources/dev.properties.yaml

@@ -5,7 +5,7 @@ DB_PORT: '5432'
 DB_USER: 'root'
 DB_PASS: 'Rezolut123'
 DB_NAME: 'universal'
-DB_SCHEMA: 'preprod_ether_sso'
+DB_SCHEMA: 'preprod_ether_crm'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'