refactor(admin-react,api,candidate): finalise sql migration

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

@@ -16,17 +16,17 @@ import ParcoursSection from "./_components/ParcoursSection";
 
 export default function DffSummary({
   dematerializedFeasibilityFile,
+  candidacy,
   HasBeenSentComponent,
 }: {
   dematerializedFeasibilityFile?: DematerializedFeasibilityFile;
+  candidacy: Candidacy;
   HasBeenSentComponent?: React.ReactNode;
 }) {
-  if (!dematerializedFeasibilityFile) {
+  if (!dematerializedFeasibilityFile || !candidacy) {
     return null;
   }
 
-  const { candidacy } = dematerializedFeasibilityFile;
-
   const {
     option,
     firstForeignLanguage,

packages/reva-admin-react/src/app/(aap)/candidacies/[candidacyId]/feasibility-aap/aapFeasibilityPageLogic.ts

@@ -11,12 +11,12 @@ const getCandidacyById = graphql(`
         codeRncp
       }
       feasibility {
+        feasibilityFileSentAt
         dematerializedFeasibilityFile {
           swornStatementFileId
           isReadyToBeSentToCandidate
           isReadyToBeSentToCertificationAuthority
           sentToCandidateAt
-          sentToCertificationAuthorityAt
           certificationPartComplete
           competenceBlocsPartCompletion
           attachmentsPartComplete
@@ -71,11 +71,13 @@ export const useAapFeasibilityPageLogic = () => {
 
   const candidacy = getCandidacyByIdResponse?.getCandidacyById;
   const certification = candidacy?.certification;
+  const feasibilityFileSentAt = candidacy?.feasibility?.feasibilityFileSentAt;
   const dematerializedFeasibilityFile =
     candidacy?.feasibility?.dematerializedFeasibilityFile;
   return {
     certification,
     dematerializedFeasibilityFile,
     queryStatus: getCandidacyByIdStatus,
+    feasibilityFileSentAt,
   };
 };

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

@@ -21,8 +21,12 @@ const AapFeasibilityPage = () => {
     candidacyId: string;
   }>();
 
-  const { certification, dematerializedFeasibilityFile, queryStatus } =
-    useAapFeasibilityPageLogic();
+  const {
+    certification,
+    dematerializedFeasibilityFile,
+    queryStatus,
+    feasibilityFileSentAt,
+  } = useAapFeasibilityPageLogic();
 
   return (
     <div className="flex flex-col">
@@ -106,7 +110,7 @@ const AapFeasibilityPage = () => {
 
           <SendFileCertificationAuthoritySection
             sentToCertificationAuthorityAt={
-              dematerializedFeasibilityFile?.sentToCertificationAuthorityAt as Date | null
+              feasibilityFileSentAt as any as Date | null
             }
             isReadyToBeSentToCertificationAuthority={
               dematerializedFeasibilityFile?.isReadyToBeSentToCertificationAuthority

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

@@ -166,8 +166,10 @@ export const useSendFileCandidate = () => {
   const dematerializedFeasibilityFile =
     feasibility?.dematerializedFeasibilityFile;
   const dematerializedFeasibilityFileId = dematerializedFeasibilityFile?.id;
+  const candidacy = feasibility?.candidacy;
   return {
     dematerializedFeasibilityFileId,
+    candidacy,
     sendToCandidateMutation,
     dematerializedFeasibilityFile,
   };

packages/reva-admin-react/src/app/(aap)/candidacies/[candidacyId]/feasibility-aap/send-file-candidate/page.tsx

@@ -1,6 +1,9 @@
 "use client";
 import { graphqlErrorToast, successToast } from "@/components/toast/toast";
-import { DematerializedFeasibilityFile } from "@/graphql/generated/graphql";
+import {
+  Candidacy,
+  DematerializedFeasibilityFile,
+} from "@/graphql/generated/graphql";
 import Alert from "@codegouvfr/react-dsfr/Alert";
 import Button from "@codegouvfr/react-dsfr/Button";
 import { format } from "date-fns";
@@ -37,6 +40,7 @@ export default function SendFileCandidatePage() {
     sendToCandidateMutation,
     dematerializedFeasibilityFileId,
     dematerializedFeasibilityFile,
+    candidacy,
   } = useSendFileCandidate();
   const router = useRouter();
   const feasibilitySummaryUrl = `/candidacies/${candidacyId}/feasibility-aap`;
@@ -59,6 +63,7 @@ export default function SendFileCandidatePage() {
         dematerializedFeasibilityFile={
           dematerializedFeasibilityFile as DematerializedFeasibilityFile
         }
+        candidacy={candidacy as Candidacy}
         HasBeenSentComponent={
           <HasBeenSentComponent
             sentToCandidateAt={

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

@@ -17,133 +17,137 @@ const sendToCertificationAuthority = graphql(`
   }
 `);
 
-const feasibilityGetActiveFeasibilityByCandidacyId = graphql(`
-  query feasibilityGetActiveFeasibilityByCandidacyId($candidacyId: ID!) {
-    feasibility_getActiveFeasibilityByCandidacyId(candidacyId: $candidacyId) {
-      dematerializedFeasibilityFile {
-        id
-        swornStatementFile {
-          name
-          previewUrl
-          mimeType
-        }
-        sentToCandidateAt
-        sentToCertificationAuthorityAt
-        aapDecision
-        aapDecisionComment
-        prerequisites {
-          label
-          state
-        }
-        firstForeignLanguage
-        secondForeignLanguage
-        option
-        blocsDeCompetences {
-          certificationCompetenceBloc {
-            id
-            code
+const getActiveFeasibilitySendFileCertificationAuthorityByCandidacyId = graphql(
+  `
+    query getActiveFeasibilitySendFileCertificationAuthorityByCandidacyId(
+      $candidacyId: ID!
+    ) {
+      feasibility_getActiveFeasibilityByCandidacyId(candidacyId: $candidacyId) {
+        feasibilityFileSentAt
+        dematerializedFeasibilityFile {
+          id
+          swornStatementFile {
+            name
+            previewUrl
+            mimeType
+          }
+          sentToCandidateAt
+          aapDecision
+          aapDecisionComment
+          prerequisites {
             label
-            isOptional
-            FCCompetences
-            competences {
+            state
+          }
+          firstForeignLanguage
+          secondForeignLanguage
+          option
+          blocsDeCompetences {
+            certificationCompetenceBloc {
               id
+              code
               label
+              isOptional
+              FCCompetences
+              competences {
+                id
+                label
+              }
             }
           }
-        }
-        certificationCompetenceDetails {
-          text
-          state
-          certificationCompetence {
-            id
-            label
+          certificationCompetenceDetails {
+            text
+            state
+            certificationCompetence {
+              id
+              label
+            }
           }
-        }
-        attachments {
-          type
-          file {
-            name
-            previewUrl
-            mimeType
+          attachments {
+            type
+            file {
+              name
+              previewUrl
+              mimeType
+            }
           }
         }
-      }
-      candidacy {
-        certificationAuthorities {
-          label
-        }
-        individualHourCount
-        collectiveHourCount
-        additionalHourCount
-        basicSkills {
-          label
-          id
-        }
-        mandatoryTrainings {
-          label
-          id
-        }
-        certification {
+        candidacy {
           certificationAuthorities {
-            id
             label
           }
-          label
-          codeRncp
-          level
-          degree {
-            longLabel
-            level
+          individualHourCount
+          collectiveHourCount
+          additionalHourCount
+          basicSkills {
+            label
+            id
           }
-        }
-        goals {
-          id
-          label
-          isActive
-        }
-        experiences {
-          id
-          title
-          startedAt
-          duration
-          description
-        }
-        certificateSkills
-        candidate {
-          highestDegree {
-            level
-            longLabel
+          mandatoryTrainings {
+            label
+            id
           }
-          niveauDeFormationLePlusEleve {
+          certification {
+            certificationAuthorities {
+              id
+              label
+            }
+            label
+            codeRncp
             level
+            degree {
+              longLabel
+              level
+            }
           }
-          firstname
-          firstname2
-          firstname3
-          lastname
-          email
-          givenName
-          birthdate
-          birthCity
-          birthDepartment {
+          goals {
+            id
             label
-            code
-            region {
-              code
+            isActive
+          }
+          experiences {
+            id
+            title
+            startedAt
+            duration
+            description
+          }
+          certificateSkills
+          candidate {
+            highestDegree {
+              level
+              longLabel
+            }
+            niveauDeFormationLePlusEleve {
+              level
+            }
+            firstname
+            firstname2
+            firstname3
+            lastname
+            email
+            givenName
+            birthdate
+            birthCity
+            birthDepartment {
               label
+              code
+              region {
+                code
+                label
+              }
             }
+            nationality
+            gender
+            phone
+            city
+            street
+            zip
           }
-          nationality
-          gender
-          phone
-          city
-          street
-          zip
         }
       }
     }
-  }
-`);
+  `,
+);
 
 export const useSendFileCertificationAuthority = () => {
   const { graphqlClient } = useGraphQlClient();
@@ -157,9 +161,12 @@ export const useSendFileCertificationAuthority = () => {
       "dematerializedFeasibilityFileSendFileCertificationAuthorityByCandidacyId",
     ],
     queryFn: () =>
-      graphqlClient.request(feasibilityGetActiveFeasibilityByCandidacyId, {
-        candidacyId,
-      }),
+      graphqlClient.request(
+        getActiveFeasibilitySendFileCertificationAuthorityByCandidacyId,
+        {
+          candidacyId,
+        },
+      ),
   });
 
   const { mutateAsync: sendToCertificationAuthorityMutation } = useMutation({
@@ -183,11 +190,13 @@ export const useSendFileCertificationAuthority = () => {
   const dematerializedFeasibilityFile =
     feasibility?.dematerializedFeasibilityFile;
   const dematerializedFeasibilityFileId = dematerializedFeasibilityFile?.id;
+  const feasibilityFileSentAt = feasibility?.feasibilityFileSentAt;
 
   return {
     dematerializedFeasibilityFileId,
     candidacy,
     sendToCertificationAuthorityMutation,
     dematerializedFeasibilityFile,
+    feasibilityFileSentAt,
   };
 };