rez_core 4.0.151 → 4.0.152

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

@@ -1,38 +1,38 @@
-import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_user_role_mapping' })
-export class UserRoleMapping {
-  constructor(user_id: number, role_id: number) {
-    this.user_id = user_id;
-    this.role_id = role_id;
-    this.entity_type = ENTITYTYPE_USRROLMAP;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'varchar', nullable: true })
-  entity_type: string;
-
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  organization_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  is_default: number;
-
-  @Column({ type: 'varchar', nullable: true })
-  appcode: string;
-
-  @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;
-}
+import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_user_role_mapping' })
+export class UserRoleMapping {
+  constructor(user_id: number, role_id: number) {
+    this.user_id = user_id;
+    this.role_id = role_id;
+    this.entity_type = ENTITYTYPE_USRROLMAP;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'varchar' })
+  entity_type: string;
+
+  @Column({ type: 'bigint', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  role_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  is_default: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  appcode: string;
+
+  @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;
+}

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

@@ -1,73 +1,73 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_user_session' })
-export class UserSession {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({
-    name: 'is_session_loggedout',
-    nullable: true,
-    type: 'int',
-  })
-  is_session_loggedout: number;
-
-  @Column({
-    name: 'login_id',
-    nullable: true,
-    length: 50,
-  })
-  login_id: string;
-
-  @Column({
-    name: 'login_time',
-    nullable: true,
-  })
-  login_time: Date;
-
-  @Column({
-    name: 'logout_time',
-    nullable: true,
-  })
-  logout_time: Date;
-
-  @Column({
-    name: 'session_key',
-    nullable: true,
-    length: 100,
-  })
-  session_key: string;
-
-  @Column({
-    name: 'user_id',
-    nullable: true,
-    type: 'bigint',
-  })
-  user_id: number;
-
-  @Column({
-    name: 'access_token',
-    nullable: true,
-    type: 'varchar',
-    length: 5000,
-  })
-  access_token: string;
-
-  @Column({
-    name: 'expiry_date',
-    nullable: true,
-  })
-  expiry_date: Date;
-
-  @Column({ type: 'varchar', nullable: true })
-  fcm_token: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  browser: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  ip: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  os: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_user_session' })
+export class UserSession {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({
+    name: 'is_session_loggedout',
+    nullable: true,
+    type: 'int',
+  })
+  is_session_loggedout: number;
+
+  @Column({
+    name: 'login_id',
+    nullable: true,
+    length: 50,
+  })
+  login_id: string;
+
+  @Column({
+    name: 'login_time',
+    nullable: true,
+  })
+  login_time: Date;
+
+  @Column({
+    name: 'logout_time',
+    nullable: true,
+  })
+  logout_time: Date;
+
+  @Column({
+    name: 'session_key',
+    nullable: true,
+    length: 100,
+  })
+  session_key: string;
+
+  @Column({
+    name: 'user_id',
+    nullable: true,
+    type: 'bigint',
+  })
+  user_id: number;
+
+  @Column({
+    name: 'access_token',
+    nullable: true,
+    type: 'varchar',
+    length: 5000,
+  })
+  access_token: string;
+
+  @Column({
+    name: 'expiry_date',
+    nullable: true,
+  })
+  expiry_date: Date;
+
+  @Column({ type: 'varchar', nullable: true })
+  fcm_token: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  browser: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  ip: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  os: string;
+}

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

@@ -1,59 +1,59 @@
-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 extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_USER;
-  }
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  first_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  last_name: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  password: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  email_id: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  mobile: string;
-
-  @Column({ type: 'int', nullable: true })
-  is_firstlogin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_defaultadmin: number;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  invitation_status: string;
-
-  @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({ type: 'varchar', nullable: true })
-  last_level_type: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  last_level_id: string;
-
-  @Column({ nullable: true })
-  date: Date;
-
-  @Column({ type: 'varchar', nullable: true })
-  profile_image: string;
-}
+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 extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  first_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  last_name: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  password: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  email_id: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  mobile: string;
+
+  @Column({ type: 'int', nullable: true })
+  is_firstlogin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_defaultadmin: number;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  invitation_status: string;
+
+  @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({ type: 'varchar', nullable: true })
+  last_level_type: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  last_level_id: string;
+
+  @Column({ nullable: true })
+  date: Date;
+
+  @Column({ type: 'varchar', nullable: true })
+  profile_image: string;
+}

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

