rez_core 4.0.218 → 4.0.220

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

@@ -1,267 +1,272 @@
-import { DataSource } from 'typeorm';
-import { Inject, Injectable } from '@nestjs/common';
-import { UserData } from '../../user/entity/user.entity';
-import * as moment from 'moment';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { ModuleRef } from '@nestjs/core';
-
-@Injectable()
-export class ResolverService {
-  private mediaDataService: any;
-
-  constructor(
-    private readonly dataSource: DataSource,
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
-    private readonly moduleRef: ModuleRef,
-  ) {}
-
-  private async getMediaDataService() {
-    if (!this.mediaDataService) {
-      const { MediaDataService } = await import('./media-data.service');
-      this.mediaDataService = this.moduleRef.get(MediaDataService, {
-        strict: false,
-      });
-    }
-    return this.mediaDataService;
-  }
-
-  async getResolvedData(
-    loggedInUser: any,
-    entityData: any,
-    entityType: string,
-  ): Promise<any> {
-    const attributeItems = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = ? AND organization_id = ?`,
-      [entityType, loggedInUser.organization_id],
-    );
-
-    const resolvedEntityData = { ...entityData };
-
-    for (const attr of attributeItems) {
-      const field = attr.attribute_key;
-      const codeValue = entityData[field];
-
-      if (!codeValue) continue;
-
-      // -------- ENTITY or MASTER via getDropdownOptions --------
-      if (
-        attr.data_source_type === 'entity' ||
-        (attr.data_source_type === 'master' && attr.category != 'Internal')
-      ) {
-        const type =
-          attr.data_source_type === 'entity'
-            ? attr.datasource_list
-            : attr.datasource_list;
-        const params = {}; // you can pass any additional filters here
-
-        if (Array.isArray(codeValue)) {
-          const resolvedValues: string[] = [];
-          for (const code of codeValue) {
-            const options = await this.listMasterService.getDropdownOptions(
-              type,
-              params,
-              undefined,
-              loggedInUser,
-            );
-            const item = options.find(
-              (opt) => opt.value == code || opt.code == code,
-            );
-            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-          }
-          resolvedEntityData[field] = resolvedValues;
-        } else {
-          const options = await this.listMasterService.getDropdownOptions(
-            type,
-            params,
-            undefined,
-            loggedInUser,
-          );
-          const item = options.find(
-            (opt) => opt.value == codeValue || opt.code == codeValue,
-          );
-          resolvedEntityData[field] = Array.isArray(item)
-            ? (item?.[attr.data_source_attribute] ?? codeValue)
-            : (item?.label ?? codeValue);
-        }
-      }
-
-      // -------- DATE / DATETIME --------
-      else if (
-        attr.element_type === 'date' ||
-        attr.element_type === 'datetime'
-      ) {
-        const dateValue = moment(codeValue).utcOffset('+05:30'); // IST
-        if (dateValue.isValid()) {
-          resolvedEntityData[field] =
-            attr.element_type === 'date'
-              ? dateValue.format('DD-MMM-YYYY')
-              : dateValue.format('DD-MMM-YYYY HH:mm:ss');
-        }
-      }
-
-      // --------UPLOAD / IMAGE --------
-      else if (
-        (attr.element_type === 'upload' || attr.element_type === 'image') &&
-        typeof resolvedEntityData[field] !== 'object'
-      ) {
-        const mediaService = await this.getMediaDataService();
-        const uploadData = await mediaService.getMediaDownloadUrl(
-          resolvedEntityData[field],
-          loggedInUser,
-        );
-        resolvedEntityData[field] = uploadData;
-      }
-    }
-
-    return resolvedEntityData;
-  }
-
-  async getResolvedValue(
-    loggedInUser: UserData,
-    attrKey: string,
-    rawValue: any,
-    entityType: string,
-  ): Promise<any> {
-    if (rawValue === null || rawValue === undefined || rawValue === '') {
-      return rawValue;
-    }
-
-    // fetch attribute meta only for the given attributeKey
-    const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
-      [entityType, loggedInUser.organization_id, attrKey],
-    );
-
-    if (!attr) return rawValue;
-
-    // -------- 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 = ? AND organization_id = ?`,
-        [attr.datasource_list, loggedInUser.organization_id],
-      );
-
-      if (!entityDef) return rawValue;
-
-      const tableName = entityDef.db_table_name;
-
-      if (Array.isArray(rawValue)) {
-        const resolvedValues: string[] = [];
-        for (const code of rawValue) {
-          const query =
-            tableName === 'sso_organization'
-              ? `SELECT * FROM ${tableName} WHERE code = ?`
-              : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
-
-          const params =
-            tableName === 'sso_organization'
-              ? [code]
-              : [code, loggedInUser.organization_id];
-
-          const [item] = await this.dataSource.query(query, params);
-          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-        }
-        return resolvedValues;
-      } else {
-        const query =
-          tableName === 'sso_organization'
-            ? `SELECT * FROM ${tableName} WHERE id = ?`
-            : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
-
-        const params =
-          tableName === 'sso_organization'
-            ? [rawValue]
-            : [rawValue, loggedInUser.organization_id];
-
-        const [item] = await this.dataSource.query(query, params);
-        return item?.[attr.data_source_attribute] ?? rawValue;
-      }
-    }
-
-    // -------- MASTER data_source_type --------
-    else if (attr.data_source_type === 'master') {
-      if (Array.isArray(rawValue)) {
-        const resolvedValues: string[] = [];
-        for (const code of rawValue) {
-          const [item] = await this.dataSource.query(
-            `SELECT * FROM frm_list_master_items WHERE id = ? AND organization_id = ?`,
-            [code, loggedInUser.organization_id],
-          );
-          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
-        }
-        return resolvedValues;
-      } else {
-        const [item] = await this.dataSource.query(
-          `SELECT * FROM frm_list_master_items WHERE id = ? AND organization_id = ?`,
-          [rawValue, loggedInUser.organization_id],
-        );
-        return item?.[attr.data_source_attribute] ?? rawValue;
-      }
-    }
-
-    return rawValue;
-  }
-
-  async getResolvedId(
-    loggedInUser: UserData,
-    attrKey: string,
-    displayValue: any,
-    entityType: string,
-  ): Promise<any> {
-    if (
-      displayValue === null ||
-      displayValue === undefined ||
-      displayValue === ''
-    ) {
-      return displayValue;
-    }
-
-    // fetch attribute meta
-    const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute 
-       WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
-      [entityType, loggedInUser.organization_id, attrKey],
-    );
-
-    if (!attr) return displayValue;
-
-    // -------- 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 = ? AND organization_id = ?`,
-        [attr.datasource_list, loggedInUser.organization_id],
-      );
-
-      if (!entityDef) return displayValue;
-
-      const tableName = entityDef.db_table_name;
-
-      const query =
-        tableName === 'sso_organization'
-          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ?`
-          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`;
-
-      const params =
-        tableName === 'sso_organization'
-          ? [displayValue]
-          : [displayValue, loggedInUser.organization_id];
-
-      const [item] = await this.dataSource.query(query, params);
-      return item?.id ?? displayValue;
-    }
-
-    // -------- 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} = ? AND organization_id = ? AND listtype = ?`,
-        [displayValue, loggedInUser.organization_id, attr.datasource_list],
-      );
-      return item?.id ?? displayValue;
-    }
-
-    return displayValue;
-  }
-}
+import { DataSource } from 'typeorm';
+import { Inject, Injectable } from '@nestjs/common';
+import { UserData } from '../../user/entity/user.entity';
+import * as moment from 'moment';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { ModuleRef } from '@nestjs/core';
+
+@Injectable()
+export class ResolverService {
+  private mediaDataService: any;
+
+  constructor(
+    private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+    private readonly moduleRef: ModuleRef,
+  ) {}
+
+  private async getMediaDataService() {
+    if (!this.mediaDataService) {
+      const { MediaDataService } = await import('./media-data.service');
+      this.mediaDataService = this.moduleRef.get(MediaDataService, {
+        strict: false,
+      });
+    }
+    return this.mediaDataService;
+  }
+
+  async getResolvedData(
+    loggedInUser: any,
+    entityData: any,
+    entityType: string,
+  ): Promise<any> {
+    const attributeItems = await this.dataSource.query(
+      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2`,
+      [entityType, loggedInUser.organization_id],
+    );
+
+    const resolvedEntityData = { ...entityData };
+
+    for (const attr of attributeItems) {
+      const field = attr.attribute_key;
+      const codeValue = entityData[field];
+
+      if (!codeValue) continue;
+
+      // -------- ENTITY or MASTER via getDropdownOptions --------
+      if (
+        attr.data_source_type === 'entity' ||
+        (attr.data_source_type === 'master' && attr.category != 'Internal')
+      ) {
+        const type =
+          attr.data_source_type === 'entity'
+            ? attr.datasource_list
+            : attr.datasource_list;
+        const params = {}; // you can pass any additional filters here
+
+        if (Array.isArray(codeValue)) {
+          const resolvedValues: string[] = [];
+          for (const code of codeValue) {
+            const options = await this.listMasterService.getDropdownOptions(
+              type,
+              params,
+              undefined,
+              loggedInUser,
+            );
+            const item = options.find(
+              (opt) => opt.value == code || opt.code == code,
+            );
+            resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+          }
+          resolvedEntityData[field] = resolvedValues;
+        } else {
+          const options = await this.listMasterService.getDropdownOptions(
+            type,
+            params,
+            undefined,
+            loggedInUser,
+          );
+          const item = options.find(
+            (opt) => opt.value == codeValue || opt.code == codeValue,
+          );
+          resolvedEntityData[field] = Array.isArray(item)
+            ? (item?.[attr.data_source_attribute] ?? codeValue)
+            : (item?.label ?? codeValue);
+        }
+      }
+
+      // -------- DATE / DATETIME --------
+      else if (
+        attr.element_type === 'date' ||
+        attr.element_type === 'datetime'
+      ) {
+        // 👇 Explicitly define input format to avoid deprecation warning
+        const dateValue = moment(codeValue, "DD-MM-YYYY", true).utcOffset('+05:30');
+
+        if (dateValue.isValid()) {
+          resolvedEntityData[field] =
+            attr.element_type === 'date'
+              ? dateValue.format('DD-MMM-YYYY')
+              : dateValue.format('DD-MMM-YYYY HH:mm:ss');
+        } else {
+          // fallback: return original value
+          resolvedEntityData[field] = codeValue;
+        }
+      }
+
+      // --------UPLOAD / IMAGE --------
+      else if (
+        (attr.element_type === 'upload' || attr.element_type === 'image') &&
+        typeof resolvedEntityData[field] !== 'object'
+      ) {
+        const mediaService = await this.getMediaDataService();
+        const uploadData = await mediaService.getMediaDownloadUrl(
+          resolvedEntityData[field],
+          loggedInUser,
+        );
+        resolvedEntityData[field] = uploadData;
+      }
+    }
+
+    return resolvedEntityData;
+  }
+
+  async getResolvedValue(
+    loggedInUser: UserData,
+    attrKey: string,
+    rawValue: any,
+    entityType: string,
+  ): Promise<any> {
+    if (rawValue === null || rawValue === undefined || rawValue === '') {
+      return rawValue;
+    }
+
+    // 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`,
+      [entityType, loggedInUser.organization_id, attrKey],
+    );
+
+    if (!attr) return rawValue;
+
+    // -------- 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`,
+        [attr.datasource_list, loggedInUser.organization_id],
+      );
+
+      if (!entityDef) return rawValue;
+
+      const tableName = entityDef.db_table_name;
+
+      if (Array.isArray(rawValue)) {
+        const resolvedValues: string[] = [];
+        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`;
+
+          const params =
+            tableName === 'sso_organization'
+              ? [code]
+              : [code, loggedInUser.organization_id];
+
+          const [item] = await this.dataSource.query(query, params);
+          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+        }
+        return resolvedValues;
+      } else {
+        const query =
+          tableName === 'sso_organization'
+            ? `SELECT * FROM ${tableName} WHERE id = $1`
+            : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
+
+        const params =
+          tableName === 'sso_organization'
+            ? [rawValue]
+            : [rawValue, loggedInUser.organization_id];
+
+        const [item] = await this.dataSource.query(query, params);
+        return item?.[attr.data_source_attribute] ?? rawValue;
+      }
+    }
+
+    // -------- MASTER data_source_type --------
+    else if (attr.data_source_type === 'master') {
+      if (Array.isArray(rawValue)) {
+        const resolvedValues: string[] = [];
+        for (const code of rawValue) {
+          const [item] = await this.dataSource.query(
+            `SELECT * FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
+            [code, loggedInUser.organization_id],
+          );
+          resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
+        }
+        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],
+        );
+        return item?.[attr.data_source_attribute] ?? rawValue;
+      }
+    }
+
+    return rawValue;
+  }
+
+  async getResolvedId(
+    loggedInUser: UserData,
+    attrKey: string,
+    displayValue: any,
+    entityType: string,
+  ): Promise<any> {
+    if (
+      displayValue === null ||
+      displayValue === undefined ||
+      displayValue === ''
+    ) {
+      return displayValue;
+    }
+
+    // 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`,
+      [entityType, loggedInUser.organization_id, attrKey],
+    );
+
+    if (!attr) return displayValue;
+
+    // -------- 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`,
+        [attr.datasource_list, loggedInUser.organization_id],
+      );
+
+      if (!entityDef) return displayValue;
+
+      const tableName = entityDef.db_table_name;
+
+      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`;
+
+      const params =
+        tableName === 'sso_organization'
+          ? [displayValue]
+          : [displayValue, loggedInUser.organization_id];
+
+      const [item] = await this.dataSource.query(query, params);
+      return item?.id ?? displayValue;
+    }
+
+    // -------- 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`,
+        [displayValue, loggedInUser.organization_id, attr.datasource_list],
+      );
+      return item?.id ?? displayValue;
+    }
+
+    return displayValue;
+  }
+}