rez_core 7.0.0 → 7.0.1

package/src/module/lead/service/lead.service.ts

@@ -1,54 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { LeadRepository } from '../repository/lead.repository';
-
-@Injectable()
-export class LeadService {
-  constructor(private readonly leadRepository: LeadRepository) {}
-
-  async getAllOrganizations() {
-    const organizations = await this.leadRepository.getAllOrganizations();
-    return organizations.map((org) => ({
-      id: org.id,
-      name: org.name,
-      // Add other organization fields as needed
-    }));
-  }
-
-  async getBrandsByOrganization(organizationId: number) {
-    const brands =
-      await this.leadRepository.getBrandsByOrganization(organizationId);
-    if (!brands.length) {
-      throw new NotFoundException(
-        `No brands found for organization ID ${organizationId}`,
-      );
-    }
-    return brands.map((brand) => ({
-      id: brand.id,
-      name: brand.name,
-      organizationId: brand.organization_id,
-      // Add other brand fields as needed
-    }));
-  }
-
-  async getSchoolsByBrandAndOrganization(
-    brandId: number,
-    organizationId: number,
-  ) {
-    const schools = await this.leadRepository.getSchoolsByBrandAndOrganization(
-      brandId,
-      organizationId,
-    );
-    if (!schools.length) {
-      throw new NotFoundException(
-        `No schools found for brand ID ${brandId} and organization ID ${organizationId}`,
-      );
-    }
-    return schools.map((school) => ({
-      id: school.id,
-      name: school.name,
-      brandId: school.brand_id,
-      organizationId: school.organization_id,
-      // Add other school fields as needed
-    }));
-  }
-}

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

@@ -1,41 +0,0 @@
-import {
-  BadRequestException,
-  Controller,
-  Get,
-  Post,
-  Request,
-  UploadedFile,
-  UseGuards,
-  UseInterceptors,
-} from '@nestjs/common';
-import { MenuService } from '../service/menu.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { FileInterceptor } from '@nestjs/platform-express';
-import { Express } from 'express';
-import { ModuleImportService } from '../service/module-import.service';
-
-@Controller('menu')
-export class MenuController {
-  constructor(private readonly menuService: MenuService,
-              private readonly moduleImportService: ModuleImportService,) {}
-
-  @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);
-  }
-
-  @Post('upload-module-data')
-  @UseInterceptors(FileInterceptor('file'))
-  async uploadModuleDataXls(
-    @UploadedFile() file: Express.Multer.File,
-  ) {
-    if (!file) {
-      throw new BadRequestException('File is required');
-    }
-    return await this.moduleImportService.uploadModuleData(
-      file,
-    );
-  }
-}

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

