rez_core 6.5.61 → 6.5.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "6.5.61",
+  "version": "6.5.62",
   "description": "",
   "author": "",
   "private": false,
@@ -122,4 +122,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

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';
@@ -28,15 +28,15 @@ import { WorkflowAutomationModule } from './module/workflow-automation/workflow-
 import { LinkedAttributesModule } from './module/linked_attributes/linked_attributes.module';
 import { EntityJSONModule } from './module/entity_json/entity_json.module';
 import { ExportModule } from './module/export/export.module';
+import { AppMasterModule } from './module/app_master/app-master.module';
 
 @Module({
   imports: [
-    EntityModule,
     DatabaseModule,
     EnterpriseModule,
     UtilsModule,
     UserModule,
-    ModuleModule,
+    ModuleAccessModule,
     NotificationModule,
     Properties,
     LayoutModule,
@@ -62,7 +62,9 @@ import { ExportModule } from './module/export/export.module';
     MicroserviceClientsModule,
     LinkedAttributesModule,
     EntityJSONModule,
-    ExportModule
+    ExportModule,
+    EntityModule,
+    AppMasterModule
   ],
 })
-export class AppModule {}
+export class AppModule { }

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';
@@ -19,6 +19,7 @@ import { MapperModule } from './module/mapper/mapper.module';
 import { WorkflowScheduleModule } from './module/workflow-schedule/workflow-schedule.module';
 import { LinkedAttributesModule } from './module/linked_attributes/linked_attributes.module';
 import { ExportModule } from './module/export/export.module';
+import { AppMasterModule } from './module/app_master/app-master.module';
 
 @Global()
 @Module({})
@@ -32,57 +33,70 @@ 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,
+        NotificationModule,
+        AppMasterModule
+      ];
+      exportsArray = [
+        ConfigModule,
         UserModule,
-        ModuleModule,
+        ModuleAccessModule,
         LayoutModule,
         EnterpriseModule,
-      );
+        UtilsModule,
+        AuthModule,
+        NotificationModule,
+        AppMasterModule
+      ];
+    } 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,
+        EntityModule,
+        AuthModule,
+        UtilsModule,
+        NotificationModule,
+        ListMasterModule,
+        FilterModule,
+        LeadModule,
+        LayoutPreferenceModule,
+        MapperModule,
+        WorkflowModule,
+        WorkflowAutomationModule,
+        WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
+        LinkedAttributesModule,
+        ExportModule
+      ];
     }
 
     return {

package/src/module/app_master/app-master.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { AppMasterController } from './controller/app-master.controller';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { AppMaster } from './entity/app-master.entity';
+import { AppMasterService } from './service/app-master.service';
+import { AppMasterRespository } from './repository/app-master.repository';
+import { UserModule } from '../user/user.module';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([AppMaster]), UserModule],
+  controllers: [AppMasterController],
+  providers: [AppMasterService, AppMasterRespository],
+  exports: [AppMasterRespository, AppMasterService]
+})
+export class AppMasterModule {}

package/src/module/{meta → app_master}/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 → app_master}/repository/app-master.repository.ts

