rez_core 3.1.181 → 3.1.183

package/package.json

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

package/src/module/filter/service/filter.service.ts

@@ -84,15 +84,17 @@ export class FilterService {
       attributeFilter = [],
       loggedInUser,
     } = dto;
-  
-  
+
     // 🔹 Step 1: Collect all filters (from body + savedFilter)
-    const savedFilters = await this.getSavedFilters(savedFilterCode ?? undefined);
-    const allFilters = [...quickFilter, ...attributeFilter, ...savedFilters].filter(
-      (f) => f.filter_value !== '',
+    const savedFilters = await this.getSavedFilters(
+      savedFilterCode ?? undefined,
     );
+    const allFilters = [
+      ...quickFilter,
+      ...attributeFilter,
+      ...savedFilters,
+    ].filter((f) => f.filter_value !== '');
 
-  
     // 🔹 Step 2: Group filters by filter_entity_type
     const grouped = allFilters.reduce(
       (acc, f) => {
@@ -102,16 +104,16 @@ export class FilterService {
       },
       {} as Record<string, any[]>,
     );
-  
+
     console.log('🟠 [FilterService] Grouped filters by entity type:', grouped);
-  
+
     // 🔹 Step 3: Handle sub-entities first
     let intersectionIds: number[] | null = null;
     for (const [subEntityType, filters] of Object.entries(grouped)) {
       if (subEntityType === entity_type) continue; // skip main entity for now
-  
+
       let { queryParams, tabs, ...newDto } = dto;
-  
+
       const subDto: FilterRequestDto = {
         ...newDto,
         entity_type: subEntityType,
@@ -119,42 +121,48 @@ export class FilterService {
         savedFilterCode: null, // already merged
         attributeFilter: [],
       };
-  
+
       const subResult = await this.applyFilter(subDto);
       const subEntityIds = subResult.data.entity_list.map((row) => row.id);
-  
-      console.log(`🧩 [FilterService] Sub-entity ${subEntityType} returned IDs:`, subEntityIds);
-  
+
+      console.log(
+        `🧩 [FilterService] Sub-entity ${subEntityType} returned IDs:`,
+        subEntityIds,
+      );
+
       if (!subEntityIds.length) {
-        console.log(`ℹ️ [FilterService] No records for sub-entity ${subEntityType}, returning empty result`);
+        console.log(
+          `ℹ️ [FilterService] No records for sub-entity ${subEntityType}, returning empty result`,
+        );
         return {
           success: true,
           data: { entity_tabs: [], entity_list: [], pagination: {} },
         };
       }
-  
+
       const relatedIds = await this.entityRelationService.getRelatedEntityIds(
         entity_type,
         subEntityType,
         subEntityIds,
         dto.loggedInUser.organization_id,
       );
-  
+
       intersectionIds =
         intersectionIds === null
           ? relatedIds
           : intersectionIds.filter((id) => relatedIds.includes(id));
-  
 
       if (intersectionIds.length === 0) {
-        console.log('🚫 [FilterService] No intersection IDs left, returning empty result');
+        console.log(
+          '🚫 [FilterService] No intersection IDs left, returning empty result',
+        );
         return {
           success: true,
           data: { entity_tabs: [], entity_list: [], pagination: {} },
         };
       }
     }
-  
+
     // 🔹 Step 4: Call applyFilter for main entity
     const mainFilters = grouped[entity_type] || [];
     const mainDto: FilterRequestDto = {
@@ -163,7 +171,7 @@ export class FilterService {
       savedFilterCode: null,
       attributeFilter: [],
     };
-  
+
     if (intersectionIds && intersectionIds.length > 0) {
       (mainDto.quickFilter ??= []).push({
         filter_attribute: 'id',
@@ -172,10 +180,10 @@ export class FilterService {
         filter_entity_type: entity_type,
       });
     }
-  
-    return this.applyFilter(mainDto);
+
+    return await this.applyFilter(mainDto);
   }
-  
+
   async applyFilter(dto: FilterRequestDto) {
     const {
       entity_type,
@@ -190,7 +198,7 @@ export class FilterService {
       customLevelId,
       customAppCode,
     } = dto;
-  
+
     // abstract user details
     const {
       level_type,
@@ -199,25 +207,25 @@ export class FilterService {
       appcode,
       organization_id,
     } = loggedInUser || {};
-  
+
     // Fetch meta from entity table service
     const entityMeta = await this.entityMasterService.getEntityData(
       entity_type,
       loggedInUser,
     );
     const tableName = entityMeta?.data_source; // data_source is the table name
-  
+
     if (!tableName) {
       console.error(`❌ [FilterService] Invalid entity_type: ${entity_type}`);
       throw new BadRequestException(`Invalid entity_type: ${entity_type}`);
     }
-  
+
     const getAttributeColumnMeta =
       await this.attributeMasterService.findAttributesByMappedEntityType(
         entity_type,
         loggedInUser,
       );
-  
+
     const attributeMetaMap = getAttributeColumnMeta.reduce(
       (acc, attr) => {
         acc[attr.attribute_key] = attr;
@@ -225,7 +233,7 @@ export class FilterService {
       },
       {} as Record<string, any>,
     );
-  
+
     // Get and parse saved filters
     const savedFilters = await this.getSavedFilters(
       savedFilterCode ?? undefined,
@@ -247,11 +255,10 @@ export class FilterService {
         (f) => f.filter_value != null && f.filter_value !== '',
       ),
     ];
-  
-  
+
     // Build where clauses
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
-  
+
     // check level_id and level_type
     if (
       entity_type != 'ORGP' &&
@@ -267,20 +274,25 @@ export class FilterService {
         params: { organization_id, level_type, level_id },
       });
     }
-  
+
     if (customLevelType && customLevelId && customAppCode) {
       baseWhere.push({
         query:
           'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
-        params: { organization_id, customLevelType, customLevelId, customAppCode },
+        params: {
+          organization_id,
+          customLevelType,
+          customLevelId,
+          customAppCode,
+        },
       });
     }
-  
+
     // Handle queryParams filters
     if (queryParams) {
       Object.entries(queryParams).forEach(([key, value]) => {
         if (!value) return;
-  
+
         if (key === 'attributeName' && queryParams['attributeValue']) {
           const attrName = value;
           const attrValue = queryParams['attributeValue'];
@@ -296,9 +308,9 @@ export class FilterService {
         }
       });
     }
-  
+
     console.log('🟠 [FilterService] Constructed baseWhere clauses:', baseWhere);
-  
+
     // layout preference query
     const layoutPreference = await this.dataSource.query(
       `SELECT mapped_json 
@@ -306,11 +318,11 @@ export class FilterService {
        WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
       [user_id, entity_type, level_id, level_type],
     );
-  
+
     // Extract layout preference
     const layout = layoutPreference?.[0]?.mapped_json?.quick_tab || {};
     const showList = layout?.show_list?.map((val) => val.toLowerCase()) || [];
-  
+
     let allTabs;
     if (layout.attribute) {
       allTabs = await this.gettab_value_counts(
@@ -327,22 +339,22 @@ export class FilterService {
     }
 
     let filteredTabs;
-  
+
     if (showList?.length > 0) {
       const isAllNeeded = layout?.isAllSelected && !showList.includes('all');
       if (isAllNeeded) showList.push('all');
-  
+
       filteredTabs = allTabs.filter((tab) =>
         showList.includes(tab.tab_value.toLowerCase()),
       );
-  
+
       const allTab = filteredTabs.find(
         (tab) => tab.tab_value?.toLowerCase() === 'all',
       );
       filteredTabs = filteredTabs.filter(
         (tab) => tab.tab_value?.toLowerCase() !== 'all',
       );
-  
+
       // SORTING LOGIC
       if (layout.sorting === 'asc') {
         filteredTabs.sort((a, b) =>
@@ -366,9 +378,9 @@ export class FilterService {
           return aIndex - bIndex;
         });
       }
-  
+
       if (allTab) filteredTabs.unshift(allTab);
-  
+
       if (layout?.isCombineOther) {
         const originalAllTab = allTabs.find(
           (tab) => tab.tab_value.toLowerCase() === 'all',
@@ -377,7 +389,7 @@ export class FilterService {
         const knownTabCountSum = filteredTabs
           .filter((tab) => tab.tab_value.toLowerCase() !== 'all')
           .reduce((acc, tab) => acc + tab.tab_value_count, 0);
-  
+
         const othersCount = allCount - knownTabCountSum;
         filteredTabs.push({
           tab_value: 'OTHERS',
@@ -387,14 +399,13 @@ export class FilterService {
     } else {
       filteredTabs = allTabs;
     }
-  
-  
+
     const dataWhere = [...baseWhere];
-  
+
     if (tabs?.columnName && tabs?.value) {
       const tabAttrMeta = attributeMetaMap[tabs.columnName];
       const tabValue = tabs.value.toLowerCase();
-  
+
       if (tabValue === 'others') {
         const valuesToExclude = showList.filter((v) => v !== 'all');
         if (valuesToExclude.length > 0) {
@@ -426,7 +437,7 @@ export class FilterService {
           tabs.value,
           entity_type,
         );
-  
+
         if (resolvedId) {
           const tabCondition = this.buildCondition(
             {
@@ -441,53 +452,68 @@ export class FilterService {
         }
       }
     }
-  
-    const qb = this.dataSource.createQueryBuilder().select('e.*').from(tableName, 'e');
+
+    const qb = this.dataSource
+      .createQueryBuilder()
+      .select('e.*')
+      .from(tableName, 'e');
     dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
-  
+
     if (layoutPreference && layoutPreference[0]?.mapped_json?.sorting) {
       if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.tabs)) {
-        const preferenceTabArray = layoutPreference[0]?.mapped_json?.sorting?.tabs;
+        const preferenceTabArray =
+          layoutPreference[0]?.mapped_json?.sorting?.tabs;
         const tabFilter = preferenceTabArray.find(
           (tabData) => tabData.tab_name === tabs?.value,
         );
         tabFilter?.sortby.forEach(({ column, order }) => {
-          qb.addOrderBy(`e.${column}`, order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
-        });
-      } else if (Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)) {
-        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(({ column, order }) => {
-          qb.addOrderBy(`e.${column}`, order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
+          qb.addOrderBy(
+            `e.${column}`,
+            order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+          );
         });
+      } else if (
+        Array.isArray(layoutPreference[0]?.mapped_json?.sorting?.sortby)
+      ) {
+        layoutPreference[0]?.mapped_json?.sorting?.sortby?.forEach(
+          ({ column, order }) => {
+            qb.addOrderBy(
+              `e.${column}`,
+              order?.toUpperCase() === 'DSC' ? 'DESC' : 'ASC',
+            );
+          },
+        );
       }
     }
-  
+
     qb.addOrderBy('e.created_date', 'DESC');
-  
+
     const page = dto.page && dto.page > 0 ? dto.page : 1;
     const size = dto.size && dto.size > 0 ? dto.size : 10;
     qb.skip((page - 1) * size).take(size);
-  
+
     const entity_list = await qb.getRawMany();
-  
+
     console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);
-  
+
     const dateAttributes = Object.entries(attributeMetaMap)
       .filter(([_, attr]) => attr.data_type === 'date')
       .map(([key]) => key);
-  
+
     const formatDate = (dateStr: string | null): string | null =>
       dateStr ? moment(dateStr).format('DD-MM-YYYY') : '';
-  
+
     const formatDatesInRow = (row: any): any => {
       const formattedRow = { ...row };
       for (const key of dateAttributes) {
-        if (formattedRow[key]) formattedRow[key] = formatDate(formattedRow[key]);
+        if (formattedRow[key])
+          formattedRow[key] = formatDate(formattedRow[key]);
       }
       return formattedRow;
     };
-  
+
     const formattedEntityList = entity_list.map(formatDatesInRow);
-  
+
     const resolvedEntityList = await Promise.all(
       formattedEntityList.map((row) =>
         this.resolverService.getResolvedData(loggedInUser, row, entity_type),
@@ -497,7 +523,7 @@ export class FilterService {
     const resolvedTabs = await Promise.all(
       filteredTabs.map(async (tab) => {
         const tabAttrKey = layout?.attribute || tabs?.columnName;
-  
+
         if (
           !tabAttrKey ||
           tab.tab_value?.toLowerCase() === 'all' ||
@@ -505,29 +531,30 @@ export class FilterService {
         ) {
           return tab;
         }
-  
+
         const resolvedVal = await this.resolverService.getResolvedValue(
           loggedInUser,
           tabAttrKey,
           tab.tab_value,
           entity_type,
         );
-  
+
         return { ...tab, tab_value: resolvedVal ?? tab.tab_value };
       }),
     );
-  
-  
+
     const countQb = this.dataSource
       .createQueryBuilder()
       .select('COUNT(*)', 'count')
       .from(tableName, 'e');
-    dataWhere.forEach((clause) => countQb.andWhere(clause.query, clause.params));
+    dataWhere.forEach((clause) =>
+      countQb.andWhere(clause.query, clause.params),
+    );
     const countResult = await countQb.getRawOne();
     const total = parseInt(countResult.count, 10);
-  
+
     console.log('📊 [FilterService] Returning final result with total:', total);
-  
+
     return {
       success: true,
       data: {
@@ -544,7 +571,7 @@ export class FilterService {
       },
     };
   }
-  
+
   private parseFilters(raw: any, isSingle = false): any[] {
     if (!raw) return [];
 

package/src/module/mapper/service/field-mapper.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable, Logger, LoggerService } from '@nestjs/common';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldMapperDto } from '../dto/field-mapper.dto';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
@@ -7,6 +7,7 @@ import { FieldLovsRepository } from '../repository/field-lovs.repository';
 import { DataSource } from 'typeorm';
 import { FilterService } from 'src/module/filter/service/filter.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { LoggingService } from 'src/utils/service/loggingUtil.service';
 
 @Injectable()
 export class FieldMapperService extends EntityServiceImpl {
@@ -15,6 +16,7 @@ export class FieldMapperService extends EntityServiceImpl {
     private readonly fieldLovsRepository: FieldLovsRepository,
     private readonly datasource: DataSource,
     private readonly filterService: FilterService,
+    @Inject() protected readonly loggingService: LoggingService,
   ) {
     super();
   }
@@ -67,7 +69,10 @@ export class FieldMapperService extends EntityServiceImpl {
 
   async getMapperFields(mapperId: number, mapper_entity_type: string) {
     let fieldMappers =
-      await this.fieldMapperRepository.findByMapperIdAndMapperEntityType(mapperId,mapper_entity_type);
+      await this.fieldMapperRepository.findByMapperIdAndMapperEntityType(
+        mapperId,
+        mapper_entity_type,
+      );
     const fieldMapperDtos = fieldMappers as unknown as FieldMapperDto[];
     for (const fieldMapper of fieldMapperDtos) {
       fieldMapper.field_lovs =
@@ -134,9 +139,16 @@ export class FieldMapperService extends EntityServiceImpl {
 
             const targetEntityIds = relations.map((r) => r.target_entity_id);
 
+            this.loggingService.log(
+              'package',
+              'fieldMapperService',
+              'targetEntityIds',
+              targetEntityIds,
+            );
+
             if (targetEntityIds.length > 0) {
               if (filterCode && filterCode !== 'default') {
-                inMemory[entityType][filterCode] =
+                let filterResponse =
                   await this.filterService.applyFilterWrapper({
                     entity_type: entityType,
                     savedFilterCode: filterCode,
@@ -152,6 +164,16 @@ export class FieldMapperService extends EntityServiceImpl {
                     loggedInUser: userData,
                     queryParams: {},
                   });
+
+                this.loggingService.log(
+                  'package',
+                  'fieldMapperService',
+                  'filterResponse',
+                  `${filterResponse}`,
+                );
+
+                inMemory[entityType][filterCode] =
+                  filterResponse?.data?.entity_list[0];
               } else {
                 const firstId = targetEntityIds[0];
                 inMemory[entityType][filterCode] =

package/src/module/meta/controller/entity.public.controller.ts

@@ -0,0 +1,75 @@
+import {
+  BadRequestException,
+  Controller,
+  Get,
+  Param,
+  Query,
+} from '@nestjs/common';
+import { WorkflowAutomationEngineService } from 'src/module/workflow-automation/service/workflow-automation-engine.service';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { EntityMasterService } from '../service/entity-master.service';
+import { EntityServiceImpl } from '../service/entity-service-impl.service';
+
+@Controller('entity/public')
+export class EntityPublicController {
+  constructor(
+    private entityService: EntityServiceImpl,
+    private reflectionHelper: ReflectionHelper,
+    private entityMasterService: EntityMasterService,
+    private readonly workflowAutomationEngineService: WorkflowAutomationEngineService,
+  ) {}
+
+  @Get('getById/:id')
+  async getPublicById(
+    @Param('id') id: number,
+    @Query() queryParams: Record<string, string>,
+  ) {
+    const {
+      entity_type: entityType,
+      loggedInUser: loggedInUserParam,
+      ...params
+    } = queryParams;
+
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
+
+    // Default user object (if organization_id or appcode is needed in service)
+    let loggedInUser: any = {};
+
+    if (typeof loggedInUserParam === 'string') {
+      try {
+        loggedInUser = JSON.parse(loggedInUserParam);
+      } catch (e) {
+        loggedInUser = {};
+      }
+    } else if (
+      typeof loggedInUserParam === 'object' &&
+      loggedInUserParam !== null
+    ) {
+      loggedInUser = loggedInUserParam;
+    } else {
+      loggedInUser = {};
+    }
+
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
+    const entityService =
+      await this.reflectionHelper.getBean<EntityServiceImpl>(
+        entityMaster.entity_service,
+      );
+
+    if (entityService) {
+      return await entityService.getEntityData(entityType, id, loggedInUser);
+    }
+  }
+}

package/src/module/meta/entity.module.ts

@@ -59,6 +59,7 @@ import { CommonService } from './service/common.service';
 import { EntityMasterRepository } from './repository/entity-master.repository';
 import { EntityMasterController } from './controller/entity-master.controller';
 import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
+import { EntityPublicController } from './controller/entity.public.controller';
 
 @Module({
   imports: [
@@ -78,7 +79,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
-    WorkflowAutomationModule
+    WorkflowAutomationModule,
   ],
   providers: [
     EntityMasterService,
@@ -138,7 +139,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     ResolverService,
     EntityDynamicService,
     'CommonService',
-    'EntityRelationService'
+    'EntityRelationService',
   ],
   controllers: [
     EntityController,
@@ -151,6 +152,7 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
+    EntityPublicController,
   ],
 })
 export class EntityModule {}