rez_core 7.1.1 → 7.1.2

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

@@ -1,16 +1,16 @@
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { Injectable } from '@nestjs/common';
-import { PreferenceRepository } from '../repository/preference.repository';
-
-@Injectable()
-export class PreferenceService extends EntityServiceImpl {
-  constructor(private readonly preferenceRepository: PreferenceRepository) {
-    super();
-  }
-
-  async getPreferenceValue(preferenceKey: string): Promise<string | undefined> {
-    const preferenceMaster =
-      await this.preferenceRepository.findByPreferenceKey(preferenceKey);
-    return preferenceMaster?.preference_value;
-  }
-}
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { Injectable } from '@nestjs/common';
+import { PreferenceRepository } from '../repository/preference.repository';
+
+@Injectable()
+export class PreferenceService extends EntityServiceImpl {
+  constructor(private readonly preferenceRepository: PreferenceRepository) {
+    super();
+  }
+
+  async getPreferenceValue(preferenceKey: string): Promise<string | undefined> {
+    const preferenceMaster =
+      await this.preferenceRepository.findByPreferenceKey(preferenceKey);
+    return preferenceMaster?.preference_value;
+  }
+}

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

@@ -1,293 +1,260 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { UserData } from 'src/module/auth/dto/user.dto';
-import * as moment from 'moment';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { ModuleRef } from '@nestjs/core';
-import { AttributeMasterRepository } from '../repository/attribute-master.repository';
-import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
-import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { EntityManager } from 'typeorm';
-
-@Injectable()
-export class ResolverService {
-  private mediaDataService: any;
-
-  constructor(
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
-    private readonly moduleRef: ModuleRef,
-    private readonly attributeMasterRepo: AttributeMasterRepository,
-    private readonly reflectionHelper: ReflectionHelper,
-    @Inject(forwardRef(() => EntityMasterRepository))
-    private readonly entityMasterRepo: EntityMasterRepository,
-    private readonly entityManger: EntityManager,
-  ) {}
-
-  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.attributeMasterRepo.findAttributesByMappedEntityType(
-        entityType,
-        loggedInUser,
-      );
-
-    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.ds_category) {
-        const params = {}; // you can pass any additional filters here
-
-        if (Array.isArray(codeValue)) {
-          const resolvedValues: string[] = [];
-          for (const code of codeValue) {
-            let options: any = [];
-            try {
-              options = await this.listMasterService.getDropDownData(
-                attr.mapped_entity_type,
-                attr.attribute_key,
-                loggedInUser,
-                params,
-              );
-            } catch (e) {
-              options.push(entityData[attr.attribute_key]);
-            }
-            const item = options.find(
-              (opt) => opt.value == code || opt.code == code,
-            );
-            resolvedValues.push(item?.['label'] ?? code);
-          }
-          // make resolved values to a comma separated string
-          resolvedEntityData[field] = resolvedValues.join(', ');
-        } else {
-          let options: any = [];
-          try {
-            options = await this.listMasterService.getDropDownData(
-              attr.mapped_entity_type,
-              attr.attribute_key,
-              loggedInUser,
-              params,
-            );
-          } catch (e) {
-            options.push(entityData[attr.attribute_key]);
-          }
-          const item = options.find(
-            (opt) => opt.value == codeValue || opt.code == codeValue,
-          );
-          resolvedEntityData[field] = Array.isArray(item)
-            ? (item?.[attr.name] ?? codeValue)
-            : (item?.label ?? codeValue);
-        }
-      }
-
-      // -------- DATE / DATETIME --------
-      if (attr.element_type === 'date' || attr.element_type === 'datetime') {
-        const dateFormat =
-          attr.element_type === 'date' ? 'DD-MM-YYYY' : 'DD-MM-YYYY HH:mm:ss';
-        const dateValue = moment(codeValue, dateFormat).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');
-        } else {
-          // fallback: return original value
-          resolvedEntityData[field] = codeValue;
-        }
-      }
-
-      // --------UPLOAD / IMAGE --------
-      else if (
-        attr.element_type === 'upload' ||
-        attr.element_type === 'image'
-      ) {
-        const mediaService = await this.getMediaDataService();
-
-        let uploadData: any;
-        if (typeof resolvedEntityData[field] !== 'object') {
-          uploadData = await mediaService.getMediaDownloadUrl(
-            resolvedEntityData[field],
-            loggedInUser,
-          );
-        } else {
-          uploadData = resolvedEntityData[field];
-        }
-
-        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.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(
-        entityType,
-        attrKey,
-        loggedInUser.enterprise_id,
-      );
-
-    if (!attr) return rawValue;
-
-    if (attr.ds_category) {
-      const params = {}; // you can pass any additional filters here
-
-      if (Array.isArray(rawValue)) {
-        const resolvedValues: string[] = [];
-        for (const code of rawValue) {
-          let options: any[] = [];
-          try {
-            options = await this.listMasterService.getDropDownData(
-              attr.mapped_entity_type,
-              attr.attribute_key,
-              loggedInUser,
-              params,
-              [code],
-            );
-          } catch (e) {
-            options.push(code);
-          }
-          const item = options.find(
-            (opt) => opt.value == code || opt.code == code,
-          );
-          resolvedValues.push(item?.label ?? code);
-        }
-      }
-
-      // 🟩 If value is array → resolve each
-      if (Array.isArray(rawValue)) {
-        const resolvedValues: string[] = [];
-
-        // for (const id of rawValue) {
-        //   const item = await repo.findOne({
-        //     where: { id: Number(id) },
-        //   });
-        //   resolvedValues.push(item?.[attr.data_source_attribute] ?? id);
-        // }
-
-        return resolvedValues;
-      } else {
-        let options: any[] = [];
-        try {
-          options = await this.listMasterService.getDropDownData(
-            attr.mapped_entity_type,
-            attr.attribute_key,
-            loggedInUser,
-            params,
-            [rawValue],
-          );
-        } catch (e) {
-          options.push(rawValue);
-        }
-        const item = options.find(
-          (opt) => opt.value == rawValue || opt.code == rawValue,
-        );
-        return item?.label ?? rawValue;
-      }
-
-      return 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.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(
-        entityType,
-        attrKey,
-        loggedInUser.enterprise_id,
-      );
-
-    if (!attr) return displayValue;
-
-    // -------- ENTITY data_source_type --------
-    if (attr.ds_category === 'ENTITY') {
-      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(
-        attr.ds_entitytype,
-        loggedInUser.enterprise_id,
-      );
-
-      if (!entityDef) return displayValue;
-
-      const tableName = entityDef.db_table_name;
-
-      const query =
-        tableName === 'sso_organization'
-          ? `SELECT id
-             FROM ${tableName}
-             WHERE ${attr.name} = $1`
-          : `SELECT id
-             FROM ${tableName}
-             WHERE ${attr.name} = $1
-               AND enterprise_id = $2`;
-
-      const params =
-        tableName === 'sso_organization'
-          ? [displayValue]
-          : [displayValue, loggedInUser.enterprise_id];
-
-      const [item] = await this.entityManger.query(query, params);
-      return item?.id ?? displayValue;
-    }
-
-    // -------- MASTER data_source_type --------
-    else if (attr.ds_category === 'LIST_MASTER') {
-      const listMasterItemsRepo =
-        this.reflectionHelper.getRepoService('ListMasterItems');
-
-      const item = await listMasterItemsRepo.findOne({
-        where: {
-          [attr.name]: displayValue,
-          enterprise_id: loggedInUser.enterprise_id,
-          listtype: attr.ds_entitytype,
-        },
-      });
-
-      return item?.id ?? displayValue;
-    }
-
-    return displayValue;
-  }
-}
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { UserData } from 'src/module/auth/dto/user.dto';
+import * as moment from 'moment';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { ModuleRef } from '@nestjs/core';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
+import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
+import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { EntityManager } from 'typeorm';
+
+@Injectable()
+export class ResolverService {
+  private mediaDataService: any;
+
+  constructor(
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+    private readonly moduleRef: ModuleRef,
+    private readonly attributeMasterRepo: AttributeMasterRepository,
+    private readonly reflectionHelper: ReflectionHelper,
+    @Inject(forwardRef(() => EntityMasterRepository))
+    private readonly entityMasterRepo: EntityMasterRepository,
+    private readonly entityManger: EntityManager,
+  ) {
+  }
+
+  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.attributeMasterRepo.findAttributesByMappedEntityType(
+        entityType,
+        loggedInUser,
+      );
+
+    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.ds_category) {
+        const params = {}; // you can pass any additional filters here
+
+        if (Array.isArray(codeValue)) {
+          const resolvedValues: string[] = [];
+          for (const code of codeValue) {
+            let options: any = [];
+            try {
+              options = await this.listMasterService.getDropDownData(
+                attr.mapped_entity_type,
+                attr.attribute_key,
+                loggedInUser,
+                params,
+              );
+            } catch (e) {
+              options.push(entityData[attr.attribute_key]);
+            }
+            const item = options.find(
+              (opt) => opt.value == code || opt.code == code,
+            );
+            resolvedValues.push(item?.["label"] ?? code);
+          }
+          resolvedEntityData[field] = resolvedValues;
+        } else {
+          let options: any = [];
+          try {
+            options = await this.listMasterService.getDropDownData(
+              attr.mapped_entity_type,
+              attr.attribute_key,
+              loggedInUser,
+              params,
+            );
+          } catch (e) {
+            options.push(entityData[attr.attribute_key]);
+          }
+          const item = options.find(
+            (opt) => opt.value == codeValue || opt.code == codeValue,
+          );
+          resolvedEntityData[field] = Array.isArray(item)
+            ? (item?.[attr.name] ?? codeValue)
+            : (item?.label ?? codeValue);
+        }
+      }
+
+      // -------- DATE / DATETIME --------
+      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.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.enterprise_id);
+    if (!attr) return rawValue;
+
+
+    if (attr.ds_category) {
+      const params = {}; // you can pass any additional filters here
+
+      if (Array.isArray(rawValue)) {
+        const resolvedValues: string[] = [];
+        for (const code of rawValue) {
+          let options: any[] = [];
+          try {
+            options = await this.listMasterService.getDropDownData(
+              attr.mapped_entity_type,
+              attr.attribute_key,
+              loggedInUser,
+              params,
+              [code],
+            );
+          } catch (e) {
+            options.push(code);
+          }
+          const item = options.find(
+            (opt) => opt.value == code || opt.code == code,
+          );
+          resolvedValues.push(item?.label ?? code);
+        }
+        return resolvedValues;
+      } else {
+        let options: any[] = [];
+        try {
+          options = await this.listMasterService.getDropDownData(
+            attr.mapped_entity_type,
+            attr.attribute_key,
+            loggedInUser,
+            params,
+            [rawValue],
+          );
+        } catch (e) {
+          options.push(rawValue);
+        }
+        const item = options.find(
+          (opt) => opt.value == rawValue || opt.code == rawValue,
+        );
+        return item?.label ?? 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.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.enterprise_id);
+
+    if (!attr) return displayValue;
+
+    // -------- ENTITY data_source_type --------
+    if (attr.ds_category === 'ENTITY') {
+      const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.ds_entitytype, loggedInUser.enterprise_id);
+
+      if (!entityDef) return displayValue;
+
+      const tableName = entityDef.db_table_name;
+
+      const query =
+        tableName === 'sso_organization'
+          ? `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.name} = $1`
+          : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.name} = $1
+               AND enterprise_id = $2`;
+
+      const params =
+        tableName === 'sso_organization'
+          ? [displayValue]
+          : [displayValue, loggedInUser.enterprise_id];
+
+      const [item] = await this.entityManger.query(query, params);
+      return item?.id ?? displayValue;
+    }
+
+    // -------- MASTER data_source_type --------
+    else if (attr.ds_category === 'LIST_MASTER') {
+      const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+
+      const item = await listMasterItemsRepo.findOne({
+        where: {
+          [attr.name]: displayValue,
+          enterprise_id: loggedInUser.enterprise_id,
+          listtype: attr.ds_entitytype,
+        },
+      });
+
+      return item?.id ?? displayValue;
+    }
+
+    return displayValue;
+  }
+}