added default region in otp

This commit is contained in:
yousef-alkhrissat
2024-08-09 19:30:06 +03:00
parent be8152bad9
commit a899633d8c
2 changed files with 16 additions and 6 deletions

View File

@ -1,6 +1,12 @@
import { OtpType } from '../../../libs/common/src/constants/otp-type.enum'; import { OtpType } from '../../../libs/common/src/constants/otp-type.enum';
import { ApiProperty } from '@nestjs/swagger'; import { ApiProperty } from '@nestjs/swagger';
import { IsEmail, IsEnum, IsNotEmpty, IsString } from 'class-validator'; import {
IsEmail,
IsEnum,
IsNotEmpty,
IsOptional,
IsString,
} from 'class-validator';
export class UserOtpDto { export class UserOtpDto {
@ApiProperty() @ApiProperty()
@ -14,9 +20,9 @@ export class UserOtpDto {
type: OtpType; type: OtpType;
@ApiProperty() @ApiProperty()
@IsNotEmpty() @IsOptional()
@IsString() @IsString()
regionName: string; regionUuid?: string;
} }
export class VerifyOtpDto extends UserOtpDto { export class VerifyOtpDto extends UserOtpDto {

View File

@ -130,9 +130,13 @@ export class UserAuthService {
threeDaysAgo.setDate(threeDaysAgo.getDate() - 3); threeDaysAgo.setDate(threeDaysAgo.getDate() - 3);
const userExists = await this.userRepository.exists({ const userExists = await this.userRepository.exists({
where: { where: {
region: { region: data.regionUuid
regionName: data.regionName, ? {
}, uuid: data.regionUuid,
}
: {
regionName: 'United Arab Emirates',
},
email: data.email, email: data.email,
isUserVerified: true, isUserVerified: true,
}, },