rez_core 6.5.14 → 6.5.16

package/package.json

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

package/src/app.module.ts

@@ -31,7 +31,6 @@ import { ExportModule } from './module/export/export.module';
 
 @Module({
   imports: [
-    EntityModule,
     DatabaseModule,
     EnterpriseModule,
     UtilsModule,
@@ -62,7 +61,8 @@ import { ExportModule } from './module/export/export.module';
     MicroserviceClientsModule,
     LinkedAttributesModule,
     EntityJSONModule,
-    ExportModule
+    ExportModule,
+    EntityModule,
   ],
 })
 export class AppModule { }

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

@@ -1,18 +1,17 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserModule } from '../user/user.module';
-import { OrganizationController } from './controller/organization.controller';
-import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+import { OrganizationService } from './service/organization.service';
 import { OrganizationData } from './entity/organization.entity';
+import { OrganizationController } from './controller/organization.controller';
 import { OrganizationAppMappingService } from './service/organization-app-mapping.service';
-import { OrganizationService } from './service/organization.service';
+import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+// import { BrandData } from './entity/brand.entity';
+// import { SchoolData } from './entity/school.entity';
+// import { BrandRepository } from './repository/brand.repository';
 import { UtilsModule } from 'src/utils/utils.module';
-import { EntityModule } from '../meta/entity.module';
 import { OrganizationRepository } from './repository/organization.repository';
 import { SchoolRepository } from './repository/school.repository';
-import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
 import { EnterpriseService } from './service/enterprise.service';
-import { BrandService } from './service/brand.service';
 import { EnterpriseRepository } from './repository/enterprise.repository';
 import { EnterpriseData } from './entity/enterprise.entity';
 import { EnterpriseController } from './controller/enterprise.controller';
@@ -22,10 +21,9 @@ import { EnterpriseController } from './controller/enterprise.controller';
     TypeOrmModule.forFeature([
       OrganizationData,
       OrganizationAppMapping,
-      EnterpriseData
+      EnterpriseData,
     ]),
     UtilsModule,
-    EntityModule,
   ],
   controllers: [OrganizationController, EnterpriseController],
   providers: [
@@ -35,11 +33,8 @@ import { EnterpriseController } from './controller/enterprise.controller';
     OrganizationRepository,
     EnterpriseService,
     EnterpriseRepository,
-    {
-      provide: 'BrandService',
-      useClass: BrandService,
-    },
   ],
   exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository],
 })
-export class EnterpriseModule {}
+export class EnterpriseModule {
+}

package/src/module/enterprise/service/brand-profile.service.ts

@@ -0,0 +1,10 @@
+// import { Inject, Injectable } from '@nestjs/common';
+// import { firstValueFrom } from 'rxjs';
+// import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+//
+// @Injectable()
+// export class BrandProfileService extends EntityServiceImpl {
+//   constructor() {
+//     super();
+//   }
+// }

package/src/module/enterprise/service/brand.service.ts

@@ -1,5 +1,75 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-
-@Injectable()
-export class BrandService extends EntityServiceImpl {}
+// import { Injectable } from '@nestjs/common';
+// import { InjectRepository } from '@nestjs/typeorm';
+//
+// @Injectable()
+// export class BrandService {
+//   constructor(
+//     @InjectRepository(Brand)
+//   ) {
+//
+//   }
+//
+//   async getEntityData(
+//     entityType: string,
+//     id: number,
+//     loggedInUser,
+//   ): Promise<any> {
+//     const brandResponse = await super.getEntityData(
+//       entityType,
+//       id,
+//       loggedInUser,
+//     );
+//
+//     return brandResponse;
+//   }
+//
+//   async createEntity(body: any, userData): Promise<any> {
+//     const { entity_type, ...data } = body;
+//
+//     const brandData = await super.createEntity(
+//       {
+//         ...data,
+//
+//         entity_type: 'ORG',
+//         type: 'BRN',
+//         parent_id: userData.organization_id,
+//       },
+//       userData,
+//     );
+//
+//     // save brand profile
+//
+//     const brandProfile = await super.createEntity(
+//       {
+//         ...body,
+//         parent_id: brandData.id,
+//         organization_id: brandData.organization_id,
+//         entity_type: 'BRNP',
+//       },
+//       userData,
+//     );
+//
+//     return brandProfile;
+//   }
+//
+//   async updateEntity(body: any, userData): Promise<any> {
+//     // update brand table
+//     const { id, entity_type, organization_id, ...newBody } = body;
+//
+//     const brandProfile = await super.updateEntity(body, userData);
+//
+//     // update brand
+//     await super.updateEntity(
+//       {
+//         ...newBody,
+//         id: brandProfile.parent_id,
+//         parent_id: userData.organization_id,
+//         entity_type: 'ORG',
+//         type: 'BRN',
+//       },
+//       userData,
+//     );
+//
+//     return brandProfile;
+//   }
+// }

package/src/module/enterprise/service/school.service.ts

@@ -0,0 +1,5 @@
+// import { Injectable } from '@nestjs/common';
+// import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+//
+// @Injectable()
+// export class SchoolService extends EntityServiceImpl {}

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

@@ -77,12 +77,11 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
       AppMaster,
       EntityRelation,
       EntityRelationData,
-      EntityUpdateService
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
-    WorkflowAutomationModule,
+    forwardRef(() => WorkflowAutomationModule),
     
   ],
   providers: [
@@ -123,7 +122,6 @@ import { EntityRelationRepository } from './repository/entity-relation.repositor
     ResolverService,
     EntityMasterRepository,
     EntityRelationRepository,
-    AppMasterRespository
   ],
   exports: [
     EntityMasterService,

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,
           },

package/src/module/workflow-automation/workflow-automation.module.ts

@@ -28,7 +28,7 @@ import { WorkflowScheduleModule } from '../workflow-schedule/workflow-schedule.m
       ListMasterData,
       ActionCategory
     ]),
-    FilterModule,
+    forwardRef(() => FilterModule),
     forwardRef(() => EntityModule),
     DiscoveryModule, // 👈 enables provider scanning
   ],