@@ -7,14 +7,14 @@ import { AppMaster } from '../entity/app-master.entity';
 export class AppMasterRespository {
   constructor(
     @InjectRepository(AppMaster)
-    private readonly AppMasterRespository: Repository<AppMaster>,
+    private readonly appMasterRespository: Repository<AppMaster>,
   ) {}
 
   async getAppMasterDataByAppCode(
     appCode: string,
   ): Promise<AppMaster[] | null> {
-    return await this.AppMasterRespository.find({
-      where: { appcode: appCode },
+    return await this.appMasterRespository.find({
+      where: { code: appCode },
     });
   }
 }

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

@@ -21,12 +21,13 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
     const {
       id,
       sessionToken,
-      appcode,
+      app_id,
       email_id,
       organization_id,
       enterprise_id,
       level_id,
       level_type,
+      appcode
     } = payload;
 
     // Check if session exists and is valid
@@ -45,12 +46,13 @@ 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,
       level_id: level_id,
       level_type: level_type,
+      appcode: appcode
     };
 
     return { userData };

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

@@ -19,8 +19,7 @@ export class DashboardService {
       userId: loggedInUser.id,
       appcode: loggedInUser.appcode,
       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/enterprise.controller.ts

@@ -0,0 +1,40 @@
+import {
+  Controller,
+  Post,
+  Put,
+  Body,
+  HttpCode,
+  HttpStatus,
+  UseGuards,
+  Req,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { EnterpriseService } from '../service/enterprise.service';
+import { EnterpriseData } from '../entity/enterprise.entity';
+
+@Controller('enterprise')
+@UseGuards(JwtAuthGuard)
+export class EnterpriseController {
+  constructor(private readonly enterpriseService: EnterpriseService) {}
+
+  @Post('create')
+  @HttpCode(HttpStatus.OK)
+  async create(
+    @Body() enterpriseData: EnterpriseData,
+    @Req() req: Request & { user: any },
+  ): Promise<EnterpriseData> {
+    const loggedInUser = req.user.userData;
+    return await this.enterpriseService.create(enterpriseData, loggedInUser);
+  }
+
+  @Put('update')
+  @HttpCode(HttpStatus.OK)
+  async update(
+    @Body() enterpriseData: EnterpriseData,
+    @Req() req: Request & { user: any },
+  ): Promise<EnterpriseData | null> {
+    const loggedInUser = req.user.userData;
+    return await this.enterpriseService.update(enterpriseData, loggedInUser);
+  }
+}
+

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

@@ -0,0 +1,23 @@
+import { Controller, HttpCode, HttpStatus, Post, Query, Req, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { PopulateMetaService } from '../service/populate-meta.service';
+
+@Controller('meta')
+export class MetaController {
+
+  constructor(private readonly populateMetaService: PopulateMetaService) {
+  }
+
+  @Post('populate')
+  @HttpCode(HttpStatus.OK)
+  async populateMetaData(
+    @Query('organization_id') organizationId: number,
+    @Res() response: Response,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const result =
+      await this.populateMetaService.populateMetaData(organizationId);
+    return response.status(HttpStatus.OK).json(result);
+  }
+}

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

@@ -1,18 +1,43 @@
-import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  Post,
+  Put,
+  Delete,
+  Body,
+  Param,
+  Inject,
+  Req,
+  UseGuards,
+  HttpCode,
+  HttpStatus,
+  ParseIntPipe,
+} from '@nestjs/common';
 import { Request } from 'express';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { UserService } from 'src/module/user/service/user.service';
 import { OrganizationService } from '../service/organization.service';
+import { OrganizationData } from '../entity/organization.entity';
 
 @Controller('organization')
+@UseGuards(JwtAuthGuard)
 export class OrganizationController {
   constructor(
     private readonly orgService: OrganizationService,
-    @Inject('UserService') private readonly userService: UserService,
   ) {}
 
-  @UseGuards(JwtAuthGuard)
+  @Post('create')
+  @HttpCode(HttpStatus.OK)
+  async create(
+    @Body() organizationDto: Partial<OrganizationData>,
+    @Req() req: Request & { user: any },
+  ): Promise<OrganizationData> {
+    const loggedInUser = req.user.userData;
+    return await this.orgService.create(organizationDto, loggedInUser);
+  }
+
   @Get('dropdown')
+  @HttpCode(HttpStatus.OK)
   async getOrganizationDropdown(@Req() req: Request & { user: any }) {
     const userData = req.user.userData;
     // const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
@@ -20,8 +45,8 @@ export class OrganizationController {
     return this.orgService.findById(userData?.organization_id);
   }
 
-  @UseGuards(JwtAuthGuard)
   @Get('hierarchy')
+  @HttpCode(HttpStatus.OK)
   async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
     const userId = req.user.userData?.id;
     const appcode = req.user.userData?.appcode;
@@ -33,4 +58,35 @@ export class OrganizationController {
       org_id,
     );
   }
+
+  @Get()
+  @HttpCode(HttpStatus.OK)
+  async findAll(): Promise<OrganizationData[]> {
+    return await this.orgService.findAll();
+  }
+
+  @Get(':id')
+  @HttpCode(HttpStatus.OK)
+  async findOne(
+    @Param('id', ParseIntPipe) id: number,
+  ): Promise<OrganizationData | null> {
+    return await this.orgService.findOne(id);
+  }
+
+  @Post('update/:id')
+  @HttpCode(HttpStatus.OK)
+  async update(
+    @Param('id', ParseIntPipe) id: number,
+    @Body() organizationDto: Partial<OrganizationData>,
+    @Req() req: Request & { user: any },
+  ): Promise<OrganizationData | null> {
+    const loggedInUser = req.user.userData;
+    return await this.orgService.update(id, organizationDto, loggedInUser);
+  }
+
+  @Delete(':id')
+  @HttpCode(HttpStatus.OK)
+  async remove(@Param('id', ParseIntPipe) id: number): Promise<void> {
+    return await this.orgService.remove(id);
+  }
 }

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

@@ -1,33 +1,33 @@
-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';
+import { PopulateMetaService } from './service/populate-meta.service';
+import { MetaController } from './controller/meta.controller';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([
       OrganizationData,
       OrganizationAppMapping,
-      EnterpriseData
+      EnterpriseData,
     ]),
-    forwardRef(() => UserModule),
     UtilsModule,
-    EntityModule,
   ],
-  controllers: [OrganizationController],
+  controllers: [OrganizationController, EnterpriseController, MetaController],
   providers: [
     OrganizationService,
     OrganizationAppMappingService,
@@ -35,11 +35,9 @@ import { EnterpriseData } from './entity/enterprise.entity';
     OrganizationRepository,
     EnterpriseService,
     EnterpriseRepository,
-    {
-      provide: 'BrandService',
-      useClass: BrandService,
-    },
+    PopulateMetaService
   ],
-  exports: [OrganizationService, OrganizationRepository,EnterpriseService],
+  exports: [OrganizationService, OrganizationRepository, EnterpriseService, EnterpriseRepository, PopulateMetaService],
 })
