feat(api): added the old prefix to certificationAuthorityStructure.certificationAuthorities and CertificationAuthority.certificationAuthorityStructure prisma field. They will be superceded by fields allowing multiple structures for a certification authority

Author: agarbe

packages/reva-api/modules/candidacy/security/candidacy.security.test.ts

@@ -195,7 +195,7 @@ test("Certification local account of the feasibility file of the candidacy shoul
   const certification = await createCertificationHelper({
     certificationAuthorityStructureId:
       certificationAuthorityLocalAccount.certificationAuthority
-        .certificationAuthorityStructureId,
+        .oldCertificationAuthorityStructureId,
   });
   const candidacyInput = await createCandidacyHelper({
     candidacyArgs: {

packages/reva-api/modules/certification-authority/certification-authority.resolvers.ts

@@ -53,10 +53,10 @@ const unsafeResolvers = {
         certificationAuthorityId: parent.id,
       }),
     certificationAuthorityStructure: ({
-      certificationAuthorityStructureId,
+      oldCertificationAuthorityStructureId,
     }: CertificationAuthority) =>
       getCertificationAuthorityStructureById({
-        certificationAuthorityStructureId,
+        certificationAuthorityStructureId: oldCertificationAuthorityStructureId,
       }),
     account: (parent: CertificationAuthority) =>
       getAccountByCertificationAuthorityId({

packages/reva-api/modules/certification-authority/certification-authority.types.ts

@@ -3,7 +3,7 @@ export interface CertificationAuthority {
   label: string;
   contactFullName: string | null;
   contactEmail: string | null;
-  certificationAuthorityStructureId: string;
+  oldCertificationAuthorityStructureId: string;
 }
 
 export interface CertificationAuthorityOrLocalAccount {

packages/reva-api/modules/certification-authority/features/createCertificationAuthority.ts

@@ -41,7 +41,7 @@ export const createCertificationAuthority = async ({
             })),
           },
         },
-        certificationAuthorityStructureId,
+        oldCertificationAuthorityStructureId: certificationAuthorityStructureId,
         label,
         contactEmail,
         contactFullName,

packages/reva-api/modules/certification-authority/features/getCertificationAuthoritiesByStructureId.ts

@@ -10,5 +10,5 @@ export async function getCertificationAuthoritiesByStructureId(
         id: structureId,
       },
     })
-    .certificationAuthorities();
+    .oldCertificationAuthorities();
 }

packages/reva-api/modules/feasibility/feasibility.test.ts

