rez_core 2.2.68 → 2.2.69

package/package.json

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

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -24,6 +24,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
       throw new Error('User ID is required to create layout preference.');
     }
 
+    console.log(mapped_entity_type, loggedInUser, userId);
     const existingLayoutPreference =
       await this.layoutPreferenceRepository.findByEntityUserId(
         mapped_entity_type,
@@ -32,6 +33,7 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         userId,
       );
 
+    console.log(existingLayoutPreference, 'existingLayoutPreference');
     if (existingLayoutPreference) {
       return await super.updateEntity(
         { ...entityData, id: existingLayoutPreference.id },

package/src/module/notification/controller/otp.controller.ts

@@ -43,16 +43,10 @@ export class OtpController {
 
   @Post('verify')
   @HttpCode(HttpStatus.OK)
-  async verifyOtp(@Body() request: any) {
-    let verify = await this.otpService.verifyOtp(request);
-    if (!verify.isValid) {
-      throw new BadRequestException('Invalid OTP!');
-    }
-    return {
-      message: 'OTP verified successfully!',
-      success: true,
-      data: verify,
-    };
+  async verifyOtp(
+    @Body() body: { otp: string; otp_id: string; identifier: string },
+  ) {
+    return await this.otpService.verifyOtp(body);
   }
 
   @Post('send-mail')

package/src/module/notification/notification.module.ts

@@ -10,6 +10,7 @@ import { EmailService } from './service/email.service';
 import { join } from 'path';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { AuthModule } from '../auth/auth.module';
+import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [
@@ -40,6 +41,7 @@ import { AuthModule } from '../auth/auth.module';
       }),
     }),
     AuthModule,
+    UserModule,
   ],
   providers: [OtpService, OtpRepository, EmailService],
   exports: [OtpService, EmailService],

package/src/module/notification/service/otp.service.ts

