Add validations for event_date

abarghoud · Nov 10, 2024 · 9cd98ea · 9cd98ea
1 parent e236eb4
commit 9cd98ea
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/apps/api/jest.config.ts b/apps/api/jest.config.ts
@@ -2,6 +2,7 @@ export default {
   displayName: 'api',
   preset: '../../jest.preset.js',
   testEnvironment: 'node',
+  setupFiles: ['./jest.setup.ts'],
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }]
   },

diff --git a/apps/api/jest.setup.ts b/apps/api/jest.setup.ts
@@ -0,0 +1 @@
+import 'reflect-metadata';
diff --git a/apps/api/src/app/pps/domain/pps-profile-dto-to-runner-personal-infos.ts b/apps/api/src/app/pps/domain/pps-profile-dto-to-runner-personal-infos.ts
@@ -21,6 +21,6 @@ export class PPSProfileDTOToRunnerPersonalInfos {
     this.firstname = ppsDto.firstname;
     this.gender = ppsDto.gender;
     this.lastname = ppsDto.lastname;
-    this.eventDate = DateTime.fromISO(ppsDto.event_date);
+    this.eventDate = DateTime.fromJSDate(ppsDto.event_date);
   }
 }
diff --git a/apps/api/src/app/pps/domain/pps-profile-dto.model.ts b/apps/api/src/app/pps/domain/pps-profile-dto.model.ts
@@ -1,6 +1,8 @@
-import { IsDateString, IsEmail, IsEnum, IsString } from 'class-validator';
+import { IsDate, IsDateString, IsEmail, IsEnum, IsString, MaxDate, MinDate } from 'class-validator';
+import { Type } from 'class-transformer';
 
 import { Gender } from '../../gender.enum';
+import { DateTime } from 'luxon';
 
 export class PPSProfileDto {
   @IsDateString()
@@ -9,8 +11,17 @@ export class PPSProfileDto {
   @IsEmail()
   public email: string;
 
-  @IsDateString()
-  public event_date: string;
+  @Type(() => Date)
+  @IsDate()
+  @MinDate(
+    () => DateTime.now().toJSDate(),
+    { message: 'event_date cannot be in the past' }
+  )
+  @MaxDate(
+    () => DateTime.now().plus({ month: 3 }).toJSDate(),
+    { message: 'event_date should be within 3 months' }
+  )
+  public event_date: Date;
 
   @IsString()
   public firstname: string;

diff --git a/apps/api/src/app/pps/third-party/pps-api-form-data-generator.spec.ts b/apps/api/src/app/pps/third-party/pps-api-form-data-generator.spec.ts
@@ -6,7 +6,7 @@ import { Gender } from '../../gender.enum';
 const getFakePPSDto = (): PPSProfileDto => {
   const ppsDto = new PPSProfileDto();
 
-  ppsDto.event_date = '2024-12-31';
+  ppsDto.event_date = new Date('2024-12-31');
   ppsDto.birthday = '1990-01-01';
   ppsDto.email = '[email protected]';
   ppsDto.gender = Gender.male;

diff --git a/apps/api/src/app/pps/third-party/pps-api.spec.ts b/apps/api/src/app/pps/third-party/pps-api.spec.ts
@@ -21,7 +21,7 @@ import { PPSId } from '../domain/pps-id.type';
 const getFakePPSDto = (): PPSProfileDto => {
   const ppsDto = new PPSProfileDto();
 
-  ppsDto.event_date = '2024-12-31';
+  ppsDto.event_date = new Date('2024-12-31');
 
   return ppsDto;
 };

diff --git a/apps/api/src/app/pps/usecase/pps-generator-usecase.spec.ts b/apps/api/src/app/pps/usecase/pps-generator-usecase.spec.ts
@@ -29,7 +29,7 @@ describe('The PPSGeneratorUseCase class', () => {
     let result: PPSId;
 
     beforeAll(async () => {
-      ppsProfileDto.event_date = '2024-11-01';
+      ppsProfileDto.event_date = new Date('2024-11-01');
       mockPpsApi.finalize.mockResolvedValue(fakePPSId);
 
       result = await app.get(PPSGeneratorUseCase).generate(ppsProfileDto);