@@ -1,138 +0,0 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Get, HttpCode, HttpStatus,
-  Inject,
-  Param,
-  Post,
-  Query,
-  Req,
-  Request,
-  UseGuards,
-} from '@nestjs/common';
-import { ModuleAccessService } from '../service/module-access.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { MenuService } from '../service/menu.service';
-
-@Controller('module-access')
-@UseGuards(JwtAuthGuard)
-export class ModuleAccessController {
-  constructor(
-    private readonly moduleAccessService: ModuleAccessService,
-    private readonly menuService: MenuService,
-  ) {}
-
-  @Get('roles')
-  @HttpCode(HttpStatus.OK)
-  async getRoles(
-    @Query('appcode') appcode: string,
-    @Query('include') include: string, // ✅ declare it as boolean
-    @Request() req,
-  ) {
-    const { level_type, level_id } = req.user.userData;
-
-    return this.moduleAccessService.getRoles({
-      appcode,
-      level_type,
-      level_id,
-      include: include === 'true', // ensure it's either true or false
-    });
-  }
-
-  @Get('modules')
-  @HttpCode(HttpStatus.OK)
-  async getModules(@Query('appcode') appcode: string, @Request() req) {
-     const loggedInUser = req.user.userData;
-    return this.moduleAccessService.getModules({
-      appcode,
-      loggedInUser
-    });
-  }
-
-  @Get('access-listing')
-  @HttpCode(HttpStatus.OK)
-  async getAccessListing(
-    @Query('roles') roleIds: string,
-    @Query('appcode') queryAppCode: string,
-    @Request() req,
-  ) {
-    const roleIdArray = roleIds.split(',').map(Number);
-    const appcode = queryAppCode || req.user.userData.appcode;
-    const level_type = req.user.userData.level_type;
-    const level_id = req.user.userData.level_id;
-    return this.moduleAccessService.getAccessListing(
-      roleIdArray,
-      appcode,
-      level_type,
-      level_id,
-    );
-  }
-
-  @Get('menu-listing')
-  @HttpCode(HttpStatus.OK)
-  async getMenuListing(
-    @Query('mainmod') mainModIds: string,
-    @Query('appcode') appcode: string,
-    @Request() req,
-  ) {
-    const mainModArray = mainModIds.split(',').map(String);
-    const { level_type } = req.user.userData;
-
-    return this.moduleAccessService.getMenuListing(
-      mainModArray,
-      appcode,
-      level_type,
-    );
-  }
-
-  @Post('update')
-  @HttpCode(HttpStatus.OK)
-  async updateModuleAccess(@Body() moduleAccessData: any[]) {
-    return this.moduleAccessService.updateModuleAccess(moduleAccessData);
-  }
-
-  // src/module/module-access/controller/module-access.controller.ts
-
-  @Get('ui-config')
-  @HttpCode(HttpStatus.OK)
-  async getModuleUIConfig(
-    @Query('module_code') moduleCode: string,
-    @Request() req,
-  ) {
-    const userId = req.user.userData?.id;
-    const app_id = req.user.userData?.app_id;
-    const roles = await this.menuService.getUserRoles(userId, app_id); // returns ['1', '4']
-
-    if (!roles || roles.length === 0) {
-      throw new BadRequestException('User has no roles');
-    }
-
-    return this.moduleAccessService.getModuleUIConfig(
-      moduleCode,
-      roles.map((id) => Number(id)),
-    );
-  }
-
-  @Get('user-permissions')
-  @HttpCode(HttpStatus.OK)
-  async getUserPermissions(@Request() req) {
-    const userData = req.user.userData;
-
-    const userId = userData?.id;
-    const appcode = userData?.appcode;
-    const level_type = userData?.level_type;
-    const level_id = userData?.level_id;
-
-    if (!userId || !appcode || !level_type || !level_id) {
-      throw new BadRequestException('Invalid token data');
-    }
-
-    return this.moduleAccessService.getUserPermissions({
-      userId,
-      appcode,
-      level_type,
-      level_id
-    });
-  }
-}

package/src/module/module/entity/menu.entity.ts

@@ -1,51 +0,0 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { ModuleData } from './module.entity';
-import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
-import { Exclude } from 'class-transformer';
-
-@Entity({ name: 'sso_menu' })
-export class MenuData {
-  @PrimaryGeneratedColumn({ type: 'int' })
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Exclude()
-  module_code:string;
-
-  @Column({ type: 'int', nullable: true })
-  module_id: number
-
-  @ManyToOne(() => ModuleData, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
-  moduleData: ModuleData;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  wbs_code: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  path: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  icon: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_level: string;
-
-  @Column({ type: 'int', nullable: true })
-  ui_visible: number;
-
-  @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 })
-  level_type: string;
-}

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

