update url params from beneficiary address field and vive versa

gip-inclusion · Sep 26, 2024 · 495eac5 · 495eac5
1 parent e05e23c
commit 495eac5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/front/src/app/components/forms/convention/sections/beneficiary/BeneficiaryFormSection.tsx b/front/src/app/components/forms/convention/sections/beneficiary/BeneficiaryFormSection.tsx
@@ -10,6 +10,7 @@ import {
   BeneficiaryRepresentative,
   ConventionReadDto,
   InternshipKind,
+  addressDtoToString,
   domElementIds,
   emailSchema,
   isBeneficiaryStudent,
@@ -208,6 +209,10 @@ export const BeneficiaryFormSection = ({
         <>
           <AddressAutocomplete
             {...formContents["signatories.beneficiary.address"]}
+            initialSearchTerm={
+              values.signatories.beneficiary.address &&
+              addressDtoToString(values.signatories.beneficiary.address)
+            }
             setFormValue={({ address }) => {
               setValue("signatories.beneficiary.address.city", address.city);
               setValue(

diff --git a/front/src/app/routes/routeParams/convention.ts b/front/src/app/routes/routeParams/convention.ts
@@ -10,6 +10,8 @@ import {
   LevelOfEducation,
   PeConnectIdentity,
   ScheduleDto,
+  addressDtoToString,
+  addressStringToDto,
   appellationCodeSchema,
   errors,
   isBeneficiaryStudent,
@@ -163,6 +165,7 @@ const conventionToConventionInUrl = (
         led: beneficiary.levelOfEducation,
         schoolName: beneficiary.schoolName,
         schoolPostcode: beneficiary.schoolPostcode,
+        address: beneficiary.address && addressDtoToString(beneficiary.address),
       }
     : undefined;
 
@@ -273,6 +276,7 @@ export const conventionValuesFromUrl = {
   phone: param.query.optional.string,
   financiaryHelp: param.query.optional.string,
   led: param.query.optional.string,
+  address: param.query.optional.string,
   schoolName: param.query.optional.string,
   schoolPostcode: param.query.optional.string,
   emergencyContact: param.query.optional.string,
@@ -422,6 +426,7 @@ const conventionPresentationFromParams = (
       emergencyContact: params.emergencyContact ?? "",
       emergencyContactPhone: params.emergencyContactPhone ?? "",
       emergencyContactEmail: params.emergencyContactEmail ?? "",
+      address: params.address ? addressStringToDto(params.address) : undefined,
       levelOfEducation: (params.led as LevelOfEducation) ?? "",
       schoolName: params.schoolName ?? "",
       schoolPostcode: params.schoolPostcode ?? "",

diff --git a/shared/src/convention/conventionRefinements.ts b/shared/src/convention/conventionRefinements.ts
@@ -80,7 +80,7 @@ export const minorBeneficiaryHasRepresentative = ({
 export const shouldValidateBeneficiaryAddressAndParse = (
   convention: ConventionDto,
 ) => {
-  const ruleAppliesFrom = new Date("2024-09-28");
+  const ruleAppliesFrom = new Date("2024-09-30");
   const conventionWasSubmittedBeforeRuleApplies =
     new Date(convention.dateSubmission).getTime() < ruleAppliesFrom.getTime();
   if (