rez_core 2.1.33 → 2.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.1.33",
+  "version": "2.1.35",
   "description": "",
   "author": "", 
   "private": false,

package/src/module/enterprise/enterprise.module.ts

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { OrganizationService } from './service/organization.service';
 import { OrganizationData } from './entity/organization.entity';
@@ -12,6 +12,9 @@ import { BrandRepository } from './repository/brand.repository';
 import { SchoolRepository } from './repository/school.repository';
 import { UtilsModule } from 'src/utils/utils.module';
 import { BrandService } from './service/brand.service';
+import { OrganizationRepository } from './repository/organization.repository';
+import { SchoolService } from './service/school.service';
+import { EntityModule } from '../meta/entity.module';
 
 @Module({
   imports: [
@@ -21,8 +24,9 @@ import { BrandService } from './service/brand.service';
       BrandData,
       SchoolData,
     ]),
-    UserModule,
+    forwardRef(() => UserModule),
     UtilsModule,
+    EntityModule,
   ],
   controllers: [OrganizationController],
   providers: [
@@ -30,11 +34,16 @@ import { BrandService } from './service/brand.service';
     OrganizationAppMappingService,
     BrandRepository,
     SchoolRepository,
+    OrganizationRepository,
     {
       provide: 'BrandService',
       useClass: BrandService,
     },
+    {
+      provide: 'SchoolService',
+      useClass: SchoolService,
+    },
   ],
-  exports: [OrganizationService],
+  exports: [OrganizationService, OrganizationRepository],
 })
 export class EnterpriseModule {}

package/src/module/enterprise/repository/organization.repository.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { OrganizationData } from '../entity/organization.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class OrganizationRepository {
+  constructor(
+    @InjectRepository(OrganizationData)
+    private readonly organizationRepository: Repository<OrganizationData>,
+  ) {}
+
+  async findOrganizationById(id: number): Promise<OrganizationData | null> {
+    return await this.organizationRepository.findOne({
+      where: { id },
+    });
+  }
+}

package/src/module/enterprise/service/school.service.ts

@@ -0,0 +1,5 @@
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+
+@Injectable()
+export class SchoolService extends EntityServiceImpl {}

package/src/module/filter/service/filter.service.ts

@@ -298,10 +298,9 @@ export class FilterService {
           },
         );
       }
-    } else {
-      // sorting in desc order if no layout preference sorting provided
-      qb.addOrderBy('e.created_date', 'DESC');
-    }
+    } 
+    
+    qb.addOrderBy('e.created_date', 'DESC');
 
     // Pagination
     const page = dto.page && dto.page > 0 ? dto.page : 1;

package/src/module/meta/service/entity-service-impl.service.ts

@@ -49,11 +49,13 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         entityMaster,
         loggedInUser,
       );
-    if (validationErrors.length > 0) {
-      throw new BadRequestException({
+    console.log('Validation Errors:', validationErrors); // Debug log
+    if (validationErrors && validationErrors.length > 0) {
+      return {
+        success: false,
         message: 'Validation failed',
         errors: validationErrors,
-      });
+      };
     }
 
     const repo = manager

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

@@ -1,13 +1,14 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
+import { Role } from '../entity/role.entity';
+import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserData } from '../entity/user.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
 import { ConfigService } from '@nestjs/config';
 import { InjectRepository } from '@nestjs/typeorm';
