rez_core 7.1.28 → 7.1.30

package/src/app.module.ts

@@ -1,27 +1,26 @@
 import { Module } from '@nestjs/common';
 import { DatabaseModule } from './config/config.module';
 import { UtilsModule } from './utils/utils.module';
-import { EntityModule } from './module/entity/meta/entity.module';
+import { EntityModule } from './module/entity/meta/meta/entity.module';
 import { NotificationModule } from './module/notification/notification.module';
 import Properties from './resources/properties.module';
 import { LayoutModule } from './module/layout/layout.module';
 import { ListMasterModule } from './module/listmaster/listmaster.module';
-import { FilterModule } from './module/entity/filter/filter.module';
-import { LayoutPreferenceModule } from './module/entity/layout_preference/layout_preference.module';
+import { FilterModule } from './module/entity/data/filter/filter.module';
+import { LayoutPreferenceModule } from './module/entity/meta/layout_preference/layout_preference.module';
 import { WorkflowModule } from './module/workflow/workflow/workflow.module';
 import { IntegrationModule } from './module/integration/integration.module';
 import { ScheduleModule } from '@nestjs/schedule';
 import { AuthModule } from './module/auth/auth.module';
-import { MapperModule } from './module/entity/mapper/mapper.module';
+import { MapperModule } from './module/entity/meta/mapper/mapper.module';
 import { BullModule } from '@nestjs/bull';
 import { bullConfigFactory } from './config/bull.config';
 import { WorkflowScheduleModule } from './module/workflow/workflow-schedule/workflow-schedule.module';
 import { MicroserviceClientsModule } from './module/microservice-client/microservice-clients.module';
 import { WorkflowAutomationModule } from './module/workflow/workflow-automation/workflow-automation.module';