@@ -46,7 +46,8 @@ test("should count all (2) feasibilities for admin user", async () => {
 test("should count all (1) available feasibility for certificator user even if other exists on the same scope", async () => {
   const certification = await createCertificationHelper({});
   const certificationAuthority =
-    certification.certificationAuthorityStructure?.certificationAuthorities[0];
+    certification.certificationAuthorityStructure
+      ?.oldCertificationAuthorities[0];
   const candidacy = await createCandidacyHelper({
     candidacyArgs: {
       certificationId: certification.id,
@@ -107,7 +108,8 @@ test("should count no available feasibility for certificator user since he doesn
 test("should return a feasibilty for certificator since he is allowed to handle it", async () => {
   const certification = await createCertificationHelper({});
   const certificationAuthority =
-    certification.certificationAuthorityStructure?.certificationAuthorities[0];
+    certification.certificationAuthorityStructure
+      ?.oldCertificationAuthorities[0];
   const candidacy = await createCandidacyHelper({
     candidacyArgs: {
       certificationId: certification.id,
@@ -167,7 +169,8 @@ test("should return a feasibility error for certificator 3 since he doesn't hand
 test("should return all (1) available feasibility for certificateur user", async () => {
   const certification = await createCertificationHelper({});
   const certificationAuthority =
-    certification.certificationAuthorityStructure?.certificationAuthorities[0];
+    certification.certificationAuthorityStructure
+      ?.oldCertificationAuthorities[0];
   const candidacy = await createCandidacyHelper({
     candidacyArgs: {
       certificationId: certification.id,
@@ -253,7 +256,8 @@ const postFeasibilityDecision = ({
 test("should validate a feasibility since certificator is allowed to do so", async () => {
   const certification = await createCertificationHelper({});
   const certificationAuthority =
-    certification.certificationAuthorityStructure?.certificationAuthorities[0];
+    certification.certificationAuthorityStructure
+      ?.oldCertificationAuthorities[0];
   const candidacy = await createCandidacyHelper({
     candidacyArgs: {
       certificationId: certification.id,
@@ -318,7 +322,8 @@ test("should not validate a feasibility since certificator 3 doesn't handle it",
 test("should reject a feasibility since certificator is allowed to do so", async () => {
   const certification = await createCertificationHelper({});
   const certificationAuthority =
-    certification.certificationAuthorityStructure?.certificationAuthorities[0];
+    certification.certificationAuthorityStructure
+      ?.oldCertificationAuthorities[0];
   const candidacy = await createCandidacyHelper({
     candidacyArgs: {
       certificationId: certification.id,

packages/reva-api/prisma/schema.prisma

@@ -910,10 +910,11 @@ model ExamInfo {
 }
 
 model CertificationAuthorityStructure {
-  id                           String                        @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
-  label                        String                        @unique @db.VarChar(200)
-  certifications               Certification[]
-  certificationAuthorities     CertificationAuthority[]
+  id                          String                   @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid
+  label                       String                   @unique @db.VarChar(200)
+  certifications              Certification[]
+  oldCertificationAuthorities CertificationAuthority[] @relation("old_certification_authority_on_certification_authority_structure")
+
   certificationRegistryManager CertificationRegistryManager?
 
   @@map("certification_authority_structure")
@@ -933,9 +934,10 @@ model CertificationAuthority {
   certificationAuthorityLocalAccount    CertificationAuthorityLocalAccount[]
   DossierDeValidation                   DossierDeValidation[]
   Jury                                  Jury[]
-  certificationAuthorityStructure       CertificationAuthorityStructure         @relation(fields: [certificationAuthorityStructureId], references: [id], onDelete: Restrict)
-  certificationAuthorityStructureId     String                                  @map("certification_authority_structure_id") @db.Uuid
-  showLocalAccountsContactInfo          Boolean                                 @default(true) @map("show_local_accounts_contact_info")
+  oldCertificationAuthorityStructure    CertificationAuthorityStructure         @relation(fields: [oldCertificationAuthorityStructureId], references: [id], onDelete: Restrict, name: "old_certification_authority_on_certification_authority_structure")
+  oldCertificationAuthorityStructureId  String                                  @map("certification_authority_structure_id") @db.Uuid
+
+  showLocalAccountsContactInfo Boolean @default(true) @map("show_local_accounts_contact_info")
 
   @@map("certification_authority")
 }

packages/reva-api/test/helpers/entities/create-candidacy-helper.ts

@@ -80,7 +80,7 @@ export const createCandidacyHelper = async (args?: {
         include: {
           certificationAuthorityStructure: {
             include: {
-              certificationAuthorities: { include: { Account: true } },
+              oldCertificationAuthorities: { include: { Account: true } },
               certificationRegistryManager: { include: { account: true } },
             },
           },

packages/reva-api/test/helpers/entities/create-certification-authority-helper.ts

@@ -14,7 +14,7 @@ export const createCertificationAuthorityHelper = async (
       contactEmail: faker.internet.email(),
       contactFullName: faker.person.fullName(),
       label: faker.company.name(),
-      certificationAuthorityStructureId: certificationAuthorityStructure.id,
+      oldCertificationAuthorityStructureId: certificationAuthorityStructure.id,
       ...certificationAuthorityArgs,
       Account: {
         create: {
@@ -26,7 +26,7 @@ export const createCertificationAuthorityHelper = async (
       },
     },
     include: {
-      certificationAuthorityStructure: true,
+      oldCertificationAuthorityStructure: true,
       Account: true,
     },
   });

packages/reva-api/test/helpers/entities/create-certification-authority-local-account-helper.ts

@@ -20,7 +20,7 @@ export const createCertificationAuthorityLocalAccountHelper = async (
       certificationAuthority: {
         include: {
           Account: true,
-          certificationAuthorityStructure: {
+          oldCertificationAuthorityStructure: {
             include: { certifications: true },
           },
         },