-import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { DataSource, Repository } from 'typeorm';
-import { Role } from '../entity/role.entity';
 
 @Injectable()
 export class LoginService {
@@ -20,6 +21,7 @@ export class LoginService {
     @InjectRepository(Role)
     private readonly roleRepo: Repository<Role>,
     private readonly dataSource: DataSource,
+    private readonly organizationRepository: OrganizationRepository,
   ) {}
 
   masterKey: string = this.configService.get('MASTER_KEY') || '';
@@ -27,7 +29,7 @@ export class LoginService {
 
   async login(email: string, password: string) {
     const user = await this.userService.findByEmailId(email);
-  
+
     if (!user) {
       return {
         success: false,
@@ -35,21 +37,24 @@ export class LoginService {
         type: 'email',
       };
     }
-  
-    if (user.status !== 'ACTIVE') {
+    const userOrgData = await this.organizationRepository.findOrganizationById(
+      user.organization_id,
+    );
+
+    if (user.status !== 'ACTIVE' || userOrgData?.status !== 'ACTIVE') {
       return {
         success: false,
         message: 'Your account is inactive.',
         type: 'email',
       };
     }
-  
+
     const encryptedPassword = EncryptUtilService.encryptGCM(
       password,
       this.masterKey,
       this.masterIv,
     );
-  
+
     if (encryptedPassword !== user.password) {
       return {
         success: false,
@@ -57,38 +62,44 @@ export class LoginService {
         type: 'password',
       };
     }
-  
+
     let appcode = user.last_app_access || 'ADM';
-  
+
     if (!user.last_app_access) {
       await this.userService.setDefaultLastAccess(user.id, appcode);
     }
-  
+
     const roleMappings = await this.userRoleMappingRepository.find({
       where: { user_id: user.id, appcode },
     });
-  
+
     if (!roleMappings.length) {
-      throw new BadRequestException('User does not have any access mapped for this app.');
+      throw new BadRequestException(
+        'User does not have any access mapped for this app.',
+      );
     }
-  
+
     const defaultAccess = await this.getDefaultAccess(user, roleMappings);
-  
+
     await this.userService.setLastLevelTypeAndId(
       user.id,
       defaultAccess.level_type,
       defaultAccess.level_id,
     );
-  
-    const token = await this.userSessionService.createSession(user, appcode, defaultAccess);
-  
+
+    const token = await this.userSessionService.createSession(
+      user,
+      appcode,
+      defaultAccess,
+    );
+
     if (user.is_firstlogin === 1) {
       user.invitation_status = 'ACCEPTED';
       user.is_firstlogin = 0;
       const { password, ...userWithoutPassword } = user;
       await this.userService.updateEntity(userWithoutPassword, user);
     }
-  
+
     return {
       success: true,
       accessToken: token,
@@ -97,35 +108,37 @@ export class LoginService {
       level_id: defaultAccess.level_id,
     };
   }
-  
+
   private async getDefaultAccess(
     user: any,
     roleMappings: any[],
   ): Promise<{ level_type: string; level_id: string }> {
-    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');
-  
+    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');
+
     const validURM = roleMappings.find(
-      r => r.level_type === user.last_level_type && r.level_id === user.last_level_id,
+      (r) =>
+        r.level_type === user.last_level_type &&
+        r.level_id === user.last_level_id,
     );
-  
+
     if (user.last_level_type && user.last_level_id && validURM) {
       return { level_type: user.last_level_type, level_id: user.last_level_id };
     }
-  
+
     if (orgAccess) {
       return { level_type: 'ORG', level_id: orgAccess.level_id };
     }
-  
+
     if (brnAccesses.length) {
       const brandId = brnAccesses[0].level_id;
-  
+
       const rows = await this.dataSource.query(
         `SELECT id FROM cr_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
         [brandId],
       );
-  
+
       if (rows.length) {
         return { level_type: 'SCH', level_id: rows[0].id };
       } else {
@@ -134,16 +147,15 @@ export class LoginService {
         );
       }
     }
-  
+
     if (schAccesses.length) {
       return { level_type: 'SCH', level_id: schAccesses[0].level_id };
     }
-  
+
     throw new BadRequestException(
       'User does not have ORG, BRN, or SCH access for this app.',
     );
   }
-  
 
   async loginWithGoogle(email: string, name) {
     let user = await this.userService.findByEmailId(email);

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

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserData } from './entity/user.entity';
 import { UserService } from './service/user.service';
@@ -20,6 +20,7 @@ import { UserRoleMappingRepository } from './repository/user-role-mapping.reposi
 import { UserRoleMappingService } from './service/user-role-mapping.service';
 import { RoleRepository } from './repository/role.repository';
 import { ModuleAccess } from '../module/entity/module-access.entity';
+import { EnterpriseModule } from '../enterprise/enterprise.module';
 
 @Module({
   imports: [
@@ -30,9 +31,10 @@ import { ModuleAccess } from '../module/entity/module-access.entity';
       UserRoleMapping,
       ModuleAccess,
     ]),
+    forwardRef(() => AuthModule),
     EntityModule,
     UtilsModule,
-    AuthModule,
+    forwardRef(() => EnterpriseModule),
   ],
   providers: [
     { provide: 'UserService', useClass: UserService },