-import { LinkedAttributesModule } from './module/entity/linked_attributes/linked_attributes.module';
-import { EntityJSONModule } from './module/entity/entity_json/entity_json.module';
-import { ExportModule } from './module/entity/export/export.module';
-import { EAVModule } from './module/entity/eav/eav.module';
+import { LinkedAttributesModule } from './module/entity/meta/linked_attributes/linked_attributes.module';
+import { EntityJSONModule } from './module/entity/data/entity_json/entity_json.module';
+import { EAVModule } from './module/entity/data/eav/eav.module';
 
 @Module({
   imports: [
@@ -48,7 +47,6 @@ import { EAVModule } from './module/entity/eav/eav.module';
     MicroserviceClientsModule,
     LinkedAttributesModule,
     EntityJSONModule,
-    ExportModule,
     EntityModule,
     EAVModule,
   ],

package/src/core.module.ts

@@ -4,17 +4,16 @@ import { LayoutModule } from "./module/layout/layout.module";
 import { UtilsModule } from "./utils/utils.module";
 import { AuthModule } from "./module/auth/auth.module";
 import { NotificationModule } from "./module/notification/notification.module";
-import { EntityModule } from "./module/entity/meta/entity.module";
 import { ListMasterModule } from "./module/listmaster/listmaster.module";
-import { FilterModule } from "./module/entity/filter/filter.module";
-import { LayoutPreferenceModule } from "./module/entity/layout_preference/layout_preference.module";
 import { WorkflowModule } from "./module/workflow/workflow/workflow.module";
 import { WorkflowAutomationModule } from "./module/workflow/workflow-automation/workflow-automation.module";
 import { WorkflowScheduleModule } from "./module/workflow/workflow-schedule/workflow-schedule.module";
-import { MapperModule } from "./module/entity/mapper/mapper.module";
-import { LinkedAttributesModule } from "./module/entity/linked_attributes/linked_attributes.module";
-import { ExportModule } from "./module/entity/export/export.module";
-import { EAVModule } from "./module/entity/eav/eav.module";
+import { EntityModule } from "./module/entity/meta/meta/entity.module";
+import { FilterModule } from "./module/entity/data/filter/filter.module";
+import { LayoutPreferenceModule } from "./module/entity/meta/layout_preference/layout_preference.module";
+import { MapperModule } from "./module/entity/meta/mapper/mapper.module";
+import { LinkedAttributesModule } from "./module/entity/meta/linked_attributes/linked_attributes.module";
+import { EAVModule } from "./module/entity/data/eav/eav.module";
 
 @Global()
 @Module({})
@@ -63,7 +62,6 @@ export class CoreModule {
         WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
         MapperModule,
         LinkedAttributesModule,
-        ExportModule,
         EAVModule
       ];
 
@@ -81,7 +79,6 @@ export class CoreModule {
         WorkflowAutomationModule,
         WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
         LinkedAttributesModule,
-        ExportModule,
         EAVModule
       ];
     }

package/src/module/entity/{filter → data}/controller/entity-filter.controller.ts

@@ -7,11 +7,11 @@ import {
   Req,
   UseGuards,
 } from '@nestjs/common';
-import { EntityFilterService } from '../service/entity-filter.service';
+import { EntityFilterService } from '../filter/service/entity-filter.service';
 import { JwtAuthGuard } from '../../../auth/guards/jwt.guard';
-import { FilterCondition } from '../dto/filter-request.dto';
+import { FilterCondition } from '../filter/dto/filter-request.dto';
 
-@Controller('filter2')
+@Controller('filter')
 @UseGuards(JwtAuthGuard)
 export class EntityFilterController {
   constructor(private readonly filter2Service: EntityFilterService) {}

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

@@ -0,0 +1,219 @@
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Param,
+  Post,
+  Query,
+  Req,
+  Request,
+  Res,
+  UseGuards,
+} from '@nestjs/common';
+import { BaseEntity } from '../../meta/meta/entity/base-entity.entity';
+import { UserData } from 'src/module/auth/dto/user.dto';
+import { JwtAuthGuard } from '../../../auth/guards/jwt.guard';
+import { EntityDataService } from '../service/entity-data.service';
+import { MessagePattern, Payload } from '@nestjs/microservices';
+import * as fs from 'fs';
+import * as path from 'path';
+import { ExportService } from '../service/export.service';
+import { Response } from 'express';
+
+@UseGuards(JwtAuthGuard)
+@Controller('entity')
+export class EntityController {
+  constructor(
+    private readonly entityDataService: EntityDataService,
+    private readonly exportService: ExportService,
+  ) {
+  }
+
+  @Get('getById/:id')
+  async getById(
+    @Param('id') id: number,
+    @Req() req: Request & { user: any },
+    @Query('entity_type') entityType: string,
+    @Query('resolved') resolved = false,
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.entityDataService.getById(entityType, id, loggedInUser, resolved);
+  }
+
+  @Get('getByCode/:code')
+  async getDataByCode(
+    @Param('code') code: string,
+    @Req() req: Request & { user: any },
+    @Query('entity_type') entityType: string,
+  ) {
+    const loggedInUser = req.user.userData;
+
+    if (!entityType) {
+      throw new BadRequestException(
+        'Query parameter "entity_type" is required',
+      );
+    }
+
+    return await this.entityDataService.getDataByCode(
+      code,
+      loggedInUser,
+      entityType,
+    );
+  }
+
+  @Post('create')
+  @HttpCode(200)
+  async create(
+    @Body() entityData: BaseEntity,
+    @Query('entity_type') entityType: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.entityDataService.create(
+      entityData,
+      entityType,
+      loggedInUser,
+    );
+  }
+
+  @Post('update/:id')
+  @HttpCode(200)
+  async update(
+    @Param('id') id: number,
+    @Body() entityData: BaseEntity,
+    @Query('entity_type') entityType: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.entityDataService.update(
+      id,
+      entityData,
+      entityType,
+      loggedInUser as UserData,
+    );
+  }
+
+  @Post('delete/:id')
+  @HttpCode(200)
+  async delete(
+    @Param('id') id: number,
+    @Query('entity_type') entityType: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+
+    return await this.entityDataService.delete(id, entityType, loggedInUser);
+  }
+
+  @MessagePattern('getEntityDropdown')
+  async getEntityDropdownMS(
+    @Payload()
+    data: {
+      entityType: string,
+      status: 'ALL' | 'INACTIVE' | 'ACTIVE',
+      values: any[],
+      onlyValues: boolean,
+      loggedInUser: UserData,
+    },
+  ) {
+    const { entityType, status, loggedInUser, values, onlyValues } = data;
+    return await this.entityDataService.fetchFromEntity(entityType, status, values, onlyValues, loggedInUser);
+  }
+
+  @Post('getDropdownData')
+  @UseGuards(JwtAuthGuard)
+  @HttpCode(HttpStatus.OK)
+  async getDropdownData(
+    @Query('entity_type') entity_type: string,
+    @Query('attribute_key') attribute_key: string,
+    @Query('status') status: 'ALL' | 'INACTIVE' | 'ACTIVE' = 'ALL',
+    @Request() req: any,
+  ) {
+    const loggedInUser = req.user.userData;
+    return await this.entityDataService.getDropDownData(
+      entity_type,
+      attribute_key,
+      status,
+      [],
+      false,
+      loggedInUser,
+    );
+  }
+
+  @HttpCode(HttpStatus.OK)
+  @UseGuards(JwtAuthGuard)
+  @Post('download-report')
+  async downloadExcel(
+    @Body() body: any,
+    @Request() 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 {
+        entity_type,
+        quickFilter,
+        savedFilterCode,
+        attributeFilter,
+        tabs,
+        sortby,
+        view,
+      } = body;
+
+      const { ...otherQueryParams } = queryParams;
+
+      const filePath = await this.exportService.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,
+          view,
+        },
+      );
+
+      if (!filePath || !fs.existsSync(filePath)) {
+        return res.status(404).json({ message: 'File not found' });
+      }
+
+      res.setHeader(
+        'Content-Disposition',
+        `attachment; filename=${path.basename(filePath)}`,
+      );
+      res.setHeader(
+        'Content-Type',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      );
+
+      const fileStream = fs.createReadStream(filePath);
+      fileStream.pipe(res);
+
+      // Optional: Delete file after sending response
+      fileStream.on('end', () => {
+        fs.unlinkSync(filePath);
+      });
+    } catch (error) {
+      console.error('Error downloading Excel file:', error);
+      res.status(500).json({ message: 'Internal server error' });
+    }
+  }
+}

