fix(api,admin, candidate): improved CandidateSection birthDepartment and country on both admin and candiate, improved feature updateCandidate

Author: fbonniec

packages/reva-admin-react/src/app/(aap)/candidacies/[candidacyId]/feasibility-aap/_components/DffSummary/_components/CandidateSection.tsx

@@ -41,6 +41,7 @@ export default function CandidateSection({
     birthdate,
     birthCity,
     birthDepartment,
+    country,
     nationality,
     phone,
     street,
@@ -54,6 +55,8 @@ export default function CandidateSection({
   const genderLabel = gender ? getGenderPrefix(gender) : "";
   const bornLabel = gender ? getGenderBornLabel(gender) : "";
 
+  const isFrance = country ? country?.label == "France" : false;
+
   return (
     <div>
       <div className="flex">
@@ -71,10 +74,11 @@ export default function CandidateSection({
         {!!givenName && <span>{`${bornLabel} ${lastname},`}</span>}
         {birthdate && <span>le : {format(birthdate, "dd/MM/yyyy")}</span>}
         <span>
-          à {birthCity ? `${birthCity},` : ""}{" "}
-          {birthDepartment
-            ? `${birthDepartment?.label} (${birthDepartment?.code})`
+          à {birthCity}
+          {country && isFrance && birthDepartment
+            ? `${birthCity ? ", " : ""}${birthDepartment.label} (${birthDepartment.code})`
             : ""}
+          {country && !isFrance && `${birthCity ? ", " : ""}${country.label}`}
         </span>
       </p>
       {nationality && <p>Nationalité {nationality}</p>}

packages/reva-admin-react/src/app/(aap)/candidacies/[candidacyId]/feasibility-aap/send-file-candidate/_components/sendFileCandidate.hook.ts

@@ -131,6 +131,10 @@ const feasibilityWithDematerializedFeasibilityFileSendFileCandidateByCandidacyId
                 label
               }
             }
+            country {
+              id
+              label
+            }
             nationality
             gender
             phone

packages/reva-admin-react/src/app/(aap)/candidacies/[candidacyId]/feasibility-aap/send-file-certification-authority/_components/sendFileCertificationAuthority.hook.ts

@@ -146,6 +146,10 @@ const getActiveFeasibilitySendFileCertificationAuthorityByCandidacyId = graphql(
                 label
               }
             }
+            country {
+              id
+              label
+            }
             nationality
             gender
             phone

packages/reva-admin-react/src/app/(certificateur)/candidacies/[candidacyId]/feasibility/_components/dematerialized-feasibility/dematerializedFeasibility.hook.ts

@@ -140,6 +140,10 @@ const feasibilityGetActiveFeasibilityByCandidacyId = graphql(`
               label
             }
           }
+          country {
+            id
+            label
+          }
           nationality
           gender
           phone

packages/reva-api/modules/candidate/features/updateCandidate.ts

@@ -129,6 +129,10 @@ export const updateCandidate = async ({
 
   return prismaClient.candidate.update({
     where: { id },
-    data: candidateInput,
+    data: {
+      ...candidateInput,
+      birthDepartmentId:
+        countrySelected.label == "France" ? birthDepartmentId : undefined,
+    },
   });
 };

packages/reva-candidate/src/components/candidacy/candidacy.context.tsx

@@ -28,6 +28,10 @@ const GET_CANDIDATE_WITH_CANDIDACY = graphql(`
           label
         }
       }
+      country {
+        id
+        label
+      }
       nationality
       gender
       phone

packages/reva-candidate/src/components/legacy/organisms/DffSummary/components/CandidateSection.tsx

@@ -42,6 +42,7 @@ export default function CandidateSection({
     birthdate,
     birthCity,
     birthDepartment,
+    country,
     nationality,
     phone,
     street,
@@ -55,6 +56,8 @@ export default function CandidateSection({
   const genderLabel = gender ? getGenderPrefix(gender) : "";
   const bornLabel = gender ? getGenderBornLabel(gender) : "";
 
+  const isFrance = country ? country?.label == "France" : false;
+
   return (
     <div>
       <div className="flex">
@@ -73,10 +76,11 @@ export default function CandidateSection({
         {!!givenName && <span>{`${bornLabel} ${lastname},`}</span>}
         {birthdate && <span> le {format(birthdate, "dd/MM/yyyy")} </span>}
         <span>
-          à {birthCity ? `${birthCity},` : ""}{" "}
-          {birthDepartment
-            ? `${birthDepartment?.label} (${birthDepartment?.code})`
+          à {birthCity}
+          {country && isFrance && birthDepartment
+            ? `${birthCity ? ", " : ""}${birthDepartment.label} (${birthDepartment.code})`
             : ""}
+          {country && !isFrance && `${birthCity ? ", " : ""}${country.label}`}
         </span>
       </p>
       {nationality && <p>Nationalité {nationality}</p>}