rez_core 5.0.99 → 5.0.101

package/package.json

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

package/src/module/entity_json/service/entity_json.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@nestjs/common';
-import { FilterService } from 'src/module/filter/service/filter.service';
 import { LinkedAttributes } from 'src/module/linked_attributes/entity/linked_attribute.entity';
 import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
 import { EntityRelation } from 'src/module/meta/entity/entity-relation.entity';
@@ -12,9 +11,8 @@ import { EntityJSONRepository } from './entityJson.repository';
 export class EntityJSONService extends EntityServiceImpl {
   constructor(
     private readonly dataSource: DataSource,
-    private readonly filterService: FilterService,
     private readonly loggerService: LoggingService,
-    private readonly EntityJSONRepository:EntityJSONRepository
+    private readonly EntityJSONRepository: EntityJSONRepository,
   ) {
     super();
   }
@@ -53,12 +51,12 @@ export class EntityJSONService extends EntityServiceImpl {
 
     const relatedAttributes = relatedTypesList.length
       ? await this.dataSource
-          .getRepository(AttributeMaster)
-          .createQueryBuilder('attr')
-          .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.mapped_entity_type', 'attr.attribute_key'])
-          .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
-          .andWhere('attr.organization_id = :orgId', { orgId })
-          .getMany()
+        .getRepository(AttributeMaster)
+        .createQueryBuilder('attr')
+        .select(['attr.id', 'attr.name', 'attr.flat_json_key', 'attr.mapped_entity_type', 'attr.attribute_key'])
+        .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
+        .andWhere('attr.organization_id = :orgId', { orgId })
+        .getMany()
       : [];
 
     await this.loggerService.log('debug', 'EntityJSONService', 'getAttributeForFlatJSON', `Loaded ${relatedAttributes.length} related attributes`);
@@ -86,9 +84,15 @@ export class EntityJSONService extends EntityServiceImpl {
 
     if (flag === 'flat_json' || flag === 'all') {
       const result: Record<string, null> = {};
-      mainAttributes.forEach(attr => { if (attr.flat_json_key) result[attr.flat_json_key] = null; });
-      relatedAttributes.forEach(attr => { if (attr.flat_json_key) result[attr.flat_json_key] = null; });
-      linkedAttributes.forEach(link => { if (link.target_attribute_key) result[link.target_attribute_key] = null; });
+      mainAttributes.forEach(attr => {
+        if (attr.flat_json_key) result[attr.flat_json_key] = null;
+      });
+      relatedAttributes.forEach(attr => {
+        if (attr.flat_json_key) result[attr.flat_json_key] = null;
+      });
+      linkedAttributes.forEach(link => {
+        if (link.target_attribute_key) result[link.target_attribute_key] = null;
+      });
 
       if (flag === 'all') {
         return { flat_json: result, attributes: { mainAttributes, relatedAttributes, linkedAttributes } };
@@ -128,7 +132,9 @@ export class EntityJSONService extends EntityServiceImpl {
 
     const attrMap: Record<string, string> = {};
     const allAttrs = [...safeAttributes.mainAttributes, ...safeAttributes.relatedAttributes];
-    allAttrs.forEach(attr => { if (attr.attribute_key) attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key; });
+    allAttrs.forEach(attr => {
+      if (attr.attribute_key) attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
+    });
 
     const mainData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
     this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
@@ -177,8 +183,8 @@ export class EntityJSONService extends EntityServiceImpl {
       entity_id: entityId,
       json_data: flatJson,
       created_by: loggedInUser.id,
-    }
-    
+    };
+
     await this.EntityJSONRepository.create(JsonData);
 
     return flatJson;
@@ -205,7 +211,7 @@ export class EntityJSONService extends EntityServiceImpl {
     mappingValue: any,
     targetAttribute: string,
     loggedInUser,
-    entity_id
+    entity_id,
   ) {
     if (!savedFilterCode && (mappingValue === null || mappingValue === undefined)) return null;
 

package/src/module/filter/dto/filter-request.dto.ts

@@ -28,8 +28,8 @@ export interface FilterRequestDto {
   attributeFilter?: FilterCondition[];
   sortby?: SortConfig[];
   tabs?: TabsConfig;
-  page?: number;
-  size?: number;
+  page?: number|null;
+  size?: number|null;
   loggedInUser: UserData;
   queryParams?: Record<string, string>;
   customLevelType?: string;

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

@@ -278,7 +278,7 @@ export class FilterService {
       ),
     ];
 
-    // 🧱 Build where clauses
+    // 🧱 Build where clausesx
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // Handle TEMPLATE entity special condition
@@ -485,10 +485,11 @@ export class FilterService {
 
     // Apply sorting
     qb = await this.sortTabsByShowList(qb, sortby, layoutPreference, tabs);
-
     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);
+    if (dto.page && dto.size) {
+      qb.skip((page - 1) * size).take(size);
+    }
 
     let query = await qb.getQuery();
 

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

@@ -4,7 +4,6 @@ import { FieldMapperDto } from '../dto/field-mapper.dto';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { UserData } from '../../user/entity/user.entity';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
-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';
 
@@ -13,7 +12,6 @@ export class FieldMapperService extends EntityServiceImpl {
   constructor(
     private readonly fieldMapperRepository: FieldMapperRepository,
     private readonly fieldLovsRepository: FieldLovsRepository,
-    private readonly filterService: FilterService,
     @Inject() protected readonly loggingService: LoggingService,
   ) {
     super();

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

@@ -5,29 +5,28 @@ import {
   Get,
   HttpCode,
   HttpStatus,
+  InternalServerErrorException,
+  NotFoundException,
   Param,
   Post,
   Query,
-  Res,
   Req,
-  UseGuards,
-  Inject,
   Request,
-  InternalServerErrorException,
-  NotFoundException,
+  Res,
+  UseGuards,
 } from '@nestjs/common';
 import { EntityServiceImpl } from '../service/entity-service-impl.service';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { Response } from 'express';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { EntityMasterService } from '../service/entity-master.service';
 import { BaseEntity } from '../entity/base-entity.entity';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import * as fs from 'fs';
 import * as path from 'path';
-import { UserService } from '../../user/service/user.service';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 import { UserData } from '../../user/entity/user.entity';
-import { WorkflowAutomationEngineService } from 'src/module/workflow-automation/service/workflow-automation-engine.service';
+import {
+  WorkflowAutomationEngineService,
+} from 'src/module/workflow-automation/service/workflow-automation-engine.service';
 
 @UseGuards(JwtAuthGuard)
 @Controller('entity')
@@ -37,7 +36,8 @@ export class EntityController {
     private reflectionHelper: ReflectionHelper,
     private entityMasterService: EntityMasterService,
     private readonly workflowAutomationEngineService: WorkflowAutomationEngineService,
-  ) {}
+  ) {
+  }
 
   @Get('getById/:id')
   // @Roles('USR', 'VIEW')
@@ -231,12 +231,12 @@ export class EntityController {
     // 2️⃣ Pre-evaluate criteria
     const workflows = await this.workflowAutomationEngineService[
       'wfService'
-    ].getActiveRules(entityType, 'UPDATE', loggedInUser);
+      ].getActiveRules(entityType, 'UPDATE', loggedInUser);
     const preUpdateStates: Record<number, boolean> = {};
     for (const wf of workflows) {
       preUpdateStates[wf.id] = await this.workflowAutomationEngineService[
         'filterEvaluator'
-      ].evaluateCriteria(
+        ].evaluateCriteria(
         entityType,
         wf.condition_filter_code,
         existingEntity.id,
@@ -341,27 +341,45 @@ export class EntityController {
   }
 
   @HttpCode(HttpStatus.OK)
-  @Post('download-excel/:entity_type')
-  @HttpCode(HttpStatus.OK)
+  @Post('download-report')
   async downloadExcel(
-    @Param('entity_type') entityType: string,
-    @Query('list_entity_type') listEntityType: string,
-    @Query('display_type') displayType: string,
-    @Query('sample_export') sampleExport: boolean,
-    @Query() filterCriteria: Record<string, any>,
-    @Res() res: Response, // Express Response for file handling
+    @Body() body: any,
     @Req() req: Request & { user: any },
+    @Query() queryParams: Record<string, string>,
+    @Res() res: Response,
+    @Query('level_type') levelType?: string,
+    @Query('level_id') levelId?: number,
+    @Query('appcode') appCode?: string,
   ) {
     try {
       const loggedInUser = req.user.userData;
 
-      const filePath = await this.entityService.generateExcelReport(
-        entityType,
-        filterCriteria,
-        listEntityType,
-        displayType,
-        sampleExport,
-        loggedInUser,
+      const {
+        entity_type,
+        quickFilter,
+        savedFilterCode,
+        attributeFilter,
+        tabs,
+        sortby,
+      } = body;
+
+      const { ...otherQueryParams } = queryParams;
+
+      const filePath = await this.entityService.generateExcelReport({
+          entity_type,
+          quickFilter,
+          savedFilterCode,
+          attributeFilter,
+          tabs,
+          sortby,
+          page: null,
+          size: null,
+          loggedInUser,
+          queryParams: otherQueryParams, // only remaining query params
+          customLevelType: levelType,
+          customLevelId: levelId,
+          customAppCode: appCode,
+        }
       );
 
       if (!filePath || !fs.existsSync(filePath)) {

package/src/module/meta/service/entity-service-impl.service.ts

@@ -28,6 +28,8 @@ import {
 import { EntityValidationService } from './entity-validation.service';
 import { AttributeMasterService } from './attribute-master.service';
 import { ResolverService } from './resolver.service';
+import { FilterRequestDto } from '../../filter/dto/filter-request.dto';
+import { FilterService } from '../../filter/service/filter.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
@@ -43,6 +45,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   protected readonly attributeMasterService: AttributeMasterService;
   @Inject(forwardRef(() => ResolverService))
   protected readonly resolverService: ResolverService;
+  protected readonly filterService: FilterService;
 
   async createEntity(
     entityData: BaseEntity,
@@ -352,24 +355,14 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   }
 
   async generateExcelReport(
-    entityType: string,
-    filterCriteria: Record<string, any>,
-    listEntityType: string,
-    displayType: string,
-    sampleExport: boolean,
-    loggedInUser: UserData,
+    dto: FilterRequestDto
   ): Promise<string | null> {
     let fileName: string;
     try {
       const excelData = new ExcelData();
       await this.populateExcelData(
         excelData,
-        entityType,
-        filterCriteria,
-        listEntityType,
-        displayType,
-        sampleExport,
-        loggedInUser,
+        dto
       );
 
       const modifiedDate = new Date().toISOString().replace(/[-T:.Z]/g, '');
@@ -388,52 +381,36 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
 
   private async populateExcelData(
     excelData: ExcelData,
-    entityType: string,
-    filterCriteria: Record<string, any>,
-    listEntityType: string,
-    displayType: string,
-    sampleExport: boolean,
-    loggedInUser: UserData,
+    dto: FilterRequestDto
   ) {
-    const entityTable =
-      await this.entityTableService.findByEntityTypeAndListTypeAndDisplayType(
-        entityType,
-        listEntityType,
-        displayType,
-        loggedInUser.organization_id,
+
+    const entityMeta = await this.entityMasterService.getEntityData(
+      dto.entity_type,
+      dto.loggedInUser,
+    );
+
+    const attributes =
+      await this.attributeMasterService.findAttributesByMappedEntityType(
+        dto.entity_type,
+        dto.loggedInUser,
       );
+
+    let filterData = await this.filterService.applyFilterWrapper(dto);
+    let entityList = filterData.data.entity_list;
+
     const sheet: ExcelsheetData = {
-      sheetName: entityTable?.data_source || 'sheet',
+      sheetName: entityMeta?.name || 'sheet',
       headers: [],
       rowList: [],
     };
 
-    if (entityTable) {
-      const entityTableColumnList =
-        await this.entityTableColumnService.findByParentIdAndParentType(
-          entityTable.id,
-          entityTable.entity_type,
-          loggedInUser.organization_id,
-        );
-
-      sheet.headers = entityTableColumnList.map((col) => col.name);
-      const attributeList = entityTableColumnList.map(
+    if (attributes) {
+      sheet.headers = attributes.map((col) => col.name);
+      const attributeList = attributes.map(
         (col) => col.attribute_key,
       );
 
-      let filteredList: any[] = [];
-      if (!sampleExport) {
-        filteredList = await this.entityListService.getFilteredList(
-          entityTable,
-          filterCriteria,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-        );
-      }
-
-      sheet.rowList = filteredList.map((item) =>
+      sheet.rowList = entityList.map((item) =>
         attributeList.map((attr) =>
           item[attr] !== undefined ? item[attr] : null,
         ),

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

@@ -2,6 +2,7 @@ import { UserData } from '../../user/entity/user.entity';
 import { BaseEntity } from '../entity/base-entity.entity';
 import { EntityListData } from '../dto/entity-list-data.dto';
 import { EntityManager } from 'typeorm';
+import { FilterRequestDto } from '../../filter/dto/filter-request.dto';
 
 export interface EntityService<T extends BaseEntity> {
   createEntity(
@@ -57,11 +58,7 @@ export interface EntityService<T extends BaseEntity> {
   ): Promise<EntityListData>;
 
   generateExcelReport(
-    entityType: string,
-    filterCriteria: Record<string, any>,
-    listEntityType: string,
-    displayType: string,
-    sampleExport: boolean,
+    dto: FilterRequestDto,
     loggedInUser: UserData,
   ): Promise<string | null>;
 }

package/src/module/workflow/repository/action.repository.ts

@@ -9,9 +9,9 @@ export class ActionRepository {
 
   async getReasonCode(loggedInUser: UserData): Promise<any> {
     const { organization_id } = loggedInUser;
-    const listMasterItemsRepo =
-      this.reflectionHelper.getRepoService('ListMasterItems');
-    const result = await listMasterItemsRepo.find({
+    const listMasterRepo =
+      this.reflectionHelper.getRepoService('ListMasterData');
+    const result = await listMasterRepo.find({
       where: {
         organization_id,
         source: 'master',