rez_core 6.5.50 → 6.5.52

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

@@ -38,13 +38,8 @@ import { FilterModule } from '../filter/filter.module';
 // import { UserAppMappingService } from './service/user-app-mapping.service';
 // import { UserAppMappingRepository } from './repository/user-app-mapping.repository';
 // import { UserAppMapping } from './entity/user-app-mapping.entity';
-import { AppMasterController } from './controller/app-master.controller';
 import { UserRoleMappingRepository } from '../user/repository/user-role-mapping.repository';
 import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
-import { AppMasterService } from './service/app-master.service';
-import { AppMasterRespository } from './repository/app-master.repository';
-import { AppMaster } from './entity/app-master.entity';
-import { PopulateMetaService } from './service/populate-meta.service';
 import { AttributeMasterController } from './controller/attribute-master.controller';
 import { EntityDynamicController } from './controller/entity-dynamic.controller';
 import { EntityDynamicService } from './service/entity-dynamic.service';
@@ -62,6 +57,7 @@ import { EntityPublicController } from './controller/entity.public.controller';
 import { EntityUpdateService } from './service/entity-attribute-update.service';
 import { EntityUpdateRepository } from './repository/entity-attribute-update.repository';
 import { EntityRelationRepository } from './repository/entity-relation.repository';
+import { AppMasterModule } from '../app_master/app-master.module';
 
 @Module({
   imports: [
@@ -74,16 +70,14 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       MediaData,
       ViewMaster,
       UserRoleMapping,
-      AppMaster,
       EntityRelation,
       EntityRelationData,
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
-    forwardRef(() => require('../entity_json/entity_json.module').EntityJSONModule),
     UtilsModule,
     forwardRef(() => WorkflowAutomationModule),
-
+    AppMasterModule,
   ],
   providers: [
     EntityMasterService,
@@ -97,7 +91,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MasterService,
     EntityTableRepository,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnRepository,
     EntityTableColumnService,
     MediaDataRepository,
@@ -118,11 +111,9 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     // UserAppMappingService,
     // UserAppMappingRepository,
     UserRoleMappingRepository,
-    AppMasterRespository,
-    AppMasterService,
     ResolverService,
     EntityMasterRepository,
-    EntityRelationRepository
+    EntityRelationRepository,
   ],
   exports: [
     EntityMasterService,
@@ -130,18 +121,12 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     PreferenceService,
     EntityValidationService,
     EntityTableService,
-    PopulateMetaService,
     EntityTableColumnService,
     MediaDataService,
     EntityUpdateService,
     EntityUpdateRepository,
-    // SectionMasterService,
-    // FieldGroupService,
     'ViewMasterService',
     AttributeMasterService,
-    // UserAppMappingService,
-    // UserAppMappingRepository,
-    AppMasterService,
     MasterService,
     ResolverService,
     EntityDynamicService,
@@ -154,12 +139,13 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaController,
     ViewMasterController,
     MetaController,
-    AppMasterController,
     AttributeMasterController,
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
     EntityPublicController,
+
   ],
 })
-export class EntityModule {}
+export class EntityModule {
+}

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