@@ -1,10 +1,9 @@
-import { Injectable } from '@nestjs/common';
-import { OtpRepository } from '../repository/otp.repository';
-import { Otp } from '../entity/otp.entity';
-import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { DataSource } from 'typeorm';
-import { JwtAuthService } from 'src/module/auth/services/jwt.service';
+import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
+import { Otp } from '../entity/otp.entity';
+import { OtpRepository } from '../repository/otp.repository';
+import { LoginService } from './../../user/service/login.service';
 
 @Injectable()
 export class OtpService {
@@ -12,9 +11,7 @@ export class OtpService {
     private readonly otpRepository: OtpRepository,
     private readonly idGen: ClockIDGenService,
     private configService: ConfigService,
-    // @Inject('JwtAuthService')
-    private readonly jwtAuthService: JwtAuthService,
-    private databaseSource: DataSource,
+    private readonly loginService: LoginService,
   ) {}
 
   VERIFY_OTP = this.configService.get('VERIFY_OTP') || 'true';
@@ -41,18 +38,21 @@ export class OtpService {
     return await this.otpRepository.save(otp);
   }
 
-  async verifyOtp(request) {
+  async verifyOtp(body: { otp: string; otp_id: string; identifier: string }) {
     let verifyOTPResponse = {
       isValid: false,
-      access_token: '',
     };
 
-    let otp = request.otp;
-    let otpId = request.otp_id;
+    let otp = body.otp;
+    let otpId = body.otp_id;
 
     let otpEntity = await this.findByOtpId(otpId);
 
     if (otpEntity) {
+      if (otpEntity.identifier !== body.identifier) {
+        throw new BadRequestException('Invalid OTP!');
+      }
+
       if (
         otpEntity.otp === otp &&
         new Date(Date.now()) <= otpEntity.expiration_date &&
@@ -69,28 +69,10 @@ export class OtpService {
       }
     }
 
-    if (verifyOTPResponse.isValid && request.entity) {
-      const entity_type = request.entity.entity_type;
-      const entity_id = request.entity.entity_id;
-
-      const entityData = await this.databaseSource.query(
-        `SELECT level_id, level_type, organization_id FROM ether_core.crm_lead where id = ${entity_id}`,
-      );
-
-      if (entityData.length > 0) {
-        const level_id = entityData[0].level_id;
-        const level_type = entityData[0].level_type;
-        const organization_id = entityData[0].organization_id;
-
-        verifyOTPResponse.access_token = await this.jwtAuthService.generateJwt({
-          level_id: level_id,
-          level_type: level_type,
-          organization_id: organization_id,
-        });
-      }
+    if (!verifyOTPResponse.isValid) {
+      throw new BadRequestException('Invalid OTP!');
     }
-
-    return verifyOTPResponse;
+    return await this.loginService.login(body.identifier, undefined, true);
   }
 
   async findByOtpId(otpId: string) {

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

@@ -36,7 +36,7 @@ export class LoginService {
   masterKey: string = this.configService.get('MASTER_KEY') || '';
   masterIv: string = this.configService.get('MASTER_IV') || '';
 
-  async login(email: string, password: string) {
+  async login(email: string, password?: string, is_otp = false) {
     const user = await this.userService.findByEmailId(email);
 
     console.log(user, ' user data');
@@ -71,18 +71,20 @@ export class LoginService {
       };
     }
 
-    const encryptedPassword = EncryptUtilService.encryptGCM(
-      password,
-      this.masterKey,
-      this.masterIv,
-    );
+    if (!is_otp) {
+      const encryptedPassword = EncryptUtilService.encryptGCM(
+        password,
+        this.masterKey,
+        this.masterIv,
+      );
 
-    if (encryptedPassword !== user.password) {
-      return {
-        success: false,
-        message: 'Oops! Your password is incorrect.',
-        type: 'password',
-      };
+      if (encryptedPassword !== user.password) {
+        return {
+          success: false,
+          message: 'Oops! Your password is incorrect.',
+          type: 'password',
+        };
+      }
     }
 
     let appcode = user.last_app_access;
@@ -107,12 +109,12 @@ export class LoginService {
       user.id,
       defaultAccess.level_type,
       defaultAccess.level_id,
-      defaultAccess.appcode
+      defaultAccess.appcode,
     );
 
     const token = await this.userSessionService.createSession(
       user,
-      appcode,
+      defaultAccess.appcode,
       defaultAccess,
     );
 
@@ -132,7 +134,7 @@ export class LoginService {
     return {
       success: true,
       accessToken: token,
-      appcode,
+      appcode: defaultAccess.appcode,
       level_type: defaultAccess.level_type,
       level_id: defaultAccess.level_id,
     };
@@ -168,7 +170,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; appcode: 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');
@@ -180,11 +182,19 @@ export class LoginService {
     );
 
     if (user.last_level_type && user.last_level_id && validURM) {
-      return { level_type: user.last_level_type, level_id: user.last_level_id ,appcode: user.last_app_access};
+      return {
+        level_type: user.last_level_type,
+        level_id: user.last_level_id,
+        appcode: user.last_app_access,
+      };
     }
 
     if (orgAccess) {
-      return { level_type: 'ORG', level_id: orgAccess.level_id, appcode: orgAccess.appcode };
+      return {
+        level_type: 'ORG',
+        level_id: orgAccess.level_id,
+        appcode: orgAccess.appcode,
+      };
     }
 
     if (brnAccesses.length) {
@@ -196,7 +206,11 @@ export class LoginService {
       );
 
       if (rows.length) {
-        return { level_type: 'SCH', level_id: rows[0].id,appcode: brnAccesses[0].appcode };
+        return {
+          level_type: 'SCH',
+          level_id: rows[0].id,
+          appcode: brnAccesses[0].appcode,
+        };
       } else {
         throw new BadRequestException(
           'User has BRN access but no schools found under that brand.',
@@ -205,7 +219,11 @@ export class LoginService {
     }
 
     if (schAccesses.length) {
-      return { level_type: 'SCH', level_id: schAccesses[0].level_id, appcode: schAccesses[0].appcode };
+      return {
+        level_type: 'SCH',
+        level_id: schAccesses[0].level_id,
+        appcode: schAccesses[0].appcode,
+      };
     }
 
     throw new BadRequestException(

package/src/module/workflow/repository/activity-log.repository.ts

@@ -49,6 +49,7 @@ export class ActivityLogRepository {
       query.andWhere('log.category = :category', { category });
     }
 
+    query.orderBy('log.created_date', 'DESC');
     const rows = await query.getRawAndEntities();
 
     return rows.entities.map((entity, i) => ({

package/src/module/workflow/repository/task.repository.ts

@@ -34,6 +34,11 @@ export class TaskRepository {
       [loggedInUser.organization_id],
     );
 
+    const leadData = await this.dataSource.query(
+      `SELECT * FROM crm_lead WHERE id = ?`,
+      [mapped_entity_id],
+    );
+
     // Find the action with the lowest sequence
 
     if (action.length > 0) {
@@ -54,10 +59,11 @@ export class TaskRepository {
           is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
           mapped_entity_id,
           mapped_entity_type,
-
+          due_date: new Date(new Date().setDate(new Date().getDate() + 2)),
           is_system: true,
           status: todoListMasterItemId[0]?.id,
           category: act?.action_category_code,
+          task_owner: leadData[0]?.lead_owner,
         } as TaskDataEntity);
         await this.TaskRepository.save(taskData);
       }