Merge pull request #5 from Axel77g/add-birth-date-driver

Axel77g · web-flow · commit 070b0e88fc93 · 2025-01-25T18:18:20.000+01:00
Add birth date driver
diff --git a/backend/src/application/testDrive/projections/DriversProjection.ts b/backend/src/application/testDrive/projections/DriversProjection.ts
@@ -43,6 +43,7 @@ export class DriversProjection extends AbstractProjection {
             firstName: event.payload.firstName || driverResponse.value.firstName,
             lastName: event.payload.lastName || driverResponse.value.lastName,
             email: event.payload.email || driverResponse.value.email,
+            birthDate: driverResponse.value.birthDate,
             driverLicensedAt: driverResponse.value.driverLicensedAt,
             documents: []
         })
diff --git a/backend/src/application/testDrive/usecases/driver/RegisterDriverUseCase.ts b/backend/src/application/testDrive/usecases/driver/RegisterDriverUseCase.ts
@@ -11,6 +11,7 @@ export interface RegisterDriverInput extends IInputUseCase{
     firstName : string ,
     lastName: string,
     email: string,
+    birthDate: Date,
     driverLicensedAt: Date,
 }
 
@@ -31,6 +32,7 @@ export const createRegisterDriverUseCase = (_eventRepository: EventRepository, d
             firstName: input.firstName,
             lastName: input.lastName,
             email: input.email,
+            birthDate: input.birthDate,
             driverLicensedAt: input.driverLicensedAt,
             documents: []
         })
diff --git a/backend/src/domain/testDrive/entities/Driver.ts b/backend/src/domain/testDrive/entities/Driver.ts
@@ -9,20 +9,23 @@ export interface DriverDTO{
     firstName: string;
     lastName: string;
     email: string;
+    birthDate: Date;
     driverLicensedAt: Date;
     documents : DriverDocuments[];
 }
 
 export class Driver{
     static errors = {
         INVALID_DRIVER_LICENSE_DATE: new ApplicationException("Driver.INVALID_DRIVER_LICENSE_DATE", "Invalid driver license date"),
+        NEED_TO_BE_18: new ApplicationException("Driver.NEED_TO_BE_18", "Driver need to be 18 years old")
     }
 
     constructor(
         public readonly driverLicenseId: DriverLicenseId,
         public readonly firstName: string,
         public readonly lastName: string,
         public readonly email: string,
+        public readonly birthDate: Date,
         public readonly driverLicensedAt: Date,
         public readonly documents : DriverDocuments[]
     ) {}
@@ -36,6 +39,7 @@ export class Driver{
             firstName: object.firstName,
             lastName: object.lastName,
             email: object.email,
+            birthDate: object.birthDate,
             driverLicensedAt: object.driverLicensedAt,
             documents: object.documents
         })
@@ -46,15 +50,18 @@ export class Driver{
         firstName: string,
         lastName: string,
         email: string,
+        birthDate: Date,
         driverLicensedAt: Date,
         documents : DriverDocuments[]
     }) {
         if (object.driverLicensedAt > new Date()) return Driver.errors.INVALID_DRIVER_LICENSE_DATE;
+        if(new Date().getFullYear() - object.birthDate.getFullYear() < 18) return Driver.errors.NEED_TO_BE_18;
         return new Driver(
             object.driverLicenseId,
             object.firstName,
             object.lastName,
             object.email,
+            object.birthDate,
             object.driverLicensedAt,
             object.documents
         )
@@ -66,6 +73,7 @@ export class Driver{
             firstName: this.firstName,
             lastName: this.lastName,
             email: this.email,
+            birthDate: this.birthDate,
             driverLicensedAt: this.driverLicensedAt,
             documents: this.documents
         })
@@ -81,6 +89,7 @@ export class Driver{
             object.firstName || this.firstName,
             object.lastName || this.lastName,
             object.email || this.email,
+            this.birthDate,
             this.driverLicensedAt,
             this.documents
         )
