rez_core 6.5.1 → 6.5.3

package/package.json

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

package/src/app.module.ts

@@ -4,7 +4,7 @@ import { EnterpriseModule } from './module/enterprise/enterprise.module';
 import { UtilsModule } from './utils/utils.module';
 import { UserModule } from './module/user/user.module';
 import { EntityModule } from './module/meta/entity.module';
-import { ModuleModule } from './module/module/module.module';
+import { ModuleAccessModule } from './module/module/module.module';
 import { NotificationModule } from './module/notification/notification.module';
 import Properties from './resources/properties.module';
 import { LayoutModule } from './module/layout/layout.module';
@@ -36,7 +36,7 @@ import { ExportModule } from './module/export/export.module';
     EnterpriseModule,
     UtilsModule,
     UserModule,
-    ModuleModule,
+    ModuleAccessModule,
     NotificationModule,
     Properties,
     LayoutModule,
@@ -65,4 +65,4 @@ import { ExportModule } from './module/export/export.module';
     ExportModule
   ],
 })
-export class AppModule {}
+export class AppModule { }

package/src/config/database.config.ts

@@ -36,7 +36,7 @@ export class PostgresConfiguration implements TypeOrmOptionsFactory {
       database: this.configService.get('DB_NAME') || 'core',
       schema: this.configService.get('DB_SCHEMA') || 'package',
       entities: [__dirname + '/../module/**/*.entity.{ts,js}'],
-      synchronize: false,
+      synchronize: true,
       autoLoadEntities: true,
       // Configure pg pool size via `extra.max` (pg uses node-postgres pool)
       extra: {

package/src/constant/status.constant.ts

@@ -0,0 +1,4 @@
+export enum StatusConstant {
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE'
+}

package/src/core.module.ts

@@ -5,7 +5,7 @@ import { EnterpriseModule } from './module/enterprise/enterprise.module';
 import { UtilsModule } from './utils/utils.module';
 import { UserModule } from './module/user/user.module';
 import { EntityModule } from './module/meta/entity.module';
-import { ModuleModule } from './module/module/module.module';
+import { ModuleAccessModule } from './module/module/module.module';
 import { NotificationModule } from './module/notification/notification.module';
 import { LayoutModule } from './module/layout/layout.module';
 import { ListMasterModule } from './module/listmaster/listmaster.module';
@@ -32,57 +32,68 @@ export class CoreModule {
       throw new Error('Database module must be provided.');
     }
 
-    const importsArray = [
-      ConfigModule.forRoot({ isGlobal: true }),
-      dbModule,
-      EntityModule,
-      UtilsModule,
-      NotificationModule,
-      ListMasterModule,
-      FilterModule,
-      AuthModule,
-      LeadModule,
-      LayoutPreferenceModule,
-      WorkflowModule,
-      WorkflowAutomationModule,
-      WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
-      MapperModule,
-      LinkedAttributesModule,
-      ExportModule
-    ];
-
-    const exportsArray = [
-      ConfigModule,
-      dbModule,
-      EntityModule,
-      AuthModule,
-      UtilsModule,
-      NotificationModule,
-      ListMasterModule,
-      FilterModule,
-      LeadModule,
-      LayoutPreferenceModule,
-      MapperModule,
-      WorkflowModule,
-      WorkflowAutomationModule,
-      WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
-      LinkedAttributesModule,
-      ExportModule
-    ];
+    let importsArray: any = [];
+    let exportsArray: any = [];
 
     if (isSso) {
-      importsArray.push(
+      importsArray = [
+        ConfigModule.forRoot({ isGlobal: true }),
+        dbModule,
         UserModule,
-        ModuleModule,
+        ModuleAccessModule,
         LayoutModule,
         EnterpriseModule,
-      );
-      exportsArray.push(
+        UtilsModule,
+        AuthModule
+      ];
+      exportsArray = [
+        ConfigModule.forRoot({ isGlobal: true }),
+        dbModule,
         UserModule,
-        ModuleModule,
+        ModuleAccessModule,
         LayoutModule,
         EnterpriseModule,
-      );
+        UtilsModule,
+        AuthModule
+      ];
+    } else {
+      importsArray = [
+        ConfigModule.forRoot({ isGlobal: true }),
+        dbModule,
+        EntityModule,
+        UtilsModule,
+        NotificationModule,
+        ListMasterModule,
+        FilterModule,
+        AuthModule,
+        LeadModule,
+        LayoutPreferenceModule,
+        WorkflowModule,
+        WorkflowAutomationModule,
+        WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
+        MapperModule,
+        LinkedAttributesModule,
+        ExportModule
+      ];
+
+      exportsArray = [
+        ConfigModule,
+        dbModule,
+        EntityModule,
+        AuthModule,
+        UtilsModule,
+        NotificationModule,
+        ListMasterModule,
+        FilterModule,
+        LeadModule,
+        LayoutPreferenceModule,
+        MapperModule,
+        WorkflowModule,
+        WorkflowAutomationModule,
+        WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
+        LinkedAttributesModule,
+        ExportModule
+      ];
     }
 
     return {

package/src/module/auth/strategies/jwt.strategy.ts

@@ -21,7 +21,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     const {
       id,
       sessionToken,
-      appcode,
+      app_id,
       email_id,
       organization_id,
       enterprise_id,
@@ -45,7 +45,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     const userData = {
       id: id,
       sessionToken: sessionToken,
-      appcode: appcode,
+      app_id: app_id,
       email_id: email_id,
       organization_id: organization_id,
       enterprise_id: enterprise_id,

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

@@ -6,16 +6,16 @@ import { DashboardPageData } from './entity/dashboard_page_data.entity';
 import { DashboardController } from './controller/dashboard.controller';
 import { DashboardService } from './service/dashboard.service';
 import { DashboardRepository } from './repository/dashboard.repository';
-import { ModuleModule } from '../module/module.module';
+import { ModuleAccessModule } from '../module/module.module';
 
 @Module({
   imports: [
     EntityModule,
     TypeOrmModule.forFeature([WidgetMaster, DashboardPageData]),
-    ModuleModule,
+    ModuleAccessModule,
   ],
   controllers: [DashboardController],
   providers: [DashboardService, DashboardRepository],
   exports: [DashboardService],
 })
-export class DashboardModule {}
+export class DashboardModule { }

package/src/module/dashboard/service/dashboard.service.ts

@@ -17,10 +17,9 @@ export class DashboardService {
 
     const access = await this.moduleAccessService.getUserPermissions({
       userId: loggedInUser.id,
-      appcode: loggedInUser.appcode,
+      app_id: loggedInUser.app_id,
       level_type: loggedInUser.level_type,
-      level_id: loggedInUser.level_id,
-      enterprise_id: loggedInUser.enterprise_id,
+      level_id: loggedInUser.level_id
     });
 
     // Build a set of accessible codes

package/src/module/enterprise/controller/organization.controller.ts

@@ -24,7 +24,6 @@ import { OrganizationData } from '../entity/organization.entity';
 export class OrganizationController {
   constructor(
     private readonly orgService: OrganizationService,
-    @Inject('UserService') private readonly userService: UserService,
   ) {}
 
   @Post('create')

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

@@ -24,7 +24,6 @@ import { EnterpriseController } from './controller/enterprise.controller';
       OrganizationAppMapping,
       EnterpriseData
     ]),
-    forwardRef(() => UserModule),
     UtilsModule,
     EntityModule,
   ],
@@ -41,6 +40,6 @@ import { EnterpriseController } from './controller/enterprise.controller';
       useClass: BrandService,
     },
   ],
-  exports: [OrganizationService, OrganizationRepository,EnterpriseService],
+  exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository],
 })
 export class EnterpriseModule {}

