rez_core 6.5.26 → 6.5.28

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';
@@ -31,12 +31,11 @@ import { ExportModule } from './module/export/export.module';
 
 @Module({
   imports: [
-    EntityModule,
     DatabaseModule,
     EnterpriseModule,
     UtilsModule,
     UserModule,
-    ModuleModule,
+    ModuleAccessModule,
     NotificationModule,
     Properties,
     LayoutModule,
@@ -62,7 +61,8 @@ import { ExportModule } from './module/export/export.module';
     MicroserviceClientsModule,
     LinkedAttributesModule,
     EntityJSONModule,
-    ExportModule
+    ExportModule,
+    EntityModule,
   ],
 })
-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';
@@ -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,
+        NotificationModule
+      ];
+      exportsArray = [
+        ConfigModule,
         UserModule,
-        ModuleModule,
+        ModuleAccessModule,
         LayoutModule,
         EnterpriseModule,
-      );
+        UtilsModule,
+        AuthModule,
+        NotificationModule
+      ];
+    } 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/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

@@ -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/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 '../../meta/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;
 }

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

@@ -1,27 +1,26 @@
-import { Column, Entity, PrimaryGeneratedColumn } 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;
 
-  @Column({ name: 'appcode', nullable: true })
-  appcode: string;
-
   @Column({ name: 'name', nullable: true })
   name: string;
 
   @Column({ name: 'status', type: 'varchar', nullable: true })
   status: string;
 
-  @Column({ name: 'seq_no', nullable: true })
-  seq_no: number;
+  @Column({ name: 'parent_id', nullable: true })
+  parent_id: number;
 
   @Column({ name: 'created_by', nullable: true })
   created_by: number;
@@ -29,61 +28,12 @@ export class OrganizationData {
   @Column({ name: 'modified_by', nullable: true })
   modified_by: number;
 
-  @Column({ name: 'created_date', nullable: true })
+  @CreateDateColumn({ name: 'created_date', nullable: true })
   created_date: Date;
 
-  @Column({ name: 'parent_id', nullable: true })
-  parent_id: number;
-
-  @Column({ name: 'modified_date', nullable: true })
+  @UpdateDateColumn({ name: 'modified_date', nullable: true })
   modified_date: Date;
 
-  @Column({ name: 'contact_number', nullable: true })
-  contact_number: string;
-
-  @Column({ name: 'email', nullable: true })
-  emailId: string;
-
-  @Column({ name: 'entity_type', nullable: true })
-  entity_type: string;
-
-  @Column({ name: 'primary_contact_name', nullable: true })
-  primary_contact_name: string;
-
-  @Column({ name: 'address', nullable: true })
-  address: string;
-
-  @Column({ name: 'gstin', nullable: true })
-  gstin: string;
-
-  @Column({ name: 'company_pan_number', nullable: true })
-  company_pan_number: string;
-
-  @Column({ name: 'bankacc_benef_name', nullable: true })
-  bankacc_benef_name: string;
-
-  @Column({ name: 'bankacc_bank_name', nullable: true })
-  bankacc_bank_name: string;
-
-  @Column({ name: 'bankacc_account_number', nullable: true })
-  bankaccAccountNumber: string;
-
-  @Column({ name: 'bankacc_branch_ifsc', nullable: true })
-  bankacc_account_number: string;
-
-  @Column({
-    name: 'organization_type',
-    type: 'varchar',
-    nullable: true,
-  })
-  organization_type: string;
-
-  @Column({ name: 'is_brand', type: 'boolean', nullable: true })
-  is_brand: boolean;
-
-  @Column({ name: 'type', nullable: true })
-  type: string;
-
   @Column({ name: 'wbs_code', nullable: true })
   wbs_code: string;
 

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

@@ -10,22 +10,44 @@ export class EnterpriseRepository {
     private readonly enterpriseRepository: Repository<EnterpriseData>,
   ) {}
 
-  async save(enterpriseData: EnterpriseData) {
-    enterpriseData.created_date = new Date();
+  async save(enterpriseData: EnterpriseData, loggedInUser: any) {
+    if (loggedInUser) {
+      enterpriseData.created_by = loggedInUser.id;
+      enterpriseData.modified_by = loggedInUser.id;
+    }
     return await this.enterpriseRepository.save(enterpriseData);
   }
 
-  async update(enterpriseData: EnterpriseData): Promise<EnterpriseData | null> {
+  async update(
+    enterpriseData: EnterpriseData,
+    loggedInUser: any,
+  ): Promise<EnterpriseData | null> {
     const existingEnterprise = await this.enterpriseRepository.findOne({
       where: { id: enterpriseData.id },
     });
     if (!existingEnterprise) {
       throw new Error(`Enterprise with id ${enterpriseData.id} not found`);
     }
-    enterpriseData.modified_date = new Date();
+    if (loggedInUser) {
+      enterpriseData.modified_by = loggedInUser.id;
+    }
     await this.enterpriseRepository.update(enterpriseData.id, enterpriseData);
     return await this.enterpriseRepository.findOne({
       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/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();
+//   }
+// }