rez_core 6.5.47 → 6.5.50

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

@@ -5,18 +5,22 @@ 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) {
@@ -79,77 +83,87 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
-    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,
+    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,
         );
-      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',
-          {},
-          [],
+    }
+    if (loggedInUser.id) {
+      entityTableDto.shared_filter =
+        await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
           loggedInUser,
-        ),
-        // Add any other operations you want to include
-      };
-      entityTableDto.default_filter =
-        await this.savedFilterRepoService.getDefaultFilterByEntityType(
-          entityTable.list_type,
+          entityType,
         );
-      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,7 +2,6 @@ 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/{enterprise → meta}/service/populate-meta.service.ts

@@ -1,12 +1,15 @@
 import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { EntityServiceImpl } from './entity-service-impl.service';
 import { ReflectionHelper } from 'src/utils/service/reflection-helper.service';
 
 @Injectable()
 export class PopulateMetaService {
   constructor(
+    private readonly dataSource: DataSource,
+    private readonly entityServiceImpl: EntityServiceImpl,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {
-  }
+  ) {}
 
   async populateMetaData(organization_id: number) {
     const metadataTables = [

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

@@ -17,6 +17,7 @@ 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,
@@ -38,6 +39,7 @@ export class ResolverService {
     loggedInUser: any,
     entityData: any,
     entityType: string,
+    format_disable?: boolean,
   ): Promise<any> {
     const attributeItems =
       await this.attributeMasterRepo.findAttributesByMappedEntityType(
@@ -98,6 +100,7 @@ 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');
@@ -117,6 +120,7 @@ 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, HttpCode, HttpStatus,
+  Get,
   Inject,
   Param,
   Post,
@@ -24,7 +24,6 @@ export class ModuleAccessController {
   ) {}
 
   @Get('roles')
-  @HttpCode(HttpStatus.OK)
   async getRoles(
     @Query('appcode') appcode: string,
     @Query('include') include: string, // ✅ declare it as boolean
@@ -41,7 +40,6 @@ 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({
@@ -51,14 +49,13 @@ 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(
@@ -70,7 +67,6 @@ export class ModuleAccessController {
   }
 
   @Get('menu-listing')
-  @HttpCode(HttpStatus.OK)
   async getMenuListing(
     @Query('mainmod') mainModIds: string,
     @Query('appcode') appcode: string,
@@ -87,7 +83,6 @@ export class ModuleAccessController {
   }
 
   @Post('update')
-  @HttpCode(HttpStatus.OK)
   async updateModuleAccess(@Body() moduleAccessData: any[]) {
     return this.moduleAccessService.updateModuleAccess(moduleAccessData);
   }
@@ -95,14 +90,13 @@ 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 app_id = req.user.userData?.app_id;
-    const roles = await this.menuService.getUserRoles(userId, app_id); // returns ['1', '4']
+    const appcode = req.user.userData?.appcode;
+    const roles = await this.menuService.getUserRoles(userId, appcode); // returns ['1', '4']
 
     if (!roles || roles.length === 0) {
       throw new BadRequestException('User has no roles');
@@ -115,7 +109,6 @@ export class ModuleAccessController {
   }
 
   @Get('user-permissions')
-  @HttpCode(HttpStatus.OK)
   async getUserPermissions(@Request() req) {
     const userData = req.user.userData;
 
@@ -123,8 +116,9 @@ 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) {
+    if (!userId || !appcode || !level_type || !level_id || !enterprise_id) {
       throw new BadRequestException('Invalid token data');
     }
 
@@ -132,7 +126,8 @@ export class ModuleAccessController {
       userId,
       appcode,
       level_type,
-      level_id
+      level_id,
+      enterprise_id,
     });
   }
 }

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

@@ -1,7 +1,4 @@
-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';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_menu' })
 export class MenuData {
@@ -11,15 +8,8 @@ export class MenuData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   name: 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 })
+  module_code: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   status: string;
@@ -37,14 +27,16 @@ export class MenuData {
   module_level: string;
 
   @Column({ type: 'int', nullable: true })
-  ui_visible: number;
+  parent_id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  parent_code: string;
 
   @Column({ type: 'int', nullable: true })
-  app_id: number;
+  ui_visible: number;
 
-  @ManyToOne(() => AppMaster, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
-  app: AppMaster;
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
 
   @Column({ type: 'varchar', nullable: true })
   level_type: string;

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

@@ -1,62 +1,25 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { ModuleData } from './module.entity';
-import { Role } from 'src/module/user/entity/role.entity';
-import { ModuleAction } from './module-action.entity';
-import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
-import { AppMaster } from '../../app_master/entity/app-master.entity';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_module_access' })
 export class ModuleAccess {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ type: 'int', nullable: true })
-  module_id: number;
-
-  @ManyToOne(() => ModuleData, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
-  module: ModuleData;
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   role_code: string;
 
-  @Column({ type: 'int', nullable: true })
-  role_id: number;
-
-  @ManyToOne(() => Role, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'role_id', referencedColumnName: 'id' })
-  role: Role;
-
   @Column({ type: 'int', nullable: true })
   access_flag: number;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   action_type: string;
 
-  @Column({ type: 'int', nullable: true })
-  action_id: number;
-
-  @ManyToOne(() => ModuleAction, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'action_id', referencedColumnName: 'id' })
-  action: ModuleAction;
-
   @Column({ type: 'varchar', length: 100, nullable: true })
   level_type: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   appcode: string;
-
-  @Column({type: 'int', nullable: true })
-  app_id: number
-
-  @ManyToOne(() => AppMaster, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
-  app: AppMaster;
-
-  @Column({ type: 'int', nullable: true })
-  enterprise_id: number;
-
-  @ManyToOne(() => EnterpriseData, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'enterprise_id', referencedColumnName: 'id' })
-  enterprise: EnterpriseData;
 }

package/src/module/module/entity/module-action.entity.ts

@@ -1,21 +1,17 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { ModuleData } from './module.entity';
+import { Column, Entity, PrimaryGeneratedColumn, Unique } from 'typeorm';
 
-@Entity({ name: 'sso_module_ucp' }) // <- new table name
+@Entity({ name: 'sso_module_action' }) // <- new table name
+@Unique(['module_code', 'action_type']) // enforce uniqueness per module + action
 export class ModuleAction {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ type: 'int', nullable: true })
-  module_id: number;
-
-  @ManyToOne(() => ModuleData, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
-  module: ModuleData;
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  module_code: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   action_name: string;
 
   @Column({ type: 'varchar', length: 50, nullable: true })
-  action_code: string;
+  action_type: string;
 }

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

@@ -1,5 +1,4 @@
-import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_module' })
 export class ModuleData {
@@ -21,6 +20,15 @@ export class ModuleData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   module_level: string;
 
+  @Column({ type: 'int', nullable: true })
+  parent_id: number;
+
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  parent_code: string;
+
+  @Column({ type: 'int', nullable: true })
+  ui_visible: number;
+
   @Column({ type: 'varchar', length: 100, nullable: true })
   entity_type: string;
 
@@ -30,12 +38,11 @@ export class ModuleData {
   @Column({ type: 'varchar', length: 100, nullable: true })
   component_name: string;
 
-  @Column({type: 'int', nullable: true})
-  app_id: number;
+  @Column({ type: 'json', nullable: true })
+  ui_config: JSON;
 
-  @ManyToOne(() => AppMaster, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
-  app: AppMaster;
+  @Column({ type: 'varchar', length: 100, nullable: true })
+  appcode: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   type: string;

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

@@ -14,6 +14,7 @@ import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
 import { UserModule } from '../user/user.module';
 import { Role } from '../user/entity/role.entity';
 import { ModuleAccess } from './entity/module-access.entity';
+import { ListMasterModule } from '../listmaster/listmaster.module';
 
 @Module({
   imports: [
@@ -27,6 +28,7 @@ import { ModuleAccess } from './entity/module-access.entity';
     ]),
     UtilsModule,
     UserModule,
+    ListMasterModule,
   ],
   controllers: [MenuController, ModuleAccessController],
   providers: [
@@ -37,5 +39,4 @@ import { ModuleAccess } from './entity/module-access.entity';
   ],
   exports: [ModuleAccessService,MenuService],
 })
-export class ModuleAccessModule {
-}
+export class ModuleModule {}