rez_core 6.5.3 → 6.5.6

package/src/module/enterprise/entity/organization-app-mapping.entity.ts

@@ -8,10 +8,16 @@ export class OrganizationAppMapping {
   @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
   id: number;
 
+  @Column({ type: 'int', nullable: true })
+  organization_id: number;
+
   @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;

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

@@ -8,6 +8,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { ModuleAccess } from '../../module/entity/module-access.entity';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { plainToInstance } from 'class-transformer';
+import { StatusConstant } from '../../../constant/status.constant';
 
 @Injectable()
 export class RoleService {
@@ -52,7 +53,7 @@ export class RoleService {
     if (role.copy_from_role_id && !sourceRole) {
       return { success: false, error: 'Source role not found.' };
     }
-    role.status = STATUS_ACTIVE;
+    role.status = StatusConstant.ACTIVE;
     const savedRole = await this.roleRepository.saveRole(role);
     if (sourceRole) {
       const sourcePermissions = await this.moduleAccessRepo.find({
@@ -95,7 +96,7 @@ export class RoleService {
       const associatedUsers = await this.userRoleMappingRepo
         .createQueryBuilder('map')
         .innerJoin('sso_user', 'usr', 'map.user_id = usr.id')
-        .where('usr.status::text = :status', { status: STATUS_INACTIVE })
+        .where('usr.status::text = :status', { status: StatusConstant.INACTIVE })
         .andWhere('map.role_id::text = :roleId', {
           roleId: String(existingRole?.id),
         })
@@ -174,4 +175,12 @@ export class RoleService {
   }): Promise<Role[] | null> {
     return await this.roleRepository.find(data);
   }
+
+  async findByCode(code: string) {
+    return await this.roleRepository.findByCode(code);
+  }
+
+  async findById(id: number) {
+    return await this.roleRepository.findById(id);
+  }
 }