@@ -1,62 +0,0 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { ModuleData } from './module.entity';
-import { Role } from 'src/module/user/entity/role.entity';
-import { ModuleAction } from './module-action.entity';
-import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
-import { AppMaster } from '../../app_master/entity/app-master.entity';
-
-@Entity({ name: 'sso_module_access' })
-export class ModuleAccess {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'int', nullable: true })
-  module_id: number;
-
-  @ManyToOne(() => ModuleData, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
-  module: ModuleData;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  role_code: string;
-
-  @Column({ type: 'int', nullable: true })
-  role_id: number;
-
-  @ManyToOne(() => Role, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'role_id', referencedColumnName: 'id' })
-  role: Role;
-
-  @Column({ type: 'int', nullable: true })
-  access_flag: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  action_type: string;
-
-  @Column({ type: 'int', nullable: true })
-  action_id: number;
-
-  @ManyToOne(() => ModuleAction, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'action_id', referencedColumnName: 'id' })
-  action: ModuleAction;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  level_type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  appcode: string;
-
-  @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: 'int', nullable: true })
-  enterprise_id: number;
-
-  @ManyToOne(() => EnterpriseData, { nullable: true, onDelete: 'SET NULL' })
-  @JoinColumn({ name: 'enterprise_id', referencedColumnName: 'id' })
-  enterprise: EnterpriseData;
-}

package/src/module/module/entity/module-action.entity.ts

@@ -1,21 +0,0 @@
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-import { ModuleData } from './module.entity';
-
-@Entity({ name: 'sso_module_ucp' }) // <- new table name
-export class ModuleAction {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'int', nullable: true })
-  module_id: number;
-
-  @ManyToOne(() => ModuleData, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
-  module: ModuleData;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  action_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  action_code: string;
-}

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

@@ -1,45 +0,0 @@
-import { AppMaster } from 'src/module/app_master/entity/app-master.entity';
-import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_module' })
-export class ModuleData {
-  @PrimaryGeneratedColumn({ type: 'int' })
-  id: number;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  wbs_code: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  status: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  module_level: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  entity_type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  title: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  component_name: string;
-
-  @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', length: 100, nullable: true })
-  type: string;
-
-  @Column({ type: 'varchar', length: 100, nullable: true })
-  level_type: string;
-}

package/src/module/module/repository/menu.repository.ts

