rez_core 1.0.86 → 1.0.89

package/src/module/listmaster/listmaster.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ListMasterData } from './entity/list-master.entity';
 import { ListMasterItems } from './entity/list-master-items.entity';
@@ -11,8 +11,9 @@ import { ThirdPartyModule } from '../third-party-module/third-party.module';
 import { HttpModule } from '@nestjs/axios';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([ListMasterData, ListMasterItems]),EntityModule, ThirdPartyModule, HttpModule],
+  imports: [TypeOrmModule.forFeature([ListMasterData, ListMasterItems]),forwardRef(() => EntityModule), ThirdPartyModule, HttpModule],
   providers: [ListMasterRepository, ListMasterItemsRepository, ListMasterService],
-  controllers: [ListMasterController]
+  controllers: [ListMasterController],
+  exports:[ListMasterService]
 })
 export class ListMasterModule {}

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

@@ -10,17 +10,18 @@ import { ApiRegistryService } from '../../third-party-module/service/api-registr
 import { firstValueFrom } from 'rxjs';
 import { HttpService } from '@nestjs/axios';
 import { EntityManager } from 'typeorm';
+import { EntityMasterService } from 'src/module/meta/service/entity-master.service';
 
 @Injectable()
-export class ListMasterService extends EntityServiceImpl {
+export class ListMasterService  {
   constructor(
     private readonly entityManager: EntityManager,
+    private readonly entityMasterService: EntityMasterService,
     private readonly listMasterRepo: ListMasterRepository,
     private readonly listItemsRepo: ListMasterItemsRepository,
     private readonly apiRegistryService: ApiRegistryService,
     private readonly httpService: HttpService,
   ) {
-    super();
   }
 
   async getDropdownOptions(type: string, params: Record<string, string>) {

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

@@ -1,4 +1,4 @@
-import { Controller, HttpStatus, Post, Query, Res, UseGuards } from '@nestjs/common';
+import { Controller, HttpStatus, Post, Query, Req, Res, UseGuards } from '@nestjs/common';
 import { EntityTableService } from '../service/entity-table.service';
 import { Response } from 'express';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
@@ -11,8 +11,11 @@ export class MetaController {
   @Post('get-table-data')
   async getTableMetaData(@Query('entity_type') entityType: string,
                          @Query('list_type') listType: string,
-                         @Res() response: Response) {
-    let entityTableDto = await this.entityTableService.getTableMetaDataForListing(entityType, listType);
+                         @Res() response: Response,
+                        @Req() req: Request & { user: any }) {
+                          const userId = req.user.userId;
+                          console.log(userId)
+    let entityTableDto = await this.entityTableService.getTableMetaDataForListing(entityType, listType,userId);
     return response.status(HttpStatus.OK).json({
       success: true,
       data: entityTableDto,

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

@@ -3,4 +3,8 @@ import { EntityTableColumn } from '../entity/entity-table-column.entity';
 
 export class EntityTableDto extends EntityTable{
   column_list: EntityTableColumn[];
+  operation_list:{};
+  default_filter:{} | null;
+  saved_filter:{ label: string; value: number }[]
+  | null;
 }

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

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { EntityMasterService } from './service/entity-master.service';
 import { EntityServiceImpl } from './service/entity-service-impl.service';
 import { EntityController } from './controller/entity.controller';
@@ -36,6 +36,8 @@ import { ViewMasterController } from './controller/view-master.controller';
 import { ViewMaterRespository } from './repository/view-master.repository';
 import { MetaController } from './controller/meta.controller';
 import { EntityValidationService } from './service/entity-validation.service';
+import { ListMasterModule } from '../listmaster/listmaster.module';
+import { FilterModule } from '../filter/filter.module';
 
 @Module({
   imports: [
@@ -52,8 +54,9 @@ import { EntityValidationService } from './service/entity-validation.service';
       SectionMaster,
       FieldGroup,
     ]),
-    UtilsModule,
-  ],
+    forwardRef(() => ListMasterModule),
+    forwardRef(() => FilterModule),
+    UtilsModule  ],
   providers: [
     EntityMasterService,
     EntityServiceImpl,
@@ -80,14 +83,21 @@ import { EntityValidationService } from './service/entity-validation.service';
     EntityServiceImpl,
     PreferenceService,
     EntityListService,
-    EntityTableService,
     EntityValidationService,
+    EntityTableService,
     EntityTableColumnService,
     MediaDataService,
     SectionMasterService,
     FieldGroupService,
     'ViewMasterService',
+    AttributeMasterService,
+  ],
+  controllers: [
+    EntityController,
+    MasterController,
+    MediaController,
+    ViewMasterController,
+    MetaController,
   ],
-  controllers: [EntityController, MasterController, MediaController, ViewMasterController, MetaController],
 })
 export class EntityModule {}

package/src/module/meta/repository/entity-table-column.repository.ts

@@ -10,23 +10,27 @@ export class EntityTableColumnRepository {
     private entityTableColumnRepository: Repository<EntityTableColumn>,
   ) {}
 
-  async findByParentIdAndParentType(parentId: number, parentType: string, nonVisible?) {
-    if (nonVisible) {
+  async findByParentIdAndParentType(
+    parentId: number,
+    parentType: string,
+    isVisible?: boolean,
+  ) {
+    if (isVisible) {
       return await this.entityTableColumnRepository.find({
         where: {
           parent_id: parentId,
           parent_type: parentType,
         },
-        order: { col_position: 'ASC' }
+        order: { col_position: 'ASC' },
       });
     }
     return await this.entityTableColumnRepository.find({
       where: {
         parent_id: parentId,
         parent_type: parentType,
-        visible: "1",
+        visible: '1',
       },
-      order: { col_position: 'ASC' }
+      order: { col_position: 'ASC' },
     });
   }
 }

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

@@ -1,8 +1,7 @@
-import { Injectable } from "@nestjs/common";
-import { InjectRepository } from "@nestjs/typeorm";
-import { In } from "typeorm";
-import { AttributeMasterRepository } from "../repository/attribute-master.repository";
-
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { In } from 'typeorm';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 
 @Injectable()
 export class AttributeMasterService {
@@ -10,8 +9,9 @@ export class AttributeMasterService {
     private readonly attributeMasterRepository: AttributeMasterRepository,
   ) {}
 
-  async findAttributesByMappedEntityType(entity_type){
-    return await this.attributeMasterRepository.findAttributesByMappedEntityType(entity_type);
+  async findAttributesByMappedEntityType(entity_type) {
+    return await this.attributeMasterRepository.findAttributesByMappedEntityType(
+      entity_type,
+    );
   }
-
-}
+}

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

@@ -21,11 +21,16 @@ export class EntityTableColumnService {
     return attributeJson;
   }
 
-  async findByParentIdAndParentType(parentId: number, parentType: string) {
+  async findByParentIdAndParentType(
+    parentId: number,
+    parentType: string,
+    isVisible?: boolean,
+  ) {
     let entityTableColumns =
       await this.entityTableColumnRepository.findByParentIdAndParentType(
         parentId,
         parentType,
+        isVisible,
       );
     return entityTableColumns;
   }

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

@@ -1,15 +1,23 @@
-import { Injectable } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { EntityTableRepository } from '../repository/entity-table.repository';
 import { EntityTableColumnRepository } from '../repository/entity-table-column.repository';
 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';
 
 @Injectable()
 export class EntityTableService {
   constructor(
     private entityTableRepository: EntityTableRepository,
     private readonly entityTableColumnRepository: EntityTableColumnRepository,
-  ) {}
+    @Inject(forwardRef(() => ListMasterService)) 
+  private readonly listMasterService: ListMasterService,
+  
+  private readonly savedFilterRepoService: SavedFilterRepositoryService,
+  ) {
+  }
 
   async findByEntityTypeAndListType(entityType: string, listType: string) {
     return await this.entityTableRepository.findByEntityTypeAndListType(
@@ -30,14 +38,15 @@ export class EntityTableService {
     );
   }
 
-  async getTableMetaDataForListing(entityType: string, listType: string) {
-    return await this.getTableMetaData(entityType, listType, DISPLAY_LIST);
+  async getTableMetaDataForListing(entityType: string, listType: string,userId?: number) {
+    return await this.getTableMetaData(entityType, listType, DISPLAY_LIST,userId);
   }
 
   async getTableMetaData(
     entityType: string,
     listType: string,
     displayType: string,
+    userId?: number
   ) {
     let entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
@@ -52,7 +61,18 @@ export class EntityTableService {
           entityTable.id,
           entityTable.entity_type,
         );
+        entityTableDto.operation_list = {
+          "text": await this.listMasterService.getDropdownOptions("OPT",{})
+          // Add any other operations you want to include
+        };
+        entityTableDto.default_filter= await this.savedFilterRepoService.getDefaultFilterByEntityType(entityTable.list_type);  
+        if(userId){
+        entityTableDto.saved_filter = await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(userId, entityTable.list_type);  
+        }
     }
+
+
+
     return entityTableDto;
   }
 }

package/src/module/meta/service/media-data.service.ts

@@ -124,7 +124,7 @@ export class MediaDataService extends EntityServiceImpl {
         Key: mediaData.media_url,
         Expires: 60 * 5, // URL valid for 5 mins
       });
-      return {signedUrl,fileName: mediaData.file_name,id:mediaData.id};
+      return {signedUrl,name: mediaData.file_name,id:mediaData.id};
     } catch (error) {
       console.error('Error generating signed URL for media:', error);
       throw new Error('Failed to generate signed URL');

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

@@ -35,7 +35,9 @@ export class ModuleData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   title: string;
 
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  component_name: string;
+
   @Column({ type: 'json', nullable: true })
   ui_config: JSON;
-
 }

package/src/resources/dev.properties.yaml

@@ -1,8 +1,8 @@
 # DB_HOST: "13.234.25.234"
-DB_HOST: "localhost"
+DB_HOST: "13.234.25.234"
 DB_PORT: "3306"
 DB_USER: "root"
-DB_PASS: "root"
+DB_PASS: "Rezolut@123"
 DB_NAME: "core"
 MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
 MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="

package/src/resources/properties.yaml.ts

@@ -2,7 +2,7 @@ import { readFileSync } from 'fs';
 import * as yaml from 'js-yaml';
 import { join } from 'path';
 
-const YAML_CONFIG = `/uat.properties.yaml`;
+const YAML_CONFIG = `/dev.properties.yaml`;
 
 export default () => {
   return yaml.load(