feat(api+admin): certification authority can now have multiple structures

agarbe · agarbe · commit 7d5fb4844c95 · 2024-12-03T15:14:50.000+01:00
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certificationAuthority.hooks.ts b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certificationAuthority.hooks.ts
@@ -33,7 +33,7 @@ const getCertificationAuthority = graphql(`
           label
         }
       }
-      certificationAuthorityStructure {
+      certificationAuthorityStructures {
         id
         label
       }
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certifications/certifications.hooks.ts b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certifications/certifications.hooks.ts
@@ -14,7 +14,8 @@ const getCertificationAuthorityAndCertificationsQuery = graphql(`
     certification_authority_getCertificationAuthority(id: $id) {
       id
       label
-      certificationAuthorityStructure {
+      certificationAuthorityStructures {
+        id
         label
         certifications {
           id
@@ -106,14 +107,14 @@ export const useCertificationsPage = ({
             ) || false,
         }))
         .sort((c) =>
-          certificationAuthority?.certificationAuthorityStructure?.certifications.some(
-            (ca) => ca.id === c.id,
+          certificationAuthority?.certificationAuthorityStructures?.some(
+            (cas) => cas?.certifications.some((ca) => ca.id === c.id),
           )
             ? -1
             : 1,
         ),
     [
-      certificationAuthority?.certificationAuthorityStructure?.certifications,
+      certificationAuthority?.certificationAuthorityStructures,
       certificationAuthority?.certifications,
       getCertificationAuthorityAndCertificationsResponse
         ?.searchCertificationsForAdmin?.rows,
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certifications/page.tsx b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/certifications/page.tsx
@@ -44,7 +44,9 @@ const CertificationAuthorityCertificationsPage = () => {
         <CertificationAuthorityStructureBreadcrumb
           certificationAuthorityStructureId={certificationAuthorityStructureId}
           certificationAuthorityStructureLabel={
-            certificationAuthority.certificationAuthorityStructure.label
+            certificationAuthority.certificationAuthorityStructures.find(
+              (s) => s.id === certificationAuthorityStructureId,
+            )?.label || "inconnu"
           }
           certificationAuthorityId={certificationAuthorityId}
           certificationAuthoritylabel={certificationAuthority.label}
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/comptes-collaborateurs/[certificationAuthorityLocalAccountId]/comptesCollaborateurs.hooks.ts b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/comptes-collaborateurs/[certificationAuthorityLocalAccountId]/comptesCollaborateurs.hooks.ts
@@ -36,7 +36,7 @@ const getCertificationAuthorityLocalAccountQuery = graphql(`
       certificationAuthority {
         id
         label
-        certificationAuthorityStructure {
+        certificationAuthorityStructures {
           id
           label
         }
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/comptes-collaborateurs/[certificationAuthorityLocalAccountId]/page.tsx b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/comptes-collaborateurs/[certificationAuthorityLocalAccountId]/page.tsx
@@ -54,8 +54,9 @@ const CertificationAuthorityStructureComptesCollaborateursPage = () => {
               certificationAuthorityStructureId
             }
             certificationAuthorityStructureLabel={
-              certificationAuthorityLocalAccount.certificationAuthority
-                .certificationAuthorityStructure.label
+              certificationAuthorityLocalAccount.certificationAuthority.certificationAuthorityStructures.find(
+                (s) => s.id === certificationAuthorityStructureId,
+              )?.label || "inconnu"
             }
             certificationAuthorityId={
               certificationAuthorityLocalAccount.certificationAuthority.id
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/page.tsx b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/page.tsx
@@ -14,6 +14,7 @@ import {
   useCertificationAuthority,
   useCertificationAuthorityForm,
 } from "./certificationAuthority.hooks";
+import { useParams } from "next/navigation";
 
 type FormData = z.infer<typeof schema>;
 
@@ -29,10 +30,12 @@ const schema = z.object({
 
 const CertificationAuthorityAdminComponent = ({
   certificationAuthority,
+  certificationAuthorityStructureId,
 }: {
   certificationAuthority: NonNullable<
     ReturnType<typeof useCertificationAuthority>["certificationAuthority"]
   >;
+  certificationAuthorityStructureId: string;
 }) => {
   const { updateCertificationAuthority } = useCertificationAuthorityForm();
 
@@ -86,11 +89,11 @@ const CertificationAuthorityAdminComponent = ({
   return (
     <div className="flex flex-col flex-1">
       <CertificationAuthorityStructureBreadcrumb
-        certificationAuthorityStructureId={
-          certificationAuthority.certificationAuthorityStructure.id
-        }
+        certificationAuthorityStructureId={certificationAuthorityStructureId}
         certificationAuthorityStructureLabel={
-          certificationAuthority.certificationAuthorityStructure.label
+          certificationAuthority.certificationAuthorityStructures.find(
+            (s) => s.id === certificationAuthorityStructureId,
+          )?.label || "inconnu"
         }
         pageLabel={certificationAuthority.label}
       />
@@ -146,23 +149,23 @@ const CertificationAuthorityAdminComponent = ({
         </form>
         <InterventionAreaSummaryCard
           regions={regionsAndDepartments}
-          updateButtonHref={`/certification-authority-structures/${certificationAuthority.certificationAuthorityStructure.id}/certificateurs-administrateurs/${certificationAuthority.id}/zone-intervention`}
+          updateButtonHref={`/certification-authority-structures/${certificationAuthorityStructureId}/certificateurs-administrateurs/${certificationAuthority.id}/zone-intervention`}
         />
         <CertificationsSummaryCard
           certifications={certificationAuthority.certifications}
-          updateButtonHref={`/certification-authority-structures/${certificationAuthority.certificationAuthorityStructure.id}/certificateurs-administrateurs/${certificationAuthority.id}/certifications`}
+          updateButtonHref={`/certification-authority-structures/${certificationAuthorityStructureId}/certificateurs-administrateurs/${certificationAuthority.id}/certifications`}
         />
         <AccountsSummaryCard
           accounts={certificationAuthority.certificationAuthorityLocalAccounts}
-          hrefPrefix={`/certification-authority-structures/${certificationAuthority.certificationAuthorityStructure.id}/certificateurs-administrateurs/${certificationAuthority.id}/comptes-collaborateurs`}
+          hrefPrefix={`/certification-authority-structures/${certificationAuthorityStructureId}/certificateurs-administrateurs/${certificationAuthority.id}/comptes-collaborateurs`}
         />
       </div>
       <div className="flex flex-row justify-end mt-4 gap-x-4">
         <Button
           className="mr-auto"
           priority="secondary"
           linkProps={{
-            href: `/certification-authority-structures/${certificationAuthority.certificationAuthorityStructure.id}`,
+            href: `/certification-authority-structures/${certificationAuthorityStructureId}`,
           }}
         >
           Retour
@@ -188,6 +191,10 @@ const CertificationAuthorityAdminPage = () => {
   const { certificationAuthority, getCertificationAuthorityStatus } =
     useCertificationAuthority();
 
+  const { certificationAuthorityStructureId } = useParams<{
+    certificationAuthorityStructureId: string;
+  }>();
+
   if (
     !certificationAuthority ||
     getCertificationAuthorityStatus !== "success"
@@ -198,6 +205,7 @@ const CertificationAuthorityAdminPage = () => {
   return (
     <CertificationAuthorityAdminComponent
       certificationAuthority={certificationAuthority}
+      certificationAuthorityStructureId={certificationAuthorityStructureId}
     />
   );
 };
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/zone-intervention/page.tsx b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/zone-intervention/page.tsx
@@ -49,7 +49,9 @@ const CertificationAuthorityComponent = ({
       <CertificationAuthorityStructureBreadcrumb
         certificationAuthorityStructureId={certificationAuthorityStructureId}
         certificationAuthorityStructureLabel={
-          certificationAuthority.certificationAuthorityStructure.label
+          certificationAuthority.certificationAuthorityStructures.find(
+            (s) => s.id === certificationAuthorityStructureId,
+          )?.label || "inconnu"
         }
         certificationAuthorityId={certificationAuthorityId}
         certificationAuthoritylabel={certificationAuthority.label}
diff --git a/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/zone-intervention/zone-intervention.hook.ts b/packages/reva-admin-react/src/app/(admin)/certification-authority-structures/[certificationAuthorityStructureId]/certificateurs-administrateurs/[certificationAuthorityId]/zone-intervention/zone-intervention.hook.ts
@@ -14,7 +14,8 @@ const getCertificationAuthorityQuery = graphql(`
       label
       contactFullName
       contactEmail
-      certificationAuthorityStructure {
+      certificationAuthorityStructures {
+        id
         label
       }
       departments {
diff --git a/packages/reva-api/modules/certification-authority/certification-authority.graphql b/packages/reva-api/modules/certification-authority/certification-authority.graphql
@@ -8,7 +8,7 @@ type CertificationAuthority {
   regions: [Region!]!
   certifications: [Certification!]!
   certificationAuthorityLocalAccounts: [CertificationAuthorityLocalAccount!]!
-  certificationAuthorityStructure: CertificationAuthorityStructure!
+  certificationAuthorityStructures: [CertificationAuthorityStructure!]!
   showLocalAccountsContactInfo: Boolean!
 }
 
diff --git a/packages/reva-api/modules/certification-authority/certification-authority.resolvers.ts b/packages/reva-api/modules/certification-authority/certification-authority.resolvers.ts
@@ -39,6 +39,7 @@ import { updateCertificationAuthorityStructure } from "./features/updateCertific
 import { updateCertificationAuthorityStructureCertifications } from "./features/updateCertificationAuthorityStructureCertifications";
 import { getCertificationAuthorityLocalAccountByCertificationAuthorityId } from "./features/getCertificationAuthorityLocalAccountByCertificationAuthorityId";
 import { getAccountById } from "../account/features/getAccount";
+import { getCertificationAuthorityStructuresByCertificationAuthorityId } from "./features/getCertificationAuthorityStructuresByCertificationAuthorityId";
 
 const unsafeResolvers = {
   CertificationAuthority: {
@@ -52,11 +53,11 @@ const unsafeResolvers = {
       getCertificationsByCertificationAuthorityId({
         certificationAuthorityId: parent.id,
       }),
-    certificationAuthorityStructure: ({
-      oldCertificationAuthorityStructureId,
+    certificationAuthorityStructures: ({
+      id: certificationAuthorityId,
     }: CertificationAuthority) =>
-      getCertificationAuthorityStructureById({
-        certificationAuthorityStructureId: oldCertificationAuthorityStructureId,
+      getCertificationAuthorityStructuresByCertificationAuthorityId({
+        certificationAuthorityId,
       }),
     account: (parent: CertificationAuthority) =>
       getAccountByCertificationAuthorityId({
diff --git a/packages/reva-api/modules/certification-authority/features/getCertificationAuthorityStructuresByCertificationAuthorityId.ts b/packages/reva-api/modules/certification-authority/features/getCertificationAuthorityStructuresByCertificationAuthorityId.ts
@@ -0,0 +1,17 @@
+import { prismaClient } from "../../../prisma/client";
+
+export const getCertificationAuthorityStructuresByCertificationAuthorityId =
+  async ({ certificationAuthorityId }: { certificationAuthorityId: string }) =>
+    prismaClient.certificationAuthority
+      .findUnique({
+        where: { id: certificationAuthorityId },
+      })
+      .certificationAuthorityOnCertificationAuthorityStructure({
+        include: { certificationAuthorityStructure: true },
+        orderBy: { certificationAuthorityStructure: { label: "asc" } },
+      })
+      .then(
+        (caocass) =>
+          caocass?.map((caocas) => caocas.certificationAuthorityStructure) ||
+          [],
+      );

Original file line number	Diff line number	Diff line change
@@ -33,7 +33,7 @@ const getCertificationAuthority = graphql(`
`33`	`33`	`label`
`34`	`34`	`}`
`35`	`35`	`}`
`36`		`- certificationAuthorityStructure {`
	`36`	`+ certificationAuthorityStructures {`
`37`	`37`	`id`
`38`	`38`	`label`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
@@ -36,7 +36,7 @@ const getCertificationAuthorityLocalAccountQuery = graphql(`
`36`	`36`	`certificationAuthority {`
`37`	`37`	`id`
`38`	`38`	`label`
`39`		`- certificationAuthorityStructure {`
	`39`	`+ certificationAuthorityStructures {`
`40`	`40`	`id`
`41`	`41`	`label`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,9 @@ const CertificationAuthorityStructureComptesCollaborateursPage = () => {`
`54`	`54`	`certificationAuthorityStructureId`
`55`	`55`	`}`
`56`	`56`	`certificationAuthorityStructureLabel={`
`57`		`- certificationAuthorityLocalAccount.certificationAuthority`
`58`		`- .certificationAuthorityStructure.label`
	`57`	`+ certificationAuthorityLocalAccount.certificationAuthority.certificationAuthorityStructures.find(`
	`58`	`+ (s) => s.id === certificationAuthorityStructureId,`
	`59`	`+ )?.label \|\| "inconnu"`
`59`	`60`	`}`
`60`	`61`	`certificationAuthorityId={`
`61`	`62`	`certificationAuthorityLocalAccount.certificationAuthority.id`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ type CertificationAuthority {`
`8`	`8`	`regions: [Region!]!`
`9`	`9`	`certifications: [Certification!]!`
`10`	`10`	`certificationAuthorityLocalAccounts: [CertificationAuthorityLocalAccount!]!`
`11`		`- certificationAuthorityStructure: CertificationAuthorityStructure!`
	`11`	`+ certificationAuthorityStructures: [CertificationAuthorityStructure!]!`
`12`	`12`	`showLocalAccountsContactInfo: Boolean!`
`13`	`13`	`}`
`14`	`14`