@@ -1,18 +1,12 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { AttributeMaster } from '../entity/attribute-master.entity';
-import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { EntityJSONService } from 'src/module/entity_json/service/entity_json.service';
 
 @Injectable()
 export class AttributeMasterService {
   constructor(
     private readonly attributeMasterRepository: AttributeMasterRepository,
-    @Inject(forwardRef(() => EntityMasterRepository))
-    private readonly entityMasterRepository: EntityMasterRepository,
-    @Inject(forwardRef(() => EntityJSONService))
-    private readonly entityJSONService: EntityJSONService,
   ) {
   }
 
@@ -30,7 +24,6 @@ export class AttributeMasterService {
     attributeData: AttributeMaster,
     loggedInUser: UserData,
   ): Promise<AttributeMaster> {
-    attributeData.organization_id = loggedInUser.organization_id;
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
     attributeData.level_id = loggedInUser.level_id;
@@ -92,7 +85,6 @@ export class AttributeMasterService {
     id: number,
     loggedInUser: UserData,
   ): Promise<AttributeMaster | null> {
-    attributeData.organization_id = loggedInUser.organization_id;
     attributeData.enterprise_id = loggedInUser.enterprise_id;
     attributeData.level_type = loggedInUser.level_type;
     attributeData.level_id = loggedInUser.level_id;
@@ -135,26 +127,4 @@ export class AttributeMasterService {
       loggedInUser.enterprise_id
     );
   }
-
-    async getAttributes(entityType: string, loggedInUser: any) {
-
-
-    const entityData = await this.entityMasterRepository.getEntityByMappedEntityType(
-      entityType,
-      loggedInUser.enterprise_id,
-    );
-
-    if (entityData && entityData.is_flag_json) {
-      return this.entityJSONService.getAttributeForFlatJSON(
-        entityType,
-        loggedInUser,
-        'filter_attribute',
-      );
-    }
-
-    return await this.findAttributesByMappedEntityType(
-      entityType,
-      loggedInUser,
-    );
-  }
 }

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

@@ -17,7 +17,6 @@ export class EntityMasterService {
     private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
-    @Inject(forwardRef(() => SavedFilterRepositoryService))
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
   ) {}
 

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

@@ -1,18 +1,14 @@
-import { Inject, Injectable, forwardRef } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from './entity-service-impl.service';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 import { EntityRelationRepository } from '../repository/entity-relation.repository';
 
 @Injectable()
-export class EntityRelationService {
-  constructor(
-    @Inject(forwardRef(() => EntityMasterRepository))
-    private entityMasterRepo: EntityMasterRepository,
-    @Inject(forwardRef(() => ReflectionHelper))
-    private readonly reflectionHelper: ReflectionHelper,
-       private entityRelationRepository: EntityRelationRepository
-  ) {}
+export class EntityRelationService extends EntityServiceImpl {
+  constructor(private entityMasterRepo: EntityMasterRepository,
+              private entityRelationRepository: EntityRelationRepository) {
+    super();
+  }
 
   async getEntityRelations(
     entityType: string,

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

@@ -14,14 +14,24 @@ import { ResolverService } from './resolver.service';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
-  @Inject() protected readonly entityMasterService: EntityMasterService;
-  @Inject()
+  @Inject(forwardRef(() => EntityMasterService))
+  protected readonly entityMasterService: EntityMasterService;
+
+  @Inject(forwardRef(() => EntityTableColumnService))
   protected readonly entityTableColumnService: EntityTableColumnService;
-  @Inject() protected readonly entityTableService: EntityTableService;
-  @Inject() protected readonly reflectionHelper: ReflectionHelper;
-  @Inject() protected readonly loggingService: LoggingService;
-  @Inject()
+
+  @Inject(forwardRef(() => EntityTableService))
+  protected readonly entityTableService: EntityTableService;
+
+  @Inject(forwardRef(() => ReflectionHelper))
+  protected readonly reflectionHelper: ReflectionHelper;
+
+  @Inject(forwardRef(() => LoggingService))
+  protected readonly loggingService: LoggingService;
+
+  @Inject(forwardRef(() => EntityValidationService))
   protected readonly entityValidationService: EntityValidationService;
+
   @Inject(forwardRef(() => ResolverService))
   protected readonly resolverService: ResolverService;
 
@@ -77,21 +87,19 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     const statusList = await listMasterItemsRepo.findOne({
       where: {
         code: STATUS_ACTIVE,
-        organization_id: loggedInUser?.organization_id || 0,
+        enterprise_id: loggedInUser?.enterprise_id || 0,
       },
       select: ['id'],
     });
 
     console.log('Status List:', statusList); // Debug log
     console.log(
-      `status_code,${STATUS_ACTIVE},statusList, ${loggedInUser?.organization_id}`,
+      `status_code,${STATUS_ACTIVE},statusList, ${loggedInUser?.enterprise_id}`,
     ); // Debug log
 
     entityData.created_date = new Date();
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;
-      if (!entityData.organization_id)
-        entityData.organization_id = loggedInUser.organization_id;
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
       if (!entityData.level_type)
@@ -291,8 +299,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityData.modified_date = new Date();
     if (loggedInUser) {
       entityData.modified_by = loggedInUser.id;
-      if (!entityData.organization_id && entityData.entity_type !== 'ORG')
-        entityData.organization_id = loggedInUser.organization_id;
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
     }
@@ -344,7 +350,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityType: string,
     entityId: number,
     loggedInUser: UserData,
-    format_disable?: boolean,
   ): Promise<any> {
     const entityData = await this.entityMasterService.getEntityData(
       entityType,
@@ -362,7 +367,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     }
     const data = await repoService.findOne({ where: { id: entityId } });
 
-    return this.resolverService.getResolvedData(loggedInUser, data, entityType,format_disable);
+    return this.resolverService.getResolvedData(loggedInUser, data, entityType);
   }
 
   async getResolvedEntityDataByDataSource(

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

@@ -5,22 +5,18 @@ 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 { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { AttributeMasterService } from './attribute-master.service';
 
 @Injectable()
 export class EntityTableService {
   constructor(
     private entityTableRepository: EntityTableRepository,
     private readonly entityTableColumnRepository: EntityTableColumnRepository,
-    // private readonly entityJSONService: EntityJSONService,
 
     @Inject(forwardRef(() => 'ListMasterService'))
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
 
-    @Inject(forwardRef(() => SavedFilterRepositoryService))
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
-    private readonly attributeMasterService: AttributeMasterService,
   ) {}
 
   async getEntityData(mappedEntityType: string | null, loggedInUser) {
@@ -83,87 +79,77 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
-    let entityTableDto: any = {};
-
-    entityTableDto.column_list = [
-      {
-        name:'Code',
-        attribute_key:'code',
-        data_type:'text'
-      },
-      {
-        name:'name',
-        attribute_key:'name',
-        data_type:'text'
-      },
-      {
-        name:'status',
-        attribute_key:'status',
-        data_type:'select'
-      },
-      {
-        name:'description',
-        attribute_key:'description',
-        data_type:'text'
-      }
-    ];
-
-    entityTableDto.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,
-      ),
-      // Add any other operations you want to include
-    };
-    entityTableDto.default_filter =
-      await this.savedFilterRepoService.getDefaultFilterByEntityType(
-        entityType,
-      );
-    if (loggedInUser.id) {
-      entityTableDto.saved_filter =
-        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
-          loggedInUser.id,
-          entityType,
+    const entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
+      entityType,
+      listType,
+      displayType,
+      loggedInUser?.enterprise_id,
+    );
+    const entityTableDto = entityTable as EntityTableDto;
+    if (entityTable) {
+      entityTableDto.column_list =
+        await this.entityTableColumnRepository.findByParentIdAndParentType(
+          entityTable.id,
+          entityTable.entity_type,
+          loggedInUser.enterprise_id,
         );
-    }
-    if (loggedInUser.id) {
-      entityTableDto.shared_filter =
-        await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
+      entityTableDto.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,
-          entityType,
+        ),
+        multiselect: await this.listMasterService.getDropdownOptions(
+          'OPM',
+          {},
+          [],
+          loggedInUser,
+        ),
+        year: await this.listMasterService.getDropdownOptions(
+          'OPY',
+          {},
+          [],
+          loggedInUser,
+        ),
+        // Add any other operations you want to include
+      };
+      entityTableDto.default_filter =
+        await this.savedFilterRepoService.getDefaultFilterByEntityType(
+          entityTable.list_type,
         );
+      if (loggedInUser.id) {
+        entityTableDto.saved_filter =
+          await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
+      if (loggedInUser.id) {
+        entityTableDto.shared_filter =
+          await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
     }
 
     return entityTableDto;

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(

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

@@ -17,7 +17,6 @@ export class ResolverService {
     private readonly listMasterService: ListMasterService,
     private readonly moduleRef: ModuleRef,
     private readonly attributeMasterRepo: AttributeMasterRepository,
-    @Inject(forwardRef(() => ReflectionHelper))
     private readonly reflectionHelper: ReflectionHelper,
     @Inject(forwardRef(() => EntityMasterRepository))
     private readonly entityMasterRepo: EntityMasterRepository,
@@ -39,7 +38,6 @@ export class ResolverService {
     loggedInUser: any,
     entityData: any,
     entityType: string,
-    format_disable?: boolean,
   ): Promise<any> {
     const attributeItems =
       await this.attributeMasterRepo.findAttributesByMappedEntityType(
@@ -100,7 +98,6 @@ export class ResolverService {
       else if (
         attr.element_type === 'date' ||
         attr.element_type === 'datetime'
-        && !format_disable
       ) {
         // 👇 Explicitly define input format to avoid deprecation warning
         const dateValue = moment(codeValue, "DD-MM-YYYY", true).utcOffset('+05:30');
@@ -120,7 +117,6 @@ export class ResolverService {
       else if (
         (attr.element_type === 'upload' || attr.element_type === 'image') &&
         typeof resolvedEntityData[field] !== 'object'
-        && !format_disable
       ) {
         const mediaService = await this.getMediaDataService();
         const uploadData = await mediaService.getMediaDownloadUrl(

package/src/module/module/controller/module-access.controller.ts

@@ -2,7 +2,7 @@ import {
   BadRequestException,
   Body,
   Controller,
-  Get,
+  Get, HttpCode, HttpStatus,
   Inject,
   Param,
   Post,
@@ -24,6 +24,7 @@ export class ModuleAccessController {
   ) {}
 
   @Get('roles')
+  @HttpCode(HttpStatus.OK)
   async getRoles(
     @Query('appcode') appcode: string,
     @Query('include') include: string, // ✅ declare it as boolean
@@ -40,6 +41,7 @@ export class ModuleAccessController {
   }
 
   @Get('modules')
+  @HttpCode(HttpStatus.OK)
   async getModules(@Query('appcode') appcode: string, @Request() req) {
      const loggedInUser = req.user.userData;
     return this.moduleAccessService.getModules({
@@ -49,13 +51,14 @@ export class ModuleAccessController {
   }
 
   @Get('access-listing')
+  @HttpCode(HttpStatus.OK)
   async getAccessListing(
     @Query('roles') roleIds: string,
-    @Query('appcode') queryAppcode: string,
+    @Query('appcode') queryAppCode: string,
     @Request() req,
   ) {
     const roleIdArray = roleIds.split(',').map(Number);
-    const appcode = queryAppcode || req.user.userData.appcode;
+    const appcode = queryAppCode || req.user.userData.appcode;
     const level_type = req.user.userData.level_type;
     const level_id = req.user.userData.level_id;
     return this.moduleAccessService.getAccessListing(
@@ -67,6 +70,7 @@ export class ModuleAccessController {
   }
 
   @Get('menu-listing')
+  @HttpCode(HttpStatus.OK)
   async getMenuListing(
     @Query('mainmod') mainModIds: string,
     @Query('appcode') appcode: string,
@@ -83,6 +87,7 @@ export class ModuleAccessController {
   }
 
   @Post('update')
+  @HttpCode(HttpStatus.OK)
   async updateModuleAccess(@Body() moduleAccessData: any[]) {
     return this.moduleAccessService.updateModuleAccess(moduleAccessData);
   }
@@ -90,13 +95,14 @@ export class ModuleAccessController {
   // src/module/module-access/controller/module-access.controller.ts
 
   @Get('ui-config')
+  @HttpCode(HttpStatus.OK)
   async getModuleUIConfig(
     @Query('module_code') moduleCode: string,
     @Request() req,
   ) {
     const userId = req.user.userData?.id;
-    const appcode = req.user.userData?.appcode;
-    const roles = await this.menuService.getUserRoles(userId, appcode); // returns ['1', '4']
+    const app_id = req.user.userData?.app_id;
+    const roles = await this.menuService.getUserRoles(userId, app_id); // returns ['1', '4']
 
     if (!roles || roles.length === 0) {
       throw new BadRequestException('User has no roles');
@@ -109,6 +115,7 @@ export class ModuleAccessController {
   }
 
   @Get('user-permissions')
+  @HttpCode(HttpStatus.OK)
   async getUserPermissions(@Request() req) {
     const userData = req.user.userData;
 
@@ -116,9 +123,8 @@ export class ModuleAccessController {
     const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
-    const enterprise_id = userData?.enterprise_id;
 
-    if (!userId || !appcode || !level_type || !level_id || !enterprise_id) {
+    if (!userId || !appcode || !level_type || !level_id) {
       throw new BadRequestException('Invalid token data');
     }
 
@@ -126,8 +132,7 @@ export class ModuleAccessController {
       userId,
       appcode,
       level_type,
-      level_id,
-      enterprise_id,
+      level_id
     });
   }
 }

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

@@ -1,4 +1,7 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { ModuleData } from './module.entity';
+import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
+import { Exclude } from 'class-transformer';
 
 @Entity({ name: 'sso_menu' })
 export class MenuData {
@@ -8,8 +11,15 @@ export class MenuData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   name: string;
 
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
+  @Exclude()
+  module_code:string;
+
+  @Column({ type: 'int', nullable: true })
+  module_id: number
+
+  @ManyToOne(() => ModuleData, {nullable: true, onDelete: 'SET NULL'})
+  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
+  moduleData: ModuleData;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   status: string;
@@ -27,16 +37,14 @@ export class MenuData {
   module_level: string;
 
   @Column({ type: 'int', nullable: true })
-  parent_id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  parent_code: string;
+  ui_visible: number;
 
   @Column({ type: 'int', nullable: true })
-  ui_visible: number;
+  app_id: number;
 
-  @Column({ type: 'varchar', nullable: true })
-  appcode: string;
+  @ManyToOne(() => AppMaster, {nullable: true, onDelete: 'SET NULL'})
+  @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
+  app: AppMaster;
 
   @Column({ type: 'varchar', nullable: true })
   level_type: string;