rez_core 6.5.23 → 6.5.26

package/src/module/user/dto/create-user.dto.ts

@@ -2,26 +2,12 @@ import { IsNotEmpty, IsString, Matches } from 'class-validator';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_USER } from '../../../constant/global.constant';
 import { Expose } from 'class-transformer';
-import { Column } from 'typeorm';
 
-export class CreateUserDto{
-
-  status: string;
-
-  code: string;
-
-  @Column({ name: 'enterprise_id', type: 'int', nullable: true })
-  @Expose()
-  enterprise_id: number | undefined;
-
-
-  @Column({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  level_id: string;
-
-  @Column({ name: 'level_type', type: 'varchar', length: 100, nullable: true })
-  @Expose()
-  level_type: string;
+export class CreateUserDto extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
 
   @IsString()
   @IsNotEmpty()
@@ -61,6 +47,7 @@ export class CreateUserDto{
   @Expose()
   mobile: string;
 
+  @Expose()
   roles: any[];
 
   is_firstlogin: number;

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

@@ -1,68 +1,14 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
+import { Column, Entity } from 'typeorm';
 import { Exclude } from 'class-transformer';
-import { EnterpriseData } from '../../enterprise/entity/enterprise.entity';
-import { AppMaster } from '../../meta/entity/app-master.entity';
 
 @Entity({ name: 'sso_role' })
-export class Role {
-
-  @PrimaryGeneratedColumn({ type: 'bigint' })
-  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;
-
-  @CreateDateColumn()
-  created_date: Date;
-
-  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
-  modified_by: number;
-
-  @UpdateDateColumn()
-  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: 'organization_id', type: 'int', nullable: true })
-  organization_id: number;
-
-  @Column({ name: 'appcode', type: 'varchar', length: 100, 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;
-
-  @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;
+export class Role extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_ROLE;
+  }
 
   @Column({ type: 'int', nullable: true })
   is_system: number;
@@ -70,10 +16,18 @@ export class Role {
   @Column({ type: 'varchar', length: 250, nullable: true })
   description: string;
 
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
   @Exclude()
   copy_from_role_id: number;
 
   @Column({ type: 'int', nullable: true })
   is_factory: number;
 
+  @Column({ type: 'varchar', length: 250, nullable: true })
+  parent_type: string;
+
+  @Column({ type: 'int', nullable: true })
+  parent_id: number;
 }

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

@@ -1,9 +1,5 @@
 import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
-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';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_user_role_mapping' })
 export class UserRoleMapping {
@@ -19,43 +15,21 @@ export class UserRoleMapping {
   @Column({ type: 'varchar', nullable: true })
   entity_type: string;
 
-  @Column({type: 'bigint'})
+  @Column({ type: 'bigint', nullable: true })
   user_id: number;
 
-  @ManyToOne(() => UserData, {nullable: true, onDelete: 'SET NULL'})
-  @JoinColumn({ name: 'user_id', referencedColumnName: 'id' })
-  user: UserData;
-
-  @Column({type: 'bigint', nullable: true})
+  @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-session.entity.ts

@@ -1,4 +1,4 @@
-import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_user_session' })
 export class UserSession {
@@ -19,8 +19,9 @@ export class UserSession {
   })
   login_id: string;
 
-  @CreateDateColumn({
-    name: 'login_time'
+  @Column({
+    name: 'login_time',
+    nullable: true,
   })
   login_time: Date;
 

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

@@ -1,43 +1,13 @@
-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';
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
 @Entity({ name: 'sso_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;
+export class UserData extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
 
   @Column({ type: 'varchar', length: 50, nullable: true })
   first_name: string;
@@ -70,14 +40,13 @@ export class UserData {
   is_customer: number;
 
   @Column({ type: 'int', nullable: true })
-  is_factory: number;
+  organization_id: number;
 
-  @Column({ name: 'last_app_access_id', type: 'int', nullable: true })
-  last_app_access_id: number;
+  @Column({ type: 'int', nullable: true })
+  is_factory: number;
 
-  @ManyToOne(() => AppMaster)
-  @JoinColumn({ name: 'last_app_access_id' })
-  last_app: AppMaster;
+  @Column({ type: 'varchar', nullable: true })
+  last_app_access: string;
 
   @Column({ type: 'varchar', nullable: true })
   last_level_type: string;
@@ -90,14 +59,4 @@ export class UserData {
 
   @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

@@ -8,7 +8,7 @@ export class RoleRepository {
   constructor(
     @InjectRepository(Role)
     private readonly roleRepo: Repository<Role>,
-  ) { }
+  ) {}
 
   async findByCode(code: string): Promise<Role | null> {
     return this.roleRepo.findOne({ where: { code } });
@@ -16,7 +16,7 @@ export class RoleRepository {
 
   public async isRoleNameExists(
     name: string,
-    options?: { excludeRoleId?: number; enterprise_id?: number },
+    options?: { excludeRoleId?: number; organization_id?: number },
   ): Promise<boolean> {
     const query = this.roleRepo
       .createQueryBuilder('role')
@@ -28,9 +28,9 @@ export class RoleRepository {
       });
     }
 
-    if (options?.enterprise_id !== undefined) {
-      query.andWhere('role.enterprise_id = :enterprise_id', {
-        enterprise_id: options.enterprise_id,
+    if (options?.organization_id !== undefined) {
+      query.andWhere('role.organization_id = :organization_id', {
+        organization_id: options.organization_id,
       });
     }
 
@@ -53,12 +53,11 @@ export class RoleRepository {
    * Confirm level_type and level_id correspond to existing org/school.
     */
 
-
   public async isRoleNameWithLevelExists(
     name: string,
     options?: {
       excludeRoleId?: number;
-      enterprise_id?: number;
+      organization_id?: number;
       level_type?: string;
       level_id?: number;
     },
@@ -73,6 +72,12 @@ 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,
@@ -88,21 +93,4 @@ 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);
-  }
-
-  async findRoles(options: any): Promise<Role[]> {
-    return await this.roleRepo.find(options);
-  }
 }

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

@@ -9,7 +9,7 @@ export class UserRoleMappingRepository {
   constructor(
     @InjectRepository(UserRoleMapping)
     private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
-  ) { }
+  ) {}
 
   async save(
     userRoleMapping: UserRoleMapping,
@@ -123,8 +123,4 @@ export class UserRoleMappingRepository {
       },
     });
   }
-
-  async find(options: any): Promise<UserRoleMapping[]> {
-    return await this.userRoleMappingRepository.find(options);
-  }
 }

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

@@ -8,46 +8,34 @@ import { InjectRepository } from '@nestjs/typeorm';
 export class UserRepository {
   constructor(
     @InjectRepository(UserData) private userRepository: Repository<UserData>,
-  ) { }
+  ) {}
 
   async findById(userId: number): Promise<UserData | null> {
     return this.userRepository.findOne({ where: { id: userId } });
   }
-
   async findByEmailId(
     email: string,
-    enterprise_id?: number,
-    getLastApp?: boolean,
+    organization_id?: number,
   ): Promise<UserData | null> {
     if (!email) return null;
 
     const where: any = { email_id: email };
-
-    if (enterprise_id !== undefined) {
-      where.enterprise_id = enterprise_id;
-    }
-
-    const options: any = { where };
-
-    if (getLastApp) {
-      options.relations = {
-        last_app: true,
-      };
+    if (organization_id !== undefined) {
+      where.organization_id = organization_id;
     }
-
-    return this.userRepository.findOne(options);
+    return this.userRepository.findOne({ where });
   }
 
   async findByMobile(
     mobile: string,
-    enterprise_id?: number,
+    organization_id?: number,
     appCode?: string,
   ): Promise<UserData | null> {
     if (!mobile) return null;
 
     const where: any = { mobile };
-    if (enterprise_id !== undefined) {
-      where.enterprise_id = enterprise_id;
+    if (organization_id !== undefined) {
+      where.organization_id = organization_id;
     }
     if (appCode !== undefined) {
       where.appcode = appCode;
@@ -59,12 +47,4 @@ 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);
-  }
-
-  async find(options: any): Promise<UserData[]> {
-    return await this.userRepository.find(options);
-  }
 }

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

@@ -8,7 +8,7 @@ export class UserSessionRepository {
   constructor(
     @InjectRepository(UserSession)
     private userSessionRepo: Repository<UserSession>,
-  ) { }
+  ) {}
 
   async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
     return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
@@ -24,10 +24,6 @@ export class UserSessionRepository {
     return this.userSessionRepo.save(session);
   }
 
-  async fetchUserFcmToken(user_id: number) {
-    return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
-  }
-
   async logoutSession(sessionKey: string): Promise<void> {
     await this.userSessionRepo.update(
       { session_key: sessionKey },