diff --git a/backend/src/index.ts b/backend/src/index.ts
@@ -47,6 +47,7 @@ async function main(){
 
     const result = await rDriverUseCase({
         driverLicenseId,
+        birthDate: new Date(),
         driverLicensedAt : new Date(),
         firstName:"John",
         lastName:"Doe",
diff --git a/backend/src/infrastructure/common/entityMappers/DriverMapper.ts b/backend/src/infrastructure/common/entityMappers/DriverMapper.ts
@@ -10,6 +10,7 @@ export class DriverMapper{
             firstName: driver.firstName,
             lastName: driver.lastName,
             email: driver.email,
+            birthDate: driver.birthDate,
             driverLicensedAt: driver.driverLicensedAt,
             documents: driver.documents
         })
@@ -22,6 +23,7 @@ export class DriverMapper{
             driver.firstName,
             driver.lastName,
             driver.email,
+            driver.birthDate,
             driver.driverLicensedAt,
             driver.documents
         )
diff --git a/backend/src/infrastructure/frameworks/core/requests/testDrive/registerDriverRequest.ts b/backend/src/infrastructure/frameworks/core/requests/testDrive/registerDriverRequest.ts
@@ -6,5 +6,6 @@ export const registerDriverRequest = z.object({
     firstName : z.string().min(2),
     lastName : z.string().min(2),
     email: z.string().email(),
+    birthDate: dateParser,
     driverLicensedAt: dateParser
 })
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/dealers/[siret]/orders/actions.ts b/backend/src/infrastructure/frameworks/nextjs/app/dealers/[siret]/orders/actions.ts
@@ -16,6 +16,7 @@ import {
 import {updateOrderStatusRequest} from "@infrastructureCore/requests/inventoryManagement/updateOrderStatusRequest";
 import {createUpdateOrderStatusUseCase} from "@application/inventoryManagement/usecases/order/UpdateOrderStatusUseCase";
 import {orderRepository} from "@infrastructureCore/repositories/inventoryManagement/orderRepository";
+import {ApplicationException} from "@shared/ApplicationException";
 
 export async function registerOrder(prevState:any, formData: FormData){
     return useServerForm(formData, registerOrderRequest, async (payload, success, abort)=>{
@@ -24,11 +25,12 @@ export async function registerOrder(prevState:any, formData: FormData){
         const orderLines = payload.orderLines.map((line) => {
             return OrderLine.create(line)
         })
+        if(orderLines.some((line) => line instanceof ApplicationException)) return abort("Invalid order lines")
         const registerOrderUseCase = createRegisterOrderUseCase(inventoryManagementEventRepository,dealerRepository,inventorySparePartRepository)
         const result = await registerOrderUseCase({
             ...payload,
             dealer: siret,
-            orderLines
+            orderLines : orderLines as OrderLine[]
         })
         if(!result.success) return abort(result.error.message)
         return success(result.value)
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/dealers/actions.ts b/backend/src/infrastructure/frameworks/nextjs/app/dealers/actions.ts
@@ -8,14 +8,15 @@ import {createRegisterDealerUseCase} from "@application/inventoryManagement/usec
 import {
     inventoryManagementEventRepository
 } from "@infrastructureCore/repositories/inventoryManagement/inventoryManagementEventRepository";
+import {dealerRepository} from "@infrastructureCore/repositories/inventoryManagement/dealerRepository";
 
 export async function registerDealer(prevState: any, formData: FormData){
     return useServerForm(formData,registerDealerRequest, async (payload, success, abort) =>{
         const address = Address.create(payload.address)
         if(address instanceof Error) return abort(address.message)
         const siret = Siret.create(payload.siret)
         if(siret instanceof Error) return abort(siret.message)
-        const registerDealerUseCase = createRegisterDealerUseCase(inventoryManagementEventRepository)
+        const registerDealerUseCase = createRegisterDealerUseCase(inventoryManagementEventRepository, dealerRepository)
         const registerResponse = await registerDealerUseCase({
             siret,
             name: payload.name,
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/DriverRegisterForm.tsx b/backend/src/infrastructure/frameworks/nextjs/app/drivers/DriverRegisterForm.tsx
@@ -10,6 +10,7 @@ interface DriverRegisterFormProps {
     firstName ?: string | undefined
     lastName ?: string | undefined,
     email ?: string | undefined
+    birthDate?: string | undefined
     driverLicensedAt ?: string | undefined
 }
 
@@ -31,6 +32,7 @@ export default function DriverRegisterForm(){
             <Input type="text" name="lastName" label={"Nom de famille"} placeholder={"Nom de famille du conduteur"} value={state.lastName}/>
             <Input type="text" name="email" label={"Email"} value={state.email} placeholder={"email@example.com"}/>
             <Input type="text" name="driverLicenseId" placeholder={"Numéro du permis de conduire"} label={"Numéro du permis de conduire"} value={state.driverLicenseId}/>
+            <Input type="date" name="birthDate" placeholder={"Date de naissance"} label={"Date de naissance"} value={state.birthDate}/>
             <Input type="date" name="driverLicensedAt" placeholder={"Obtention du permis de conduire"} label={"Obtention du permis de conduire"} value={state.driverLicensedAt}/>
             <Button>Ajouter un conducteur</Button>
         </Form>
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/DriverPatchForm.tsx b/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/DriverPatchForm.tsx
@@ -11,6 +11,7 @@ interface DriverPatchFormProps {
     firstName ?: string | undefined
     lastName ?: string | undefined,
     email ?: string | undefined
+    birthDate?: Date
     driverLicensedAt ?: Date
 }
 
@@ -31,7 +32,8 @@ export default function DriverPatchForm({ driver } : {driver : DriverPatchFormPr
             <Input type="text" name="firstName" value={state?.firstName ?? driver.firstName} label={"Prénom"} placeholder={"Prénom du conducteur"}/>
             <Input type="text" name="lastName" value={state?.lastName ?? driver.lastName} label={"Nom de famille"} placeholder={"Nom de famille du conducteur"}/>
             <Input type="text" name="email" value={state?.email ?? driver.email} label={"Email"} placeholder={"example@email.com"}/>
-            <Input type="text" label={"Email"} disabled={true} name="driverLicensedAt" placeholder={"Obtention du permis de conduire"} value={driver.driverLicensedAt?.toLocaleString()}/>
+            <Input type="text" name="birthDate" placeholder={"Date de naissance"} label={"Date de naissance"} disabled value={driver.birthDate?.toLocaleString()}/>
+            <Input  type="text" label={"Obtention du permis de conduire"} disabled name="driverLicensedAt" placeholder={"Obtention du permis de conduire"} value={driver.driverLicensedAt?.toLocaleString()}/>
             <Button>Modifier le conducteur</Button>
         </Form>
     )
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/actions.ts b/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/actions.ts
@@ -5,12 +5,13 @@ import {DriverLicenseId} from "@domain/testDrive/value-object/DriverLicenseId";
 import {createPatchDriverUseCase} from "@application/testDrive/usecases/driver/PatchDriverUseCase";
 import {testDriveEventRepository} from "@infrastructureCore/repositories/testDrive/testDriveEventRepository";
 import {useServerForm} from "@/hooks/useServerForm";
+import {driverRepository} from "@infrastructureCore/repositories/testDrive/driverRepository";
 
 export async function patchDriverAction(prevState: any, formData : FormData){
     return useServerForm(formData, patchDriverRequest, async (payload, success,abort)=>{
         const driverLicenseId = DriverLicenseId.create(payload.driverLicenseId)
         if(driverLicenseId instanceof Error) return abort(driverLicenseId.message)
-        const patchDriverUseCase = createPatchDriverUseCase(testDriveEventRepository)
+        const patchDriverUseCase = createPatchDriverUseCase(testDriveEventRepository, driverRepository)
         const result = await patchDriverUseCase({
             driverLicenseId,
             driver: {
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/page.tsx b/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/page.tsx
@@ -18,10 +18,13 @@ export default async function DriverDetailPage(pageProps: {params: any, searchPa
         firstName: result.value.firstName,
         lastName: result.value.lastName,
         email: result.value.email,
+        birthDate: result.value.birthDate,
         driverLicensedAt : result.value.driverLicensedAt,
         documents: result.value.documents
     }
 
+    console.log(driver)
+
     const driverPath = `/drivers/${driverLicenseId.getValue()}`
 
     return (
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/test-drives/DriverTestDriveForm.tsx b/backend/src/infrastructure/frameworks/nextjs/app/drivers/[driverLicenseId]/test-drives/DriverTestDriveForm.tsx
@@ -29,7 +29,7 @@ export default function DriverTestDriveForm(props : {driverLicenseId : string}){
     const [formState, formAction] = useActionState<ActionState,FormData>(registerDriverTestDrive,initialState)
     return <Form state={formState} action={formAction} title={"Ajouter un test de conduite"}>
         <input type="hidden" name={"driverLicenseId"} value={props.driverLicenseId}/>
-        <Input placeholder={"Immatriculation du véhicule"} label={"Immatriculation"} name={"vehicleImmatriculation"} type={"text"} value={formState.vehicleImmatriculation} />
+        <Input placeholder={"Immatriculation du véhicule (AA-999-ZZ"} label={"Immatriculation"} name={"vehicleImmatriculation"} type={"text"} value={formState.vehicleImmatriculation} />
         <Input type="date" name="period.startDate" placeholder={"Date début du test"} value={formState?.period?.startDate} label={"Date début du test"}/>
         <Input type="date" name="period.endDate" placeholder={"Date début du test"} value={formState?.period?.endDate} label={"Date debut du test"}/>
         <Button>Ajouter le test de conduite</Button>
diff --git a/backend/src/infrastructure/frameworks/nextjs/app/drivers/actions.ts b/backend/src/infrastructure/frameworks/nextjs/app/drivers/actions.ts
@@ -8,6 +8,7 @@ import {
 import {registerDriverRequest} from "@infrastructureCore/requests/testDrive/registerDriverRequest";
 import {createRegisterDriverUseCase} from "@application/testDrive/usecases/driver/RegisterDriverUseCase";
 import {getFirstZodError} from "@/utils/getFirstZodError";
+import {driverRepository} from "@infrastructureCore/repositories/testDrive/driverRepository";
 
 export async function registerDriverAction(prevState: any, formData : FormData){
     const rawPayload = formDataToObject(formData)
@@ -16,12 +17,13 @@ export async function registerDriverAction(prevState: any, formData : FormData){
     const payload = payloadResponse.data
     const driverLicenseId = DriverLicenseId.create(payload.driverLicenseId)
     if(driverLicenseId instanceof Error) return {message: driverLicenseId.message, success: false}
-    const registerDriverUseCase = createRegisterDriverUseCase(testDriveEventRepository)
+    const registerDriverUseCase = createRegisterDriverUseCase(testDriveEventRepository, driverRepository)
     const result = await registerDriverUseCase({
         driverLicenseId,
         firstName: payload.firstName,
         lastName: payload.lastName,
         email: payload.email,
+        birthDate: payload.birthDate,
         driverLicensedAt: payload.driverLicensedAt
     })
     if(!result.success) return {message: result.error.message, success: false,  ...rawPayload}
