rez_core 6.5.13 → 6.5.15

package/package.json

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

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

@@ -82,7 +82,8 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
-    WorkflowAutomationModule
+    WorkflowAutomationModule,
+    
   ],
   providers: [
     EntityMasterService,
@@ -103,6 +104,8 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaDataService,
     AttributeMasterService,
     EntityUpdateService,
+    // SectionMasterService,
+    // FieldGroupService,
     ViewMaterRespository,
     EntityValidationService,
     { provide: 'ViewMasterService', useClass: ViewMasterService },
@@ -111,12 +114,16 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       provide: 'EntityRelationDataService',
       useClass: EntityRelationDataService,
     },
+
+    // UserAppMappingService,
+    // UserAppMappingRepository,
     UserRoleMappingRepository,
     AppMasterRespository,
     AppMasterService,
     ResolverService,
     EntityMasterRepository,
-    EntityRelationRepository
+    EntityRelationRepository,
+    AppMasterRespository
   ],
   exports: [
     EntityMasterService,
@@ -129,8 +136,12 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     MediaDataService,
     EntityUpdateService,
     EntityUpdateRepository,
+    // SectionMasterService,
+    // FieldGroupService,
     'ViewMasterService',
     AttributeMasterService,
+    // UserAppMappingService,
+    // UserAppMappingRepository,
     AppMasterService,
     MasterService,
     ResolverService,
@@ -150,7 +161,8 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     EntityDynamicController,
     EntityRelationController,
     EntityMasterController,
-    EntityPublicController
+    EntityPublicController,
+
   ],
 })
-export class EntityModule { }
+export class EntityModule {}

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

@@ -14,8 +14,6 @@ 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';
-import { EntityModule } from '../meta/entity.module';
 
 @Module({
   imports: [
@@ -29,15 +27,15 @@ import { EntityModule } from '../meta/entity.module';
     ]),
     UtilsModule,
     UserModule,
-    EntityModule
   ],
   controllers: [MenuController, ModuleAccessController],
   providers: [
     ModuleAccessService,
     MenuService,
     MenuRepository,
-    ModuleAccessRepository
+    ModuleAccessRepository,
   ],
   exports: [ModuleAccessService,MenuService],
 })
-export class ModuleAccessModule { }
+export class ModuleAccessModule {
+}

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

@@ -1,37 +1,32 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { In, Not, Repository, Or, DataSource, IsNull } from 'typeorm';
+import { In, IsNull, Not, Or, Repository } from 'typeorm';
 import { Role } from 'src/module/user/entity/role.entity';
 import { ModuleAccess } from '../entity/module-access.entity';
 import { ModuleAction } from '../entity/module-action.entity';
 import { ModuleData } from '../entity/module.entity';
-import { AppMasterRespository } from '../../meta/repository/app-master.repository';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class ModuleAccessRepository {
   constructor(
     @InjectRepository(Role)
     private readonly roleRepo: Repository<Role>,
-
     @InjectRepository(ModuleData)
     private readonly moduleRepo: Repository<ModuleData>,
-
     @InjectRepository(ModuleAccess)
     private readonly moduleAccessRepo: Repository<ModuleAccess>,
-
     @InjectRepository(ModuleAction)
     private readonly moduleActionRepo: Repository<ModuleAction>,
-
-    private readonly appMasterRepo: AppMasterRespository,
-
-    private readonly dataSource: DataSource,
-  ) {}
+    private readonly reflectionHelper: ReflectionHelper,
+  ) {
+  }
 
   async getRoles({
-    appcode,
-    level_type,
-    level_id,
-  }: {
+                   appcode,
+                   level_type,
+                   level_id,
+                 }: {
     appcode: string;
     level_type?: string;
     level_id?: number;
@@ -63,26 +58,30 @@ export class ModuleAccessRepository {
   }
 
   async getModules({
-    appcode,
-    loggedInUser,
-  }: {
+                     appcode,
+                     loggedInUser,
+                   }: {
     appcode: string;
     loggedInUser: any;
   }) {
     let modules: any[];
     if (loggedInUser.level_type == 'SCH') {
       modules = await this.moduleRepo.find({
-        where: { module_level: 'MAINMOD',
+        where: {
+          module_level: 'MAINMOD',
           app: {
-            code: appcode
+            code: appcode,
           },
-          level_type: 'SCH'
+          level_type: 'SCH',
         },
       });
     } else {
       modules = await this.moduleRepo.find({
-        where: { module_level: 'MAINMOD', app : {code: appcode
-          } },
+        where: {
+          module_level: 'MAINMOD', app: {
+            code: appcode,
+          },
+        },
       });
     }
 
@@ -116,7 +115,7 @@ export class ModuleAccessRepository {
         where: {
           id: In(fetchedRoleIds),
           app: {
-            code: appcode
+            code: appcode,
           },
         },
       });
@@ -125,7 +124,7 @@ export class ModuleAccessRepository {
         where: {
           id: In(roleIds.map((id) => Number(id))),
           app: {
-            code: appcode
+            code: appcode,
           },
         },
       });
@@ -137,14 +136,14 @@ export class ModuleAccessRepository {
       where: {
         role_id: In(roles.map((role) => role.id)),
         app: {
-          code: appcode
+          code: appcode,
         },
-        level_type: levelType
+        level_type: levelType,
       },
       relations: {
         app: true,
-        module: true
-      }
+        module: true,
+      },
     });
 
     return roles.map((role) => ({
@@ -159,13 +158,19 @@ export class ModuleAccessRepository {
           level_type: access.level_type,
           app_id: access.app_id,
           code: access.module.module_code,
-          appcode: access.app.code
+          appcode: access.app.code,
         })),
     }));
   }
 
   async getAllModulesByLevel(mainModIds: string[], appcode: string, levelType) {
-    const appMaster = await this.appMasterRepo.getAppMasterDataByAppCode(appcode);
+    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
+
+    const appMaster = await appMasterRepo.find({
+      where: {
+        code: appcode
+      }
+    });
 
     if (!appMaster) {
       return {};
@@ -175,10 +180,10 @@ export class ModuleAccessRepository {
       mainModIds.length === 1 && mainModIds[0] === '-1'
         ? await this.moduleRepo.find({
           where: { module_level: 'MAINMOD', app_id: appMaster[0].id },
-          })
+        })
         : await this.moduleRepo.find({
-            where: { id: In(mainModIds), module_level: 'MAINMOD', app: {code: appcode} },
-          });
+          where: { id: In(mainModIds), module_level: 'MAINMOD', app: { code: appcode } },
+        });
 
     if (!mainModules.length) return {};
 
@@ -242,7 +247,7 @@ export class ModuleAccessRepository {
             (mod) =>
               mod.wbs_code.startsWith(`${parentWbs}.`) &&
               mod.wbs_code.split('.').length ===
-                parentWbs.split('.').length + 1,
+              parentWbs.split('.').length + 1,
           )
           .map((mod) => ({
             name: mod.name,
@@ -287,11 +292,11 @@ export class ModuleAccessRepository {
               code: access.role_code,
             },
             module: {
-              module_code: access.module_code
+              module_code: access.module_code,
             },
             action_type: access.action_type,
             app: {
-              code: access.appcode
+              code: access.appcode,
             },
             level_type: access.level_type,
           },