rez_core 6.5.1 → 6.5.3

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -1,5 +1,9 @@
 import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
+import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { Column, Entity, JoinColumn, ManyToMany, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
+import { UserData } from './user.entity';
+import { Role } from './role.entity';
 
 @Entity({ name: 'sso_user_role_mapping' })
 export class UserRoleMapping {
@@ -15,21 +19,43 @@ export class UserRoleMapping {
   @Column({ type: 'varchar', nullable: true })
   entity_type: string;
 
-  @Column({ type: 'bigint', nullable: true })
+  @Column({type: 'bigint'})
   user_id: number;
 
-  @Column({ type: 'bigint', nullable: true })
+  @ManyToOne(() => UserData, {nullable: true, onDelete: 'SET NULL'})
+  @JoinColumn({ name: 'user_id', referencedColumnName: 'id' })
+  user: UserData;
+
+  @Column({type: 'bigint', 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 })
   organization_id: number;
 
+  @Column({ name: 'enterprise_id', nullable: true })
+  enterprise_id: number;
+
+  @ManyToOne(() => EnterpriseData, {nullable: true, onDelete: 'SET NULL'})
+  @JoinColumn({ name: 'enterprise_id', referencedColumnName: 'id' })
+  enterpriseData: EnterpriseData;
+
   @Column({ type: 'int', nullable: true })
   is_default: number;
 
   @Column({ type: 'varchar', 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({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
   level_id: string;
 

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

@@ -1,13 +1,43 @@
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
+import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_user' })
-export class UserData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_USER;
-  }
+export class UserData {
+
+  @PrimaryGeneratedColumn({ type: 'bigint' })
+  id: number;
+
+  @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;
+
+  @CreateDateColumn()
+  created_date: Date;
+
+  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
+  modified_by: number;
+
+  @CreateDateColumn()
+  modified_date: Date;
+
+  @Column({ name: 'enterprise_id', type: 'int', nullable: true })
+  enterprise_id: number;
+
+  @ManyToOne(() => EnterpriseData, { nullable: true, onDelete: 'SET NULL' })
+  @JoinColumn({ name: 'enterprise_id', referencedColumnName: 'id' })
+  enterprise: EnterpriseData;
+
+  @Column({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
+  level_id: string;
+
+  @Column({ name: 'level_type', type: 'varchar', length: 100, nullable: true })
+  level_type: string;
 
   @Column({ type: 'varchar', length: 50, nullable: true })
   first_name: string;
@@ -39,14 +69,15 @@ export class UserData extends BaseEntity {
   @Column({ type: 'int', nullable: true })
   is_customer: number;
 
-  @Column({ type: 'int', nullable: true })
-  organization_id: number;
-
   @Column({ type: 'int', nullable: true })
   is_factory: number;
 
-  @Column({ type: 'varchar', nullable: true })
-  last_app_access: string;
+  @Column({ name: 'last_app_access_id', type: 'int', nullable: true })
+  last_app_access_id: number;
+
+  @ManyToOne(() => AppMaster)
+  @JoinColumn({ name: 'last_app_access_id' })
+  last_app: AppMaster;
 
   @Column({ type: 'varchar', nullable: true })
   last_level_type: string;
@@ -59,4 +90,14 @@ export class UserData extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   profile_image: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
+
+  @Column({ name: 'app_id', type: 'int', nullable: true })
+  app_id: number;
+
+  @ManyToOne(() => AppMaster, { nullable: true, onDelete: 'SET NULL' })
+  @JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
+  app: AppMaster;
 }

package/src/module/user/repository/role.repository.ts

@@ -16,7 +16,7 @@ export class RoleRepository {
 
   public async isRoleNameExists(
     name: string,
-    options?: { excludeRoleId?: number; organization_id?: number },
+    options?: { excludeRoleId?: number; enterprise_id?: number },
   ): Promise<boolean> {
     const query = this.roleRepo
       .createQueryBuilder('role')
@@ -28,9 +28,9 @@ export class RoleRepository {
       });
     }
 
-    if (options?.organization_id !== undefined) {
-      query.andWhere('role.organization_id = :organization_id', {
-        organization_id: options.organization_id,
+    if (options?.enterprise_id !== undefined) {
+      query.andWhere('role.enterprise_id = :enterprise_id', {
+        enterprise_id: options.enterprise_id,
       });
     }
 
@@ -53,11 +53,12 @@ export class RoleRepository {
    * Confirm level_type and level_id correspond to existing org/school.
     */
 
+
   public async isRoleNameWithLevelExists(
     name: string,
     options?: {
       excludeRoleId?: number;
-      organization_id?: number;
+      enterprise_id?: number;
       level_type?: string;
       level_id?: number;
     },
@@ -72,12 +73,6 @@ export class RoleRepository {
       });
     }
 
-    if (options?.organization_id !== undefined) {
-      query.andWhere('role.organization_id = :organization_id', {
-        organization_id: options.organization_id,
-      });
-    }
-
     if (options?.level_type) {
       query.andWhere('role.level_type = :level_type', {
         level_type: options.level_type,
@@ -93,4 +88,17 @@ export class RoleRepository {
     const existingRole = await query.getOne();
     return !!existingRole;
   }
+
+  async findById(id: number) {
+    return this.roleRepo.findOne({ where: { id } });
+  }
+
+  async saveRole(role: Role) {
+    let entity = this.roleRepo.create(role);
+    return await this.roleRepo.save(entity);
+  }
+
+  async updateRole(id:number, role:Role) {
+    return await this.roleRepo.update(id, role);
+  }
 }

package/src/module/user/repository/user.repository.ts

@@ -15,27 +15,27 @@ export class UserRepository {
   }
   async findByEmailId(
     email: string,
-    organization_id?: number,
+    enterprise_id?: number,
   ): Promise<UserData | null> {
     if (!email) return null;
 
     const where: any = { email_id: email };
-    if (organization_id !== undefined) {
-      where.organization_id = organization_id;
+    if (enterprise_id !== undefined) {
+      where.enterprise_id = enterprise_id;
     }
     return this.userRepository.findOne({ where });
   }
 
   async findByMobile(
     mobile: string,
-    organization_id?: number,
+    enterprise_id?: number,
     appCode?: string,
   ): Promise<UserData | null> {
     if (!mobile) return null;
 
     const where: any = { mobile };
-    if (organization_id !== undefined) {
-      where.organization_id = organization_id;
+    if (enterprise_id !== undefined) {
+      where.enterprise_id = enterprise_id;
     }
     if (appCode !== undefined) {
       where.appcode = appCode;
@@ -47,4 +47,8 @@ export class UserRepository {
   async saveUser(user: UserData): Promise<UserData> {
     return this.userRepository.save(user);
   }
+
+  async updateUser(id: number, user: UserData) {
+    return await this.userRepository.update(id, user);
+  }
 }

package/src/module/user/service/login.service.ts

@@ -2,8 +2,6 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { InjectRepository } from '@nestjs/typeorm';
 import { INVITATION_STATUS_ACCEPTED, STATUS_ACTIVE } from 'src/constant/global.constant';
-import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { Repository } from 'typeorm';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
@@ -11,6 +9,8 @@ import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
+import { StatusConstant } from '../../../constant/status.constant';
 
 @Injectable()
 export class LoginService {
@@ -20,9 +20,7 @@ export class LoginService {
     private configService: ConfigService,
     @InjectRepository(UserRoleMapping)
     private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
-    private readonly organizationRepository: OrganizationRepository,
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
+    private readonly enterpriseRepository: EnterpriseRepository,
     private readonly jwtAuthService: JwtAuthService,
     private readonly reflectionHelper: ReflectionHelper,
   ) {
@@ -39,18 +37,18 @@ export class LoginService {
   }): Promise<any> {
     const { email_id, password, is_otp = false, subdomain } = data;
 
-    let organization;
+    let enterprise;
 
     if (subdomain) {
-      organization =
-        await this.organizationRepository.findOrganizationBySubdomain(
+      enterprise =
+        await this.enterpriseRepository.findEnterpriseBySubdomain(
           subdomain,
         );
 
-      if (!organization) {
+      if (!enterprise) {
         return {
           success: false,
-          message: 'Organization not found.',
+          message: 'Enterprise not found.',
         };
       }
     }
@@ -58,34 +56,29 @@ export class LoginService {
     // 🔹 Step 2: Find the user by email + organization check
     const user = await this.userService.findByEmailId(
       email_id,
-      organization?.id,
+      enterprise?.id,
     );
 
-    if (!user || (organization && user.organization_id !== organization.id)) {
+    if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
       return {
         success: false,
-        message: 'User not found in organization.',
+        message: 'User not found in Enterprise.',
       };
     }
 
     // 🔹 Step 3: Verify org status
-    const userOrgData = await this.organizationRepository.findOrganizationById(
-      user.organization_id,
-    );
-
-    const resolveStatus = await this.listMasterService.getResolvedListCode(
-      STATUS_ACTIVE,
-      user?.organization_id || 0,
+    const userOrgData = await this.enterpriseRepository.findById(
+      user.enterprise_id,
     );
 
     if (
-      user.status != resolveStatus.id ||
-      userOrgData?.status != resolveStatus.id
+      user.status != StatusConstant.ACTIVE ||
+      userOrgData?.status != StatusConstant.ACTIVE
     ) {
       return {
         success: false,
         message:
-          'Your account or organization is inactive. Please contact admin.',
+          'Your account or Enterprise is inactive. Please contact admin.',
       };
     }
 
@@ -107,16 +100,16 @@ export class LoginService {
     }
 
     // 🔹 Step 5: App access check
-    let appcode = user.last_app_access;
+    let app_id = user.last_app_access_id;
 
-    if (!user.last_app_access || user.last_app_access == '') {
-      await this.userService.setDefaultLastAccess(user.id, appcode);
+    if (!user.last_app_access_id) {
+      await this.userService.setDefaultLastAccess(user.id, app_id);
     }
 
     const whereCondition: any = { user_id: user.id };
 
-    if (appcode && appcode !== '') {
-      whereCondition.appcode = appcode;
+    if (app_id) {
+      whereCondition.app_id = app_id;
     }
 
     const roleMappings = await this.userRoleMappingRepository.find({
@@ -137,33 +130,28 @@ export class LoginService {
       user.id,
       defaultAccess.level_type,
       defaultAccess.level_id,
-      defaultAccess.appcode,
+      defaultAccess.app_id,
     );
 
     const token = await this.userSessionService.createSession(
       user,
-      defaultAccess.appcode,
+      defaultAccess.app_id,
       defaultAccess,
     );
 
     // 🔹 Step 7: Update first login + invitation status
-    const resolvedInvitationStatus =
-      await this.listMasterService.getResolvedListCode(
-        INVITATION_STATUS_ACCEPTED,
-        user?.organization_id || 0,
-      );
 
     if (user.is_firstlogin === 1) {
-      user.invitation_status = resolvedInvitationStatus.id;
+      user.invitation_status = INVITATION_STATUS_ACCEPTED;
       user.is_firstlogin = 0;
       const { password, ...userWithoutPassword } = user;
-      await this.userService.updateEntity(userWithoutPassword, user);
+      await this.userService.updateUser(user.id, userWithoutPassword, user);
     }
 
     // 🔹 Step 8: Return response
 
-    const org = await this.organizationRepository.findOrganizationById(
-      user.organization_id,
+    const org = await this.enterpriseRepository.findById(
+      user.enterprise_id,
     );
     let slug: string;
     if (org) {
@@ -171,14 +159,14 @@ export class LoginService {
     } else {
       return {
         success: false,
-        message: 'Organization not found for the user.',
+        message: 'Enterprise not found for the user.',
       };
     }
 
     return {
       success: true,
       accessToken: token,
-      appcode: defaultAccess.appcode,
+      app_id: defaultAccess.app_id,
       level_type: defaultAccess.level_type,
       level_id: defaultAccess.level_id,
       slug: slug,
@@ -187,7 +175,7 @@ export class LoginService {
 
   async formLogin(body: any): Promise<any> {
     if (body) {
-      const { entity_type, entity_id } = body;
+      const { entity_id } = body;
 
       const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
       const entityData = await leadRepo.findOne({
@@ -197,12 +185,12 @@ export class LoginService {
       if (entityData) {
         const level_id = entityData.level_id;
         const level_type = entityData.level_type;
-        const organization_id = entityData.organization_id;
+        const enterprise_id = entityData.enterprise_id;
 
         const token = this.jwtAuthService.generateJwt({
           level_id: level_id,
           level_type: level_type,
-          organization_id: organization_id,
+          enterprise_id: enterprise_id,
         });
 
         return {
@@ -216,7 +204,7 @@ export class LoginService {
   private async getDefaultAccess(
     user: any,
     roleMappings: any[],
-  ): Promise<{ level_type: string; level_id: string; appcode: string }> {
+  ): Promise<{ level_type: string; level_id: string; app_id: number }> {
     const orgAccess = roleMappings.find((r) => r.level_type === 'ORG');
     const brnAccesses = roleMappings.filter((r) => r.level_type === 'BRN');
     const schAccesses = roleMappings.filter((r) => r.level_type === 'SCH');
@@ -224,7 +212,7 @@ export class LoginService {
     let validURM;
 
     validURM = roleMappings.some(
-      (r) => r.level_type == 'ORG' && r.level_id == user.organization_id,
+      (r) => r.level_type == 'ORG' && r.level_id == user.enterprise_id,
     );
 
     if (!validURM) {
@@ -239,7 +227,7 @@ export class LoginService {
       return {
         level_type: user.last_level_type,
         level_id: user.last_level_id,
-        appcode: user.last_app_access,
+        app_id: user.last_app_access_id,
       };
     }
 
@@ -247,7 +235,7 @@ export class LoginService {
       return {
         level_type: 'ORG',
         level_id: orgAccess.level_id,
-        appcode: orgAccess.appcode,
+        app_id: orgAccess.app_id,
       };
     }
 
@@ -269,7 +257,7 @@ export class LoginService {
         return {
           level_type: 'SCH',
           level_id: rows.id,
-          appcode: brnAccesses[0].appcode,
+          app_id: brnAccesses[0].app_id,
         };
       } else {
         throw new BadRequestException(
@@ -282,7 +270,7 @@ export class LoginService {
       return {
         level_type: 'SCH',
         level_id: schAccesses[0].level_id,
-        appcode: schAccesses[0].appcode,
+        app_id: schAccesses[0].app_id,
       };
     }
 

package/src/module/user/service/role.service.ts

@@ -1,69 +1,59 @@
-import { BadRequestException, Inject, Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { Injectable } from '@nestjs/common';
 import { UserData } from '../entity/user.entity';
 import { Role } from '../entity/role.entity';
-import { ENTITYTYPE_ROLE, STATUS_INACTIVE } from 'src/constant/global.constant';
+import { STATUS_ACTIVE, STATUS_INACTIVE } from 'src/constant/global.constant';
 import { RoleRepository } from '../repository/role.repository';
-import { EntityManager, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ModuleAccess } from '../../module/entity/module-access.entity';
-import { ServiceResult } from 'src/dtos/response';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { UserRoleMappingRepository } from '../repository/user-role-mapping.repository';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
+import { plainToInstance } from 'class-transformer';
 
 @Injectable()
-export class RoleService extends EntityServiceImpl {
+export class RoleService {
   constructor(
     private readonly roleRepository: RoleRepository,
-    private readonly entityManager: EntityManager,
     @InjectRepository(ModuleAccess)
     private readonly moduleAccessRepo: Repository<ModuleAccess>,
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
     @InjectRepository(UserRoleMapping)
     private readonly userRoleMappingRepo: Repository<UserRoleMapping>,
   ) {
-    super();
   }
 
-  async createEntity(
-    entityData: BaseEntity,
+  async createRole(
+    role: Role,
     loggedInUser: UserData,
-  ): Promise<ServiceResult<BaseEntity>> {
-    const role = entityData as Role;
+  ) {
 
     // if level_type and level_id are not provided, use loggedInUser's values
-    role.level_type = entityData.level_type || loggedInUser.level_type;
-    role.level_id = entityData.level_id || loggedInUser.level_id;
-    role.appcode = entityData.appcode || loggedInUser.appcode;
+    role.level_type = role.level_type || loggedInUser.level_type;
+    role.level_id = role.level_id || loggedInUser.level_id;
+    role.created_by = loggedInUser.id;
+    role.enterprise_id = loggedInUser.enterprise_id;
+    // role.appcode = role.appcode || loggedInUser.appcode;
 
     if (
       await this.roleRepository.isRoleNameWithLevelExists(role.name, {
-        organization_id: loggedInUser?.organization_id || undefined,
-        level_type: entityData.level_type || loggedInUser?.level_type,
+        enterprise_id: loggedInUser.enterprise_id,
+        level_type: role.level_type || loggedInUser?.level_type,
         level_id:
-          parseInt(entityData.level_id) ||
+          parseInt(role.level_id) ||
           parseInt(loggedInUser?.level_id || '', 10),
       })
     ) {
       return { success: false, error: 'Role name already exists.' };
     }
 
+
     const sourceRole = role.copy_from_role_id
-      ? await this.getEntityData(
-          ENTITYTYPE_ROLE,
-          role.copy_from_role_id,
-          loggedInUser,
-        )
+      ? await this.roleRepository.findById(role.copy_from_role_id)
       : null;
 
     if (role.copy_from_role_id && !sourceRole) {
       return { success: false, error: 'Source role not found.' };
     }
-
-    const savedRole = await super.createEntity(role, loggedInUser);
+    role.status = STATUS_ACTIVE;
+    const savedRole = await this.roleRepository.saveRole(role);
     if (sourceRole) {
       const sourcePermissions = await this.moduleAccessRepo.find({
         where: { role_code: sourceRole.code },
@@ -85,40 +75,31 @@ export class RoleService extends EntityServiceImpl {
     return { success: true, data: savedRole };
   }
 
-  async updateEntity(
-    entityData: BaseEntity,
+  async updateRole(
+    id: number,
+    role: Role,
     loggedInUser: UserData,
-  ): Promise<ServiceResult<BaseEntity>> {
-    if (!entityData.name) {
+  ) {
+    if (!role.name) {
       return { success: false, error: 'Role name is required' };
     }
-    const role = entityData as Role;
-
-    const resolveStatus = await this.listMasterService.getResolvedListCode(
-      STATUS_INACTIVE,
-      loggedInUser?.organization_id || 0,
-    );
 
-    if (entityData.status == resolveStatus.id) {
+    if (role.status == STATUS_INACTIVE) {
       //get role by id
-      const existingRole = await this.getEntityData(
-        ENTITYTYPE_ROLE,
-        entityData.id,
-        loggedInUser,
-      );
+      const existingRole = await this.roleRepository.findById(id);
 
       if (!existingRole) {
         return { success: false, error: 'Role not found' };
       }
 
       const associatedUsers = await this.userRoleMappingRepo
-        .createQueryBuilder("map")
-        .innerJoin("sso_user", "usr", "map.user_id = usr.id")
-        .where("usr.status::text = :status", { status: String(resolveStatus.id) })
-        .andWhere("map.role_id::text = :roleId", {
+        .createQueryBuilder('map')
+        .innerJoin('sso_user', 'usr', 'map.user_id = usr.id')
+        .where('usr.status::text = :status', { status: STATUS_INACTIVE })
+        .andWhere('map.role_id::text = :roleId', {
           roleId: String(existingRole?.id),
         })
-        .select("map") // same as SELECT map.*
+        .select('map') // same as SELECT map.*
         .getRawMany();
 
       if (associatedUsers.length > 0) {
@@ -137,9 +118,9 @@ export class RoleService extends EntityServiceImpl {
     }
 
     if (
-      await this.roleRepository.isRoleNameExists(entityData.name, {
-        excludeRoleId: entityData.id,
-        organization_id: loggedInUser?.organization_id,
+      await this.roleRepository.isRoleNameExists(role.name, {
+        excludeRoleId: role.id,
+        enterprise_id: loggedInUser?.enterprise_id,
       })
     ) {
       return {
@@ -149,14 +130,13 @@ export class RoleService extends EntityServiceImpl {
     }
 
     const { copy_from_role_id, ...persistableData } = role;
-    const updatedRole = await super.updateEntity(persistableData, loggedInUser);
+
+    const entity = plainToInstance(Role, persistableData);
+    const updatedRole = await this.roleRepository.updateRole(id, entity);
 
     if (role.copy_from_role_id) {
-      const sourceRole = await this.getEntityData(
-        ENTITYTYPE_ROLE,
-        role.copy_from_role_id,
-        loggedInUser,
-      );
+
+      const sourceRole = await this.roleRepository.findById(role.copy_from_role_id);
 
       if (!sourceRole) {
         return {