rez_core 3.1.168 → 3.1.169

package/package.json

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

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

@@ -6,9 +6,11 @@ import { ListMasterService } from 'src/module/listmaster/service/list-master.ser
 
 @Injectable()
 export class ResolverService {
-  constructor(private readonly dataSource: DataSource,
+  constructor(
+    private readonly dataSource: DataSource,
     @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService  ) {}
+    private readonly listMasterService: ListMasterService,
+  ) {}
 
   async getResolvedData(
     loggedInUser: any,
@@ -19,37 +21,61 @@ export class ResolverService {
       `SELECT * FROM cr_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') {
-        const type = attr.data_source_type === 'entity' ? attr.datasource_list : attr.list_type;
+      if (
+        attr.data_source_type === 'entity' ||
+        attr.data_source_type === 'master'
+      ) {
+        const type =
+          attr.data_source_type === 'entity'
+            ? attr.datasource_list
+            : attr.list_type;
         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, true);
-            const item = options.find(opt => opt.id === code || opt.code === code);
+            const options = await this.listMasterService.getDropdownOptions(
+              type,
+              params,
+              undefined,
+              loggedInUser,
+            );
+            const item = options.find(
+              (opt) => opt.id === 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, true);
-          const item = options.find(opt => opt.id === codeValue || opt.code === codeValue);
-          resolvedEntityData[field] = item?.[attr.data_source_attribute] ?? codeValue;
+          const options = await this.listMasterService.getDropdownOptions(
+            type,
+            params,
+            undefined,
+            loggedInUser,
+          );
+          const item = options.find(
+            (opt) => opt.id === codeValue || opt.code === codeValue,
+          );
+          resolvedEntityData[field] =
+            item?.[attr.data_source_attribute] ?? codeValue;
         }
       }
-  
+
       // -------- DATE / DATETIME --------
-      else if (attr.element_type === 'date' || attr.element_type === 'datetime') {
+      else if (
+        attr.element_type === 'date' ||
+        attr.element_type === 'datetime'
+      ) {
         const dateValue = moment(codeValue).utcOffset('+05:30'); // IST
         if (dateValue.isValid()) {
           resolvedEntityData[field] =
@@ -59,10 +85,9 @@ export class ResolverService {
         }
       }
     }
-  
+
     return resolvedEntityData;
   }
-  
 
   async getResolvedValue(
     loggedInUser: UserData,

package/src/module/notification/entity/notification.entity.ts

@@ -18,6 +18,9 @@ export class NotificationData extends BaseEntity {
   @Column({ nullable: true })
   mapped_entity_type: string;
 
+  @Column({ nullable: true })
+  task_id: number;
+
   @Column({ name: 'is_read', type: 'boolean', default: false })
   is_read: boolean;
 }