Merge pull request #26 from ToniDarodda/implementation-of-plainToInst…

…ance/0014

[Backend] feat: update toDto function to implement class-transformer

.env.development

@@ -1,7 +1,7 @@
-API_PORT=3000
+API_PORT=3005
 
 ORIGIN=*
-FRONTEND_PATH=http://localhost:3001
+FRONTEND_PATH=http://localhost:3000
 
 TYPE=postgres
 HOST=localhost

.env.production

@@ -1,7 +1,7 @@
-API_PORT=3000
+API_PORT=3005
 
 ORIGIN=*
-FRONTEND_PATH=http://localhost:3001
+FRONTEND_PATH=http://localhost:3000
 
 TYPE=postgres
 HOST=localhost

src/entities/account.ts

@@ -4,6 +4,7 @@ import { Country } from 'types/country';
 import { ApiProperty } from '@nestjs/swagger';
 import { Role } from 'types/role';
 import { CommonAccount } from './commonAccount';
+import { Exclude } from 'class-transformer';
 
 @Entity('account')
 export class Account extends CommonAccount {
@@ -25,6 +26,7 @@ export class Account extends CommonAccount {
 
   @ApiProperty({ example: 'po9@cQesP!!D(' })
   @Column('varchar')
+  @Exclude({ toPlainOnly: true })
   password: string;
 
   @ApiProperty({ example: Country.FRANCE })

src/modules/account/controller/account.controller.ts

@@ -6,7 +6,6 @@ import {
   Get,
   HttpCode,
   HttpStatus,
-  NotFoundException,
   Param,
   Patch,
   Post,
@@ -182,11 +181,7 @@ export class AccountController {
   })
   @Roles(Role.USER)
   @UseGuards(JwtAuthGuard, RolesGuard)
-  async delete(@AuthToken() { sub }: DecodedUserToken) {
-    try {
-      return await this.accountService.delete(sub);
-    } catch (err) {
-      throw new NotFoundException('User not found');
-    }
+  delete(@AuthToken() { sub }: DecodedUserToken) {
+    return this.accountService.delete(sub);
   }
 }

src/modules/account/dto/request/signUp.dto.ts

@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
 import {
   IsNotEmpty,
   IsString,
@@ -12,29 +13,35 @@ export class SignUpAccount {
   @ApiProperty({ example: 'Toni' })
   @IsNotEmpty()
   @IsString()
+  @Expose()
   firstName: string;
 
   @ApiProperty({ example: 'Da Rodda' })
   @IsNotEmpty()
   @IsString()
+  @Expose()
   lastName: string;
 
   @ApiProperty({ example: 'toni.da.rodda.pro@gmail.com' })
   @IsEmail()
+  @Expose()
   email: string;
 
   @ApiProperty({ example: '+330678400302' })
   @IsNotEmpty()
   @IsString()
+  @Expose()
   phoneNumber: string;
 
   @ApiProperty({ example: 'po9@cQesP!!D(' })
   @IsNotEmpty()
   @IsString()
+  @Expose()
   password: string;
 
   @ApiProperty({ example: [Country.CANADA] })
   @IsArray()
   @IsEnum(Country, { each: true })
+  @Expose()
   country: Country;
 }

src/modules/account/service/account.service.ts

@@ -16,6 +16,7 @@ import { SignUpAccount } from '../dto/request/signUp.dto';
 import { PatchAccountDto } from '../dto/request/patch.dto';
 import { MailService } from 'modules/mail/service/mail/mail.service';
 import { AccountDto } from '../dto/response/account.dto';
+import { plainToInstance } from 'class-transformer';
 
 @Injectable()
 export class AccountService {
@@ -28,13 +29,6 @@ export class AccountService {
     private readonly emailService: MailService,
   ) {}
 
-  private static toDto(account: Account): AccountDto {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { password, salt, ...data } = account;
-
-    return { ...data };
-  }
-
   async isMailAccountAlreadyUsed(email: string): Promise<boolean> {
     try {
       const account = await this.accountRepository.findOneBy({ email });
@@ -133,12 +127,20 @@ export class AccountService {
     };
   }
 
-  getByMail(email: string): Promise<AccountDto> {
-    return this.accountRepository.findOneBy({ email });
+  async getByMail(email: string): Promise<AccountDto> {
+    const account = await this.accountRepository.findOneBy({ email });
+
+    return plainToInstance(AccountDto, account, {
+      excludeExtraneousValues: true,
+    });
   }
 
   async get(id: Account['id']): Promise<AccountDto> {
-    return AccountService.toDto(await this.accountRepository.findOneBy({ id }));
+    const account = await this.accountRepository.findOneBy({ id });
+
+    return plainToInstance(AccountDto, account, {
+      excludeExtraneousValues: true,
+    });
   }
 
   update(id: Account['id'], data: PatchAccountDto): Promise<UpdateResult> {