@@ -1,96 +1,96 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Role } from '../entity/role.entity';
-
-@Injectable()
-export class RoleRepository {
-  constructor(
-    @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>,
-  ) {}
-
-  async findByCode(code: string): Promise<Role | null> {
-    return this.roleRepo.findOne({ where: { code } });
-  }
-
-  public async isRoleNameExists(
-    name: string,
-    options?: { excludeRoleId?: number; organization_id?: number },
-  ): Promise<boolean> {
-    const query = this.roleRepo
-      .createQueryBuilder('role')
-      .where('role.name = :name', { name });
-
-    if (options?.excludeRoleId) {
-      query.andWhere('role.id != :excludeRoleId', {
-        excludeRoleId: options.excludeRoleId,
-      });
-    }
-
-    if (options?.organization_id !== undefined) {
-      query.andWhere('role.organization_id = :organization_id', {
-        organization_id: options.organization_id,
-      });
-    }
-
-    const existingRole = await query.getOne();
-    return !!existingRole;
-  }
-
-  async find(data): Promise<Role[] | null> {
-    return this.roleRepo.find({
-      where: {
-        ...(data.is_factory !== undefined && { is_factory: data.is_factory }),
-        ...(data.level_id !== undefined && { level_id: data.level_id }),
-        ...(data.level_type !== undefined && { level_type: data.level_type }),
-      },
-    });
-  }
-
-  /*
-    Ensure role_code is unique within the same level_type and level_id.
-   * Confirm level_type and level_id correspond to existing org/school.
-    */
-
-  public async isRoleNameWithLevelExists(
-    name: string,
-    options?: {
-      excludeRoleId?: number;
-      organization_id?: number;
-      level_type?: string;
-      level_id?: number;
-    },
-  ): Promise<boolean> {
-    const query = this.roleRepo
-      .createQueryBuilder('role')
-      .where('role.name = :name', { name });
-
-    if (options?.excludeRoleId) {
-      query.andWhere('role.id != :excludeRoleId', {
-        excludeRoleId: options.excludeRoleId,
-      });
-    }
-
-    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,
-      });
-    }
-
-    if (options?.level_id !== undefined) {
-      query.andWhere('role.level_id = :level_id', {
-        level_id: options.level_id,
-      });
-    }
-
-    const existingRole = await query.getOne();
-    return !!existingRole;
-  }
-}
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Role } from '../entity/role.entity';
+
+@Injectable()
+export class RoleRepository {
+  constructor(
+    @InjectRepository(Role)
+    private readonly roleRepo: Repository<Role>,
+  ) {}
+
+  async findByCode(code: string): Promise<Role | null> {
+    return this.roleRepo.findOne({ where: { code } });
+  }
+
+  public async isRoleNameExists(
+    name: string,
+    options?: { excludeRoleId?: number; organization_id?: number },
+  ): Promise<boolean> {
+    const query = this.roleRepo
+      .createQueryBuilder('role')
+      .where('role.name = :name', { name });
+
+    if (options?.excludeRoleId) {
+      query.andWhere('role.id != :excludeRoleId', {
+        excludeRoleId: options.excludeRoleId,
+      });
+    }
+
+    if (options?.organization_id !== undefined) {
+      query.andWhere('role.organization_id = :organization_id', {
+        organization_id: options.organization_id,
+      });
+    }
+
+    const existingRole = await query.getOne();
+    return !!existingRole;
+  }
+
+  async find(data): Promise<Role[] | null> {
+    return this.roleRepo.find({
+      where: {
+        ...(data.is_factory !== undefined && { is_factory: data.is_factory }),
+        ...(data.level_id !== undefined && { level_id: data.level_id }),
+        ...(data.level_type !== undefined && { level_type: data.level_type }),
+      },
+    });
+  }
+
+  /*
+    Ensure role_code is unique within the same level_type and level_id.
+   * Confirm level_type and level_id correspond to existing org/school.
+    */
+
+  public async isRoleNameWithLevelExists(
+    name: string,
+    options?: {
+      excludeRoleId?: number;
+      organization_id?: number;
+      level_type?: string;
+      level_id?: number;
+    },
+  ): Promise<boolean> {
+    const query = this.roleRepo
+      .createQueryBuilder('role')
+      .where('role.name = :name', { name });
+
+    if (options?.excludeRoleId) {
+      query.andWhere('role.id != :excludeRoleId', {
+        excludeRoleId: options.excludeRoleId,
+      });
+    }
+
+    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,
+      });
+    }
+
+    if (options?.level_id !== undefined) {
+      query.andWhere('role.level_id = :level_id', {
+        level_id: options.level_id,
+      });
+    }
+
+    const existingRole = await query.getOne();
+    return !!existingRole;
+  }
+}