rez_core 2.2.255 → 2.2.256

package/package.json

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

package/src/module/listmaster/service/list-master.service.ts

@@ -22,6 +22,7 @@ export class ListMasterService {
     private readonly entityManager: EntityManager,
     @Inject(forwardRef(() => EntityServiceImpl))
     private readonly entityServiceImpl: EntityServiceImpl,
+    @Inject(forwardRef(() => EntityMasterService))
     private readonly entityMasterService: EntityMasterService,
     private readonly listMasterRepo: ListMasterRepository,
     private readonly listItemsRepo: ListMasterItemsRepository,

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

@@ -11,6 +11,7 @@ import { EntityTableService } from '../service/entity-table.service';
 import { Response } from 'express';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import { PopulateMetaService } from '../service/populate-meta.service';
+import { EntityMasterService } from '../service/entity-master.service';
 
 @Controller('meta')
 @UseGuards(JwtAuthGuard)
@@ -18,6 +19,7 @@ export class MetaController {
   constructor(
     private readonly entityTableService: EntityTableService,
     private readonly populateMetaService: PopulateMetaService,
+    private readonly entityMaster: EntityMasterService,
   ) {}
 
   @Post('get-table-data')
@@ -41,6 +43,24 @@ export class MetaController {
     });
   }
 
+  @Post('get-filter-data')
+  async getFilterData(
+    @Query('entity_type') entityType: string,
+    @Res() response: Response,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const entitydata = await this.entityMaster.getFilterMetaData(
+      entityType,
+      loggedInUser,
+    );
+    return response.status(HttpStatus.OK).json({
+      success: true,
+      data: entitydata,
+      message: 'Data fetch successfully!',
+    });
+  }
+
   @Post('populate')
   async populateMetaData(
     @Query('organization_id') organizationId: number,

package/src/module/meta/repository/entity-master.repository.ts

@@ -14,4 +14,16 @@ export class EntityMasterRepository {
   async getEntityById(id: number): Promise<EntityMaster | null> {
     return await this.entityMasterRepository.findOne({ where: { id } });
   }
+
+  async getEntityByMappedEntityType(
+    mappedEntityType: string,
+    organizationId: number,
+  ): Promise<EntityMaster | null> {
+    return await this.entityMasterRepository.findOne({
+      where: {
+        mapped_entity_type: mappedEntityType,
+        organization_id: organizationId,
+      },
+    });
+  }
 }

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

@@ -1,8 +1,10 @@
-import { Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { DataSource, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { EntityMaster } from '../entity/entity-master.entity';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
 
 @Injectable()
 export class EntityMasterService {
@@ -11,6 +13,10 @@ export class EntityMasterService {
     private entityMasterRepository: Repository<EntityMaster>,
 
     private entityMasterRepo: EntityMasterRepository,
+    private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+    private readonly savedFilterRepoService: SavedFilterRepositoryService,
   ) {}
 
   async getEntityById(id: number): Promise<EntityMaster | null> {
@@ -61,4 +67,94 @@ export class EntityMasterService {
       where: { mapped_entity_type: mappedEntityType },
     });
   }
+
+  async getFilterMetaData(entityType: string, loggedInUser: any) {
+    console.log(entityType, loggedInUser);
+
+    // Step 1: Get entity_master record by mapped_entity_type
+    const entityMaster = await this.dataSource.query(
+      `SELECT * 
+     FROM cr_entity_master 
+     WHERE mapped_entity_type = ? 
+       AND organization_id = ? 
+     LIMIT 1`,
+      [entityType, loggedInUser.organization_id],
+    );
+
+    if (!entityMaster || entityMaster.length === 0) {
+      throw new Error(
+        `Entity master with mapped_entity_type "${entityType}" not found.`,
+      );
+    }
+
+    const entityMasterData = entityMaster[0] as any; // cast as DTO if you have one
+
+    // Step 2: Get attribute_master (instead of entity_table_column)
+    const attributes = await this.dataSource.query(
+      `SELECT * 
+     FROM cr_attribute_master 
+     WHERE mapped_entity_type = ? 
+       AND organization_id = ? `,
+      [entityMasterData.mapped_entity_type, loggedInUser.organization_id],
+    );
+
+    // Step 3: Attach column_list from attribute_master
+    entityMasterData.column_list = attributes;
+
+    // Step 4: Keep existing operation_list logic
+    entityMasterData.operation_list = {
+      text: await this.listMasterService.getDropdownOptions(
+        'OPT',
+        {},
+        [],
+        loggedInUser,
+      ),
+      number: await this.listMasterService.getDropdownOptions(
+        'OPN',
+        {},
+        [],
+        loggedInUser,
+      ),
+      date: await this.listMasterService.getDropdownOptions(
+        'OPD',
+        {},
+        [],
+        loggedInUser,
+      ),
+      select: await this.listMasterService.getDropdownOptions(
+        'OPS',
+        {},
+        [],
+        loggedInUser,
+      ),
+      multiselect: await this.listMasterService.getDropdownOptions(
+        'OPM',
+        {},
+        [],
+        loggedInUser,
+      ),
+      year: await this.listMasterService.getDropdownOptions(
+        'OPY',
+        {},
+        [],
+        loggedInUser,
+      ),
+    };
+
+    // Step 5: Keep filters as is
+    entityMasterData.default_filter =
+      await this.savedFilterRepoService.getDefaultFilterByEntityType(
+        entityType,
+      );
+
+    if (loggedInUser.id) {
+      entityMasterData.saved_filter =
+        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+          loggedInUser.id,
+          entityType,
+        );
+    }
+
+    return entityMasterData;
+  }
 }

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

@@ -4,9 +4,7 @@ import { EntityTableColumnRepository } from '../repository/entity-table-column.r
 import { EntityTableDto } from '../dto/entity-table.dto';
 import { DISPLAY_LIST } from '../../../constant/global.constant';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class EntityTableService {