Merge pull request #65 from HamzaSha1/dev

Dev to main

src/auth/dtos/request/verify-user.request.dto.ts

@@ -1,5 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import {
+  IsDateString,
+  IsEmail,
   IsEnum,
   IsNotEmpty,
   IsNumberString,
@@ -13,7 +15,7 @@ import { i18nValidationMessage as i18n } from 'nestjs-i18n';
 import { COUNTRY_CODE_REGEX, PASSWORD_REGEX } from '~/auth/constants';
 import { CountryIso } from '~/common/enums';
 import { DEFAULT_OTP_LENGTH } from '~/common/modules/otp/constants';
-import { IsValidPhoneNumber } from '~/core/decorators/validations';
+import { IsAbove18, IsValidPhoneNumber } from '~/core/decorators/validations';
 
 export class VerifyUserRequestDto {
   @ApiProperty({ example: '+962' })
@@ -37,6 +39,11 @@ export class VerifyUserRequestDto {
   @IsNotEmpty({ message: i18n('validation.IsNotEmpty', { path: 'general', property: 'customer.lastName' }) })
   lastName!: string;
 
+  @ApiProperty({ example: '2001-01-01' })
+  @IsDateString({}, { message: i18n('validation.IsDateString', { path: 'general', property: 'customer.dateOfBirth' }) })
+  @IsAbove18({ message: i18n('validation.IsAbove18', { path: 'general', property: 'customer.dateOfBirth' }) })
+  dateOfBirth!: Date;
+
   @ApiProperty({ example: 'JO' })
   @IsEnum(CountryIso, {
     message: i18n('validation.IsEnum', { path: 'general', property: 'customer.countryOfResidence' }),
@@ -44,6 +51,11 @@ export class VerifyUserRequestDto {
   @IsOptional()
   countryOfResidence: CountryIso = CountryIso.SAUDI_ARABIA;
 
+  @ApiProperty({ example: 'test@test.com' })
+  @IsEmail({}, { message: i18n('validation.IsEmail', { path: 'general', property: 'auth.email' }) })
+  @IsOptional()
+  email!: string;
+
   @ApiProperty({ example: 'Abcd1234@' })
   @Matches(PASSWORD_REGEX, {
     message: i18n('validation.Matches', { path: 'general', property: 'auth.password' }),

src/auth/services/auth.service.ts

@@ -41,6 +41,14 @@ export class AuthService {
   ) {}
 
   async sendRegisterOtp(body: CreateUnverifiedUserRequestDto) {
+    if (body.email) {
+      const isEmailUsed = await this.userService.findUser({ email: body.email, isEmailVerified: true });
+      if (isEmailUsed) {
+        this.logger.error(`Email ${body.email} is already used`);
+        throw new BadRequestException('USER.EMAIL_ALREADY_TAKEN');
+      }
+    }
+
     if (body.password !== body.confirmPassword) {
       this.logger.error('Password and confirm password do not match');
       throw new BadRequestException('AUTH.PASSWORD_MISMATCH');

src/user/services/user.service.ts

@@ -64,12 +64,14 @@ export class UserService {
       this.customerService.createGuardianCustomer(userId, {
         firstName: body.firstName,
         lastName: body.lastName,
+        dateOfBirth: body.dateOfBirth,
         countryOfResidence: body.countryOfResidence,
       }),
       this.userRepository.update(userId, {
         isPhoneVerified: true,
         password: hashedPassword,
         salt,
+        ...(body.email && { email: body.email }),
       }),
     ]);
   }
@@ -100,6 +102,7 @@ export class UserService {
       return this.userRepository.createUnverifiedUser({
         phoneNumber: body.phoneNumber,
         countryCode: body.countryCode,
+        email: body.email,
         firstName: body.firstName,
         lastName: body.lastName,
         roles: [Roles.GUARDIAN],

test/app.e2e-spec.ts

@@ -1,5 +1,5 @@
-import { INestApplication } from '@nestjs/common';
 import { Test, TestingModule } from '@nestjs/testing';
+import { INestApplication } from '@nestjs/common';
 import request from 'supertest';
 import { AppModule } from './../src/app.module';
 
@@ -18,6 +18,4 @@ describe('AppController (e2e)', () => {
   it('/ (GET)', () => {
     return request(app.getHttpServer()).get('/').expect(200).expect('Hello World!');
   });
-
-
 });