-export class EnterpriseModule {}
+export class EnterpriseModule {
+}

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

@@ -1,13 +1,10 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm';
 
 @Entity({ name: 'sso_enterprise' })
 export class EnterpriseData {
   @PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
   id: number;
 
-  @Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
-  entity_type: string;
-
   @Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
   code: string;
 
@@ -23,15 +20,12 @@ export class EnterpriseData {
   @Column({ name: 'modified_by', type: 'int', nullable: true })
   modified_by: number;
 
-  @Column({ name: 'created_date', nullable: true })
+  @CreateDateColumn({ name: 'created_date', nullable: true })
   created_date: Date;
 
-  @Column({ name: 'modified_date', nullable: true })
+  @UpdateDateColumn({ name: 'modified_date', nullable: true })
   modified_date: Date;
 
-  @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })
-  appcode: string;
-
-  @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
-  app_url_name: string;
+  @Column({ name: 'slug', type: 'varchar', nullable: true, length: 50 })
+  slug: string;
 }

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

@@ -1,13 +1,27 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Unique } from 'typeorm';
+import { OrganizationData } from './organization.entity';
+import { AppMaster } from '../../app_master/entity/app-master.entity';
 
 @Entity({ name: 'sso_organization_app_mapping' })
+@Unique(['organization', 'app'])
 export class OrganizationAppMapping {
   @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
   id: number;
 
-  @Column({ name: 'organization_id', nullable: true })
-  organization_id: string;
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
 
-  @Column({ name: 'appcode', nullable: true })
+  @ManyToOne(() => OrganizationData, { nullable: true, onDelete: 'SET NULL' })
+  @JoinColumn({ name: 'organization_id', referencedColumnName: 'id' })
+  organization: OrganizationData;
+
+  @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: 'varchar', nullable: true})
   appcode: string;
 }