package/src/module/enterprise/entity/organization-app-mapping.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
 import { OrganizationData } from './organization.entity';
 import { AppMaster } from '../../meta/entity/app-master.entity';
 
@@ -15,4 +15,7 @@ export class OrganizationAppMapping {
   @ManyToOne(() => AppMaster, { nullable: true, onDelete: 'SET NULL' })
   @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
   app: AppMaster;
+
+  @Column({type: 'varchar', nullable: true})
+  appcode: string;
 }

package/src/module/enterprise/entity/organization.entity.ts

@@ -1,12 +1,14 @@
-import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
+import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
+import { EnterpriseData } from './enterprise.entity';
 
 @Entity({ name: 'sso_organization' })
 export class OrganizationData {
   @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
   id: number;
 
-  @Column({ name: 'enterprise_id', type: 'int' })
-  enterprise_id: number;
+  @ManyToOne(() => EnterpriseData, {nullable: true, onDelete: 'SET NULL'})
+  @JoinColumn({ name: 'enterprise_id', referencedColumnName: 'id' })
+  enterprise_id: EnterpriseData;
 
   @Column({ name: 'code', nullable: true })
   code: string;

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

@@ -36,4 +36,18 @@ export class EnterpriseRepository {
       where: { id: enterpriseData.id },
     });
   }
+
+  async findEnterpriseBySubdomain(
+    slug: string,
+  ): Promise<EnterpriseData | null> {
+    return await this.enterpriseRepository.findOne({
+      where: { slug },
+    });
+  }
+
+  async findById(id: number) {
+    return await this.enterpriseRepository.findOne({
+      where: { id },
+    });
+  }
 }

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

@@ -12,9 +12,9 @@ export class OrganizationService {
   constructor(
     @InjectRepository(OrganizationData)
     private readonly organizationRepository: Repository<OrganizationData>,
+    private readonly schoolRepository: SchoolRepository,
     private readonly idGen: ClockIDGenService,
     private readonly wbcCodeGenService: WBSCodeGenService,
-    private readonly schoolRepository: SchoolRepository,
   ) {}
 
   async create(

package/src/module/filter/service/filter.service.ts

@@ -227,8 +227,7 @@ export class FilterService {
       level_type,
       level_id,
       id: user_id,
-      appcode,
-      organization_id,
+      enterprise_id,
     } = loggedInUser || {};
 
     // Fetch meta from entity table service
@@ -320,7 +319,7 @@ export class FilterService {
       entity_type !== 'TEM' && // ✅ skip TEMPLATE
       level_type &&
       level_id &&
-      organization_id &&
+      enterprise_id &&
       !customLevelType &&
       !customLevelId
     ) {

package/src/module/layout/controller/layout.controller.ts

@@ -18,20 +18,13 @@ import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 export class LayoutController {
   constructor(
     private readonly headerSectionService: HeaderSectionService,
-    @Inject('UserService') private readonly userService: UserService,
   ) {}
 
   @Get('header')
   async getHeader(@Req() req: Request & { user: any }, @Res() res: Response) {
     const userData = req.user.userData;
-    // const userData = await this.userService.getEntityData(
-    //   ENTITYTYPE_USER,
-    //   userId,
-    // );
     if (userData) {
-      const response = await this.headerSectionService.findByOrganizationId(
-        userData.organization_id,
-      );
+      const response = await this.headerSectionService.getHeader();
       return res.json({
         success: true,
         data: response,

package/src/module/layout/entity/header-section.entity.ts

@@ -5,12 +5,6 @@ export class HeaderSection {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ name: 'enterprise_id', type: 'int', nullable: true })
-  enterprise_id: number;
-
-  @Column({ nullable: true, type: 'int' })
-  organization_id: number;
-
   @Column({ length: 50, type: 'varchar', nullable: true })
   section_name: string;
 

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

@@ -9,7 +9,7 @@ import { UserModule } from '../user/user.module';
 import { HeaderSectionService } from './service/header-section.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([HeaderSection, HeaderItems]), UserModule],
+  imports: [TypeOrmModule.forFeature([HeaderSection, HeaderItems])],
   controllers: [LayoutController],
   providers: [
     HeaderItemsRepository,

package/src/module/layout/repository/header-section.repository.ts

@@ -10,12 +10,6 @@ export class HeaderSectionRepository {
     private readonly headerSectionRepository: Repository<HeaderSection>,
   ) {}
 
-  async findByOrganizationId(organizationId: number) {
-    return await this.headerSectionRepository.find({
-      where: { organization_id: organizationId },
-    });
-  }
-
   async getHeaders() {
     return await this.headerSectionRepository.find();
   }

package/src/module/layout/service/header-section.service.ts

@@ -9,7 +9,7 @@ export class HeaderSectionService {
     private readonly headerItemsRepository: HeaderItemsRepository,
   ) {}
 
-  async findByOrganizationId(organizationId: number) {
+  async getHeader() {
     const headerSections = await this.headerSectionRepository.getHeaders();
     const response = {};
 

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

@@ -212,14 +212,6 @@ export class ListMasterService {
         });
       }
 
-      if (loggedInUser?.appcode && sourceList === 'ROL') {
-        if (!this.skipLevelFilterEntities.includes(sourceList)) {
-          qb.andWhere(`${tableName}.appcode = :appcode`, {
-            appcode: loggedInUser.appcode,
-          });
-        }
-      }
-
       // ✅ Apply dynamic params
       for (const key in params) {
         qb.andWhere(`${tableName}.${key} = :${key}`, {
@@ -259,7 +251,7 @@ export class ListMasterService {
 
     const resolveInactiveStatus = await this.getResolvedListCode(
       STATUS_INACTIVE,
-      loggedInUser?.organization_id || 0,
+      loggedInUser?.enterprise_id || 0,
     );
 
     // Fetch inactive records (with same filters but without status condition)

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

@@ -1,15 +1,31 @@
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-import { BaseEntity } from './base-entity.entity';
 
 @Entity({ name: 'sso_app_master' })
-export class AppMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'APM';
-  }
+export class AppMaster {
 
   @PrimaryGeneratedColumn()
   id: number;
+  
+  @Column({ name: 'name', type: 'varchar', length: 100, nullable: true })
+  name: string;
+
+  @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
+  status: string;
+
+  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
+  code: string;
+
+  @Column({ name: 'created_by', type: 'bigint', nullable: true })
+  created_by: number;
+
+  @Column({ name: 'created_date',nullable: true })
+  created_date: Date;
+
+  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
+  modified_by: number;
+
+  @Column({ name: 'modified_date', nullable: true })
+  modified_date: Date;
 
   @Column({ name: 'type', type: 'varchar', nullable: true })
   type: string;
@@ -31,7 +47,4 @@ export class AppMaster extends BaseEntity {
 
   @Column({ name: 'version', type: 'varchar', nullable: true })
   version: string;
-
-   @Column({ name: 'show_in_ui', type: 'boolean', nullable: true })
-  show_in_ui: string;
 }

package/src/module/meta/repository/app-master.repository.ts

@@ -14,7 +14,7 @@ export class AppMasterRespository {
     appCode: string,
   ): Promise<AppMaster[] | null> {
     return await this.AppMasterRespository.find({
-      where: { appcode: appCode },
+      where: { code: appCode },
     });
   }
 }

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

@@ -24,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;
@@ -86,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;

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

@@ -77,21 +77,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 +289,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;
     }

package/src/module/module/controller/menu.controller.ts

@@ -9,7 +9,7 @@ export class MenuController {
   @UseGuards(JwtAuthGuard)
   @Get()
   async getMenu(@Request() req) {
-    const { id: userId, appcode, level_type, level_id } = req.user.userData;
-    return this.menuService.getUserMenu(userId, appcode, level_type, level_id);
+    const { id: userId, app_id, level_type, level_id } = req.user.userData;
+    return this.menuService.getUserMenu(userId, app_id, level_type, level_id);
   }
 }