@@ -1,200 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { DataSource, Repository } from 'typeorm';
-import { MenuData } from '../entity/menu.entity';
-import { ModuleAccess } from '../entity/module-access.entity';
-import { InjectRepository } from '@nestjs/typeorm';
-import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
-
-@Injectable()
-export class MenuRepository extends Repository<MenuData> {
-  constructor(
-    private readonly dataSource: DataSource,
-    @InjectRepository(MenuData) private readonly menuData: Repository<MenuData>,
-    private readonly reflectionHelper: ReflectionHelper,
-    @InjectRepository(ModuleAccess)
-    private readonly moduleAccessRepo: Repository<ModuleAccess>,
-  ) {
-    super(MenuData, dataSource.createEntityManager());
-  }
-
-  async getUserRoles(userId: number, app_id: number): Promise<number[]> {
-    const userRoleMappingRepo =
-      this.reflectionHelper.getRepoService('UserRoleMapping');
-
-    const roles = await userRoleMappingRepo
-      .createQueryBuilder('urm')
-      .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-      .select('urm.role_id', 'role_id')
-      .where('urm.user_id = :userId', { userId })
-      .andWhere('role.app_id = :app_id', { app_id })
-      .getRawMany();
-
-    return roles.map((r) => r.role_id);
-  }
-
-  async getAccessibleModules(
-    roleIds: number[],
-    appcode: string,
-  ): Promise<number[]> {
-
-    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-    const appMaster = await appMasterRepo.findOne({
-      where: {
-        code: appcode
-      }
-    });
-
-    const modules = await this.moduleAccessRepo
-      .createQueryBuilder('moduleAccess')
-      .select('moduleAccess.module_id')
-      .where('moduleAccess.role_id IN (:...roleIds)', { roleIds })
-      .andWhere('moduleAccess.access_flag > 0')
-      .andWhere('moduleAccess.app_id = :app_id', { app_id: appMaster.id })
-      .getMany();
-
-    return Array.from(new Set(modules.map((module) => module.module_id)));
-  }
-
-  /**
-   * ✅ FIXED: Use this.createQueryBuilder() instead of this.menuData.createQueryBuilder()
-   */
-  async getMenuItems(
-    modules: number[],
-    appcode: string,
-    levelType: string,
-  ) {
-    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-
-    const appMaster = await appMasterRepo.findOne({
-      where: {
-        code: appcode
-      }
-    })
-
-    return await this.menuData
-      .createQueryBuilder('menu')
-      .leftJoin(
-        'sso_module',
-        'module',
-        `
-          menu.module_id = module.id
-          AND menu.app_id = module.app_id
-          AND menu.level_type = module.level_type
-        `,
-      )
-      .where('menu.module_id IN (:...modules)', { modules: modules })
-      .andWhere('menu.app_id = :app_id', { app_id: appMaster.id })
-      .andWhere('menu.level_type = :levelType', { levelType })
-      .andWhere('menu.ui_visible = 1')
-      .select([
-        'menu.*',
-        'module.module_code AS module_code',
-        'module.component_name AS component',
-        'module.title AS title',
-        'module.entity_type AS entity_type',
-        'module.type AS type'
-      ])
-      .getRawMany();
-  }
-
-  async resolveUserRoles(
-    userId: number,
-    appcode: string,
-    levelType: string,
-    levelId: number,
-  ): Promise<number[]> {
-    const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
-
-    const appMaster = await appMasterRepo.findOne({
-      where: {
-        code: appcode
-      }
-    })
-
-    const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
-
-    if (userId) {
-      // Check if user has any role mappings for the given appcode
-      const userRepo = this.reflectionHelper.getRepoService('UserData');
-      const getUserDetails = await userRepo.findOne({
-        where: {
-          id: userId,
-        },
-      });
-
-      // get user role from urm
-      const getUserUrm = await repo.findOne({
-        where: {
-          user_id: userId,
-          app: {
-            code: appcode
-          },
-        },
-      });
-
-      if (
-        getUserDetails &&
-        getUserDetails.enterprise_id === 1 &&
-        getUserUrm
-      ) {
-        return [Number(getUserUrm.role_id)];
-      }
-    }
-
-    // 1. Try exact level match
-    let roles = await repo
-      .createQueryBuilder('urm')
-      .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-      .select('urm.role_id')
-      .where('urm.user_id = :userId', { userId: userId })
-      .andWhere('urm.level_type = :levelType', { levelType })
-      .andWhere('urm.level_id = :levelId', { levelId: levelId })
-      .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
-      .getRawMany();
-
-    if (roles.length) return roles.map((r) => r.urm_role_id);
-
-    // 2. If SCH fallback → BRN → ORG
-    if (levelType === 'SCH') {
-      const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
-      const sch = await schoolRepo.findOne({
-        where: {
-          id: levelId,
-        },
-      });
-
-      const brandId = sch?.brand_id;
-      const orgId = sch?.organization_id;
-
-      if (brandId) {
-        roles = await repo
-          .createQueryBuilder('urm')
-          .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-          .select('urm.role_id')
-          .where('urm.user_id = :userId', { userId })
-          .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
-          .andWhere('urm.level_id = :levelId', { levelId: brandId })
-          .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
-          .getRawMany();
-
-        if (roles.length) return roles.map((r) => r.urm_role_id);
-      }
-
-      if (orgId) {
-        roles = await repo
-          .createQueryBuilder('urm')
-          .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-          .select('urm.role_id')
-          .where('urm.user_id = :userId', { userId })
-          .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
-          .andWhere('urm.level_id = :levelId', { levelId: orgId })
-          .andWhere('role.app_id = :app_id', { app_id: appMaster.id })
-          .getRawMany();
-
-        if (roles.length) return roles.map((r) => r.urm_role_id);
-      }
-    }
-
-    return [];
-  }
-}