package/src/module/entity/{eav → data/eav}/service/eav-factory.service.ts

@@ -9,7 +9,7 @@ import { EAVJsonService } from './eav-json.service';
 import { EAVDateService } from './eav-date.service';
 import { EAVTimeService } from './eav-time.service';
 import { EAVTimestampService } from './eav-timestamp.service';
-import { EavDataType, EavPrimaryDataType } from '../../../../constant/db-data-type.constant';
+import { EavDataType, EavPrimaryDataType } from '../../../../../constant/db-data-type.constant';
 
 /**
  * Factory service to resolve the appropriate EAV service based on data type

package/src/module/entity/{entity_json → data/entity_json}/entity_json.module.ts

@@ -1,8 +1,7 @@
 import { Module, forwardRef } from '@nestjs/common';
-import { EntityModule } from '../meta/entity.module';
+import { EntityModule } from '../../meta/meta/entity.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { EntityJSONService } from './service/entity_json.service';
-import { EntityJSONController } from './controller/entity_json.controller';
 import { FilterModule } from '../filter/filter.module';
 import { UtilsModule } from 'src/utils/utils.module';
 import { EntityJson } from './entity/entityJson.entity';
@@ -15,7 +14,7 @@ import { EntityJSONRepository } from './service/entityJson.repository';
     forwardRef(() => FilterModule),
     UtilsModule,
   ],
-  controllers: [EntityJSONController],
+  controllers: [],
   providers: [EntityJSONService, EntityJSONRepository],
   exports: [EntityJSONService],
 })

package/src/module/entity/{entity_json → data/entity_json}/service/entity_json.service.ts

@@ -1,11 +1,11 @@
 import { BadRequestException, Inject, Injectable, forwardRef } from '@nestjs/common';
-import { AttributeMaster } from 'src/module/entity/meta/entity/attribute-master.entity';
+import { AttributeMaster } from 'src/module/entity/meta/meta/entity/attribute-master.entity';
 import { EntityJSONRepository } from './entityJson.repository';
-import { AttributeMasterService } from 'src/module/entity/meta/service/attribute-master.service';
-import { EntityMasterService } from '../../meta/service/entity-master.service';
-import { EntityDynamicService } from '../../meta/service/entity-dynamic.service';
+import { AttributeMasterService } from 'src/module/entity/meta/meta/service/attribute-master.service';
+import { EntityMasterService } from '../../../meta/meta/service/entity-master.service';
+import { EntityDynamicService } from '../../service/entity-dynamic.service';
 
-import { EntityRelationService } from '../../meta/service/entity-relation.service';
+import { EntityRelationService } from '../../../meta/meta/service/entity-relation.service';
 import { EntityJson } from '../entity/entityJson.entity';
 
 @Injectable()

package/src/module/entity/{filter → data/filter}/entity/saved-filter-detail.entity.ts

@@ -1,5 +1,5 @@
 import { ENTITYTYPE_SAVEDFILTERDETAIL } from 'src/constant/global.constant';
-import { BaseEntity } from 'src/module/entity/meta/entity/base-entity.entity';
+import { BaseEntity } from 'src/module/entity/meta/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_saved_filter_detail' })

package/src/module/entity/{filter → data/filter}/entity/saved-filter-master.entity.ts

@@ -1,4 +1,4 @@
-import { BaseEntity } from 'src/module/entity/meta/entity/base-entity.entity';
+import { BaseEntity } from 'src/module/entity/meta/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_saved_filter_master' })

package/src/module/entity/{filter → data/filter}/filter.module.ts

@@ -4,11 +4,11 @@ import { SavedFilterService } from './service/saved-filter.service';
 import { SavedFilterDetail } from './entity/saved-filter-detail.entity';
 import { SavedFilterMaster } from './entity/saved-filter-master.entity';
 import { SavedFilterRepositoryService } from './repository/saved-filter.repository';
-import { EntityModule } from '../meta/entity.module';
+import { EntityModule } from '../../meta/meta/entity.module';
 import { SavedFilterDetailRepository } from './repository/saved.filter-detail.repository';
 import { EntityFilterService } from './service/entity-filter.service';
-import { EntityFilterController } from './controller/entity-filter.controller';
-import { ListMasterModule } from '../../listmaster/listmaster.module';
+import { EntityFilterController } from '../controller/entity-filter.controller';
+import { ListMasterModule } from '../../../listmaster/listmaster.module';
 
 @Module({
   imports: [

package/src/module/entity/{filter → data/filter}/repository/saved-filter.repository.ts

@@ -4,7 +4,7 @@ import { Not, Repository } from 'typeorm';
 import { SavedFilterMaster } from '../entity/saved-filter-master.entity';
 import { SavedFilterDetail } from '../entity/saved-filter-detail.entity';
 import { UserData } from 'src/module/auth/dto/user.dto';
-import { ReflectionHelper } from '../../../../utils/service/reflection-helper.service';
+import { ReflectionHelper } from '../../../../../utils/service/reflection-helper.service';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
 

package/src/module/entity/{filter → data/filter}/service/entity-filter.service.ts

@@ -1,9 +1,9 @@
-import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, forwardRef, Inject, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { EntityManager } from 'typeorm';
-import { AttributeMasterService } from 'src/module/entity/meta/service/attribute-master.service';
-import { EntityMasterService } from 'src/module/entity/meta/service/entity-master.service';
-import { EntityRelationService } from 'src/module/entity/meta/service/entity-relation.service';
+import { AttributeMasterService } from 'src/module/entity/meta/meta/service/attribute-master.service';
+import { EntityMasterService } from 'src/module/entity/meta/meta/service/entity-master.service';
+import { EntityRelationService } from 'src/module/entity/meta/meta/service/entity-relation.service';
 import { FilterCondition } from '../dto/filter-request.dto';
 import { SavedFilterService } from './saved-filter.service';
 import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
@@ -46,8 +46,8 @@ import {
   hasEmptySubEntityResults,
   toBatchRelationRequests,
 } from './helpers/sub-entity-filter.helper';
-import { ListMasterService } from '../../../listmaster/service/list-master.service';
-import { EntityDataService } from '../../meta/service/entity-data.service';
+import { ListMasterService } from '../../../../listmaster/service/list-master.service';
+import { EntityDataService } from '../../service/entity-data.service';
 
 /**
  * Filter2.0 Service - Clean, Modular Filter Implementation
@@ -79,8 +79,7 @@ export class EntityFilterService {
     private readonly entityRelationService: EntityRelationService,
     private readonly configService: ConfigService,
     private readonly reflectionHelper: ReflectionHelper,
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
+    @Inject(forwardRef(() => EntityDataService))
     private readonly entityDataService:EntityDataService
   ) {
     this.schema = this.configService.get('DB_SCHEMA') || 'public';
@@ -484,7 +483,7 @@ export class EntityFilterService {
     flatJson: boolean = false,
     jsonColumn: string = 'entity_json',
     disableDefaultFilter: boolean = false,
-    activeTab?: { column_name: string; value: any },
+    tabs?: { columnName: string; value: any, name:string, sortBy:string },
   ): Promise<FilterDataResult> {
     console.log('🔷 [Filter2.GetFilterDataForListing] Starting with params:', {
       entityType,
@@ -495,17 +494,17 @@ export class EntityFilterService {
       pagination,
       flatJson,
       jsonColumn,
-      activeTab,
+      tabs,
     });
 
     const { level_type, level_id, id: user_id } = userData || {};
 
     // Add active tab filter to quickFilter if provided
-    if (activeTab && activeTab.column_name && activeTab.value !== undefined && activeTab.value !== null) {
+    if (tabs && tabs.columnName && tabs.value !== undefined && tabs.value !== null) {
       const tabFilter: FilterCondition = {
-        filter_attribute: activeTab.column_name,
-        filter_operator: 'in',
-        filter_value: Array.isArray(activeTab.value) ? activeTab.value : [activeTab.value],
+        filter_attribute: tabs.columnName,
+        filter_operator: 'equal',
+        filter_value: Array.isArray(tabs.value) ? tabs.value : [tabs.value],
         filter_entity_type: entityType,
       };
       quickFilter = [...quickFilter, tabFilter];

package/src/module/entity/{filter → data/filter}/service/saved-filter.service.ts

@@ -1,11 +1,10 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/entity/meta/service/entity-service-impl.service';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { EntityServiceImpl } from 'src/module/entity/data/service/entity-service-impl.service';
+import { BaseEntity } from '../../../meta/meta/entity/base-entity.entity';
 import { UserData } from 'src/module/auth/dto/user.dto';
 import { SavedFilterMaster } from '../entity/saved-filter-master.entity';
 import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
 import { SavedFilterRepositoryService } from '../repository/saved-filter.repository';
-import axios from 'axios';
 
 @Injectable()
 export class SavedFilterService extends EntityServiceImpl {
@@ -155,14 +154,6 @@ export class SavedFilterService extends EntityServiceImpl {
     return this.savedFilterRepo.getDetailsByCode(code);
   }
 
-  async getFilterById(id: number) {
-    return await this.savedFilterRepo.getFilterById(id);
-  }
-
-  async getSavedFilterByCode(code: string, loggedInUser: UserData) {
-    return await this.savedFilterRepo.getSavedFilterByCode(code, loggedInUser);
-  }
-
   async getDefaultFilterByEntityType(
     entityType: string,
   ): Promise<{ label: string; value: number; code: string } | null> {