chore(api+admin+candidate): deleted certification status column and replaced it by the the status_v2 column (now renamed status)

agarbe · agarbe · commit dcdcd6000a89 · 2024-12-10T17:52:48.000+01:00
diff --git a/packages/reva-admin-react/cypress/e2e/certifications/certifications-list/fixtures/certifications.json b/packages/reva-admin-react/cypress/e2e/certifications/certifications-list/fixtures/certifications.json
@@ -7,7 +7,6 @@
           "label": "Bac Pro Accompagnement, soins et services à la personne - à domicile",
           "codeRncp": "12296",
           "status": "INACTIVE",
-          "statusV2": "INACTIVE",
           "visible": false,
           "certificationAuthorityStructure": {
             "label": "Structure certificatrice inconnue"
@@ -18,8 +17,7 @@
           "id": "654c9471-6e2e-4ff2-a5d8-2069e78ea0d6",
           "label": "Bac Pro Accompagnement, soins et services à la personne - en structure",
           "codeRncp": "12301",
-          "status": "AVAILABLE",
-          "statusV2": "VALIDE_PAR_CERTIFICATEUR",
+          "status": "VALIDE_PAR_CERTIFICATEUR",
           "visible": true,
           "certificationAuthorityStructure": {
             "label": "Structure certificatrice inconnue"
@@ -30,8 +28,7 @@
           "id": "efa751cb-f5c2-4d90-b390-e5726eeebb19",
           "label": "Bac Professionnel Accompagnement, soins et services à la personnes Option A : à domicile",
           "codeRncp": "12296",
-          "status": "AVAILABLE",
-          "statusV2": "VALIDE_PAR_CERTIFICATEUR",
+          "status": "VALIDE_PAR_CERTIFICATEUR",
           "visible": true,
           "certificationAuthorityStructure": {
             "label": "Ministère de l'Education Nationale et de la Jeunesse"
diff --git a/packages/reva-admin-react/cypress/e2e/certifications/update-certification-page/fixtures/certification-bp-boucher.json b/packages/reva-admin-react/cypress/e2e/certifications/update-certification-page/fixtures/certification-bp-boucher.json
@@ -4,8 +4,7 @@
       "id": "bf78b4d6-f6ac-4c8f-9e6b-d6c6ae9e891b",
       "label": "BP Boucher",
       "codeRncp": "37310",
-      "status": "AVAILABLE",
-      "statusV2": "BROUILLON",
+      "status": "BROUILLON",
       "rncpExpiresAt": 1788127200000,
       "rncpDeliveryDeadline": null,
       "availableAt": 1688162400000,
diff --git a/packages/reva-admin-react/cypress/e2e/certifications/update-certification-page/update-certification-page.cy.ts b/packages/reva-admin-react/cypress/e2e/certifications/update-certification-page/update-certification-page.cy.ts
@@ -5,12 +5,12 @@ function interceptCertification({
   withStructure,
   withCertificationAuthoritiesOfCertification,
   withCertificationRegistryManagerAssociatedToStructure,
-  statusV2,
+  status,
 }: {
   withStructure?: boolean;
   withCertificationAuthoritiesOfCertification?: boolean;
   withCertificationRegistryManagerAssociatedToStructure?: boolean;
-  statusV2?: string;
+  status?: string;
 } = {}) {
   cy.intercept("POST", "/api/graphql", (req) => {
     stubQuery(
@@ -28,8 +28,7 @@ function interceptCertification({
       data: {
         getCertification: {
           ...certificationBPBoucher.data.getCertification,
-          statusV2:
-            statusV2 || certificationBPBoucher.data.getCertification.statusV2,
+          status: status || certificationBPBoucher.data.getCertification.status,
           certificationAuthorities: withCertificationAuthoritiesOfCertification
             ? [
                 {
@@ -278,8 +277,8 @@ context("when i access the update certification page ", () => {
       );
     });
 
-    it("let me check if buttons 'envoyer' and 'réinitialiser' are visible is statusV2 equal to 'BROUILLON'", function () {
-      interceptCertification({ statusV2: "BROUILLON" });
+    it("let me check if buttons 'envoyer' and 'réinitialiser' are visible is status equal to 'BROUILLON'", function () {
+      interceptCertification({ status: "BROUILLON" });
 
       cy.admin("/certifications/bf78b4d6-f6ac-4c8f-9e6b-d6c6ae9e891b");
       cy.wait("@activeFeaturesForConnectedUser");
@@ -291,8 +290,8 @@ context("when i access the update certification page ", () => {
       cy.get('[data-test="button-reset"]').should("exist");
     });
 
-    it("let me check if buttons 'envoyer' and 'réinitialiser' are no more visible if statusV2 different from 'BROUILLON'", function () {
-      interceptCertification({ statusV2: "A_VALIDER_PAR_CERTIFICATEUR" });
+    it("let me check if buttons 'envoyer' and 'réinitialiser' are no more visible if status different from 'BROUILLON'", function () {
+      interceptCertification({ status: "A_VALIDER_PAR_CERTIFICATEUR" });
 
       cy.admin("/certifications/bf78b4d6-f6ac-4c8f-9e6b-d6c6ae9e891b");
       cy.wait("@activeFeaturesForConnectedUser");
diff --git a/packages/reva-admin-react/cypress/e2e/responsable-certifications/certifications/update-certification-page/fixtures/certification-bp-boucher.json b/packages/reva-admin-react/cypress/e2e/responsable-certifications/certifications/update-certification-page/fixtures/certification-bp-boucher.json
@@ -4,8 +4,7 @@
       "id": "bf78b4d6-f6ac-4c8f-9e6b-d6c6ae9e891b",
       "label": "BP Boucher",
       "codeRncp": "37310",
-      "status": "AVAILABLE",
-      "statusV2": "BROUILLON",
+      "status": "BROUILLON",
       "rncpExpiresAt": 1788127200000,
       "rncpDeliveryDeadline": null,
       "availableAt": 1688162400000,
diff --git a/packages/reva-admin-react/src/app/(admin)/certifications/(list)/page.tsx b/packages/reva-admin-react/src/app/(admin)/certifications/(list)/page.tsx
@@ -3,7 +3,7 @@ import { WhiteCard } from "@/components/card/white-card/WhiteCard";
 import { useGraphQlClient } from "@/components/graphql/graphql-client/GraphqlClient";
 import { SearchList } from "@/components/search/search-list/SearchList";
 import { graphql } from "@/graphql/generated";
-import { CertificationStatusV2 } from "@/graphql/generated/graphql";
+import { CertificationStatus } from "@/graphql/generated/graphql";
 import { useQuery } from "@tanstack/react-query";
 import { useSearchParams } from "next/navigation";
 import { Button } from "@codegouvfr/react-dsfr/Button";
@@ -14,7 +14,7 @@ const getCertificationsQuery = graphql(`
   query getCertificationsV2ForListPage(
     $offset: Int
     $searchFilter: String
-    $status: CertificationStatusV2
+    $status: CertificationStatus
     $visible: Boolean
   ) {
     searchCertificationsForAdmin(
@@ -28,7 +28,7 @@ const getCertificationsQuery = graphql(`
         id
         label
         codeRncp
-        statusV2
+        status
         visible
         certificationAuthorityStructure {
           label
@@ -66,7 +66,7 @@ const CertificationListPage = () => {
       graphqlClient.request(getCertificationsQuery, {
         offset: (currentPage - 1) * RECORDS_PER_PAGE,
         searchFilter,
-        status: status as CertificationStatusV2,
+        status: status as CertificationStatus,
         visible,
       }),
   });
@@ -95,7 +95,7 @@ const CertificationListPage = () => {
                 <div className="flex flex-row justify-between items-center">
                   <span className="text-gray-500 text-sm">{c.codeRncp}</span>
                   <BadgeCertificationStatus
-                    status={c.statusV2}
+                    status={c.status}
                     visible={c.visible}
                   />
                 </div>
@@ -124,7 +124,7 @@ const BadgeCertificationStatus = ({
   status,
   visible,
 }: {
-  status: CertificationStatusV2;
+  status: CertificationStatus;
   visible: boolean;
 }) => (
   <>
diff --git a/packages/reva-admin-react/src/app/(admin)/certifications/[certificationId]/page.tsx b/packages/reva-admin-react/src/app/(admin)/certifications/[certificationId]/page.tsx
@@ -65,7 +65,7 @@ const PageContent = ({
     }
   };
 
-  const isEditable = certification.statusV2 == "BROUILLON";
+  const isEditable = certification.status == "BROUILLON";
 
   return (
     <div data-test="update-certification-page">
diff --git a/packages/reva-admin-react/src/app/(admin)/certifications/[certificationId]/updateCertification.hook.ts b/packages/reva-admin-react/src/app/(admin)/certifications/[certificationId]/updateCertification.hook.ts
@@ -8,7 +8,7 @@ const getCertificationQuery = graphql(`
       id
       label
       codeRncp
-      statusV2
+      status
       rncpExpiresAt
       rncpDeliveryDeadline
       availableAt
diff --git a/packages/reva-admin-react/src/app/(certificateur)/certification-authorities/local-accounts/certificationAuthorityQueries.tsx b/packages/reva-admin-react/src/app/(certificateur)/certification-authorities/local-accounts/certificationAuthorityQueries.tsx
@@ -29,7 +29,7 @@ const getAccountForConnectionUser = graphql(`
           id
           label
           codeRncp
-          statusV2
+          status
         }
         certificationAuthorityLocalAccounts {
           id
diff --git a/packages/reva-admin-react/src/app/(certificateur)/certification-authorities/local-accounts/components/form-local-account/FormLocalAccount.component.tsx b/packages/reva-admin-react/src/app/(certificateur)/certification-authorities/local-accounts/components/form-local-account/FormLocalAccount.component.tsx
@@ -15,7 +15,7 @@ import {
   updateSelectedValueForAllItemsBasedOnItem,
   updateSelectedValueForAllItemsBasedOnValue,
 } from "@/components/tree-select";
-import { CertificationStatusV2 } from "@/graphql/generated/graphql";
+import { CertificationStatus } from "@/graphql/generated/graphql";
 import { treeSelectItemsToSelectedDepartmentIds } from "@/utils";
 
 export type LocalAccount = {
@@ -319,19 +319,18 @@ function getDefaultItemsCertifications(
   certifications: {
     id: string;
     label: string;
-    statusV2: CertificationStatusV2;
+    status: CertificationStatus;
     codeRncp: string;
   }[],
 ): TreeSelectItem[] {
   const items: TreeSelectItem[] = certifications
     .filter(
-      (c) =>
-        c.statusV2 === "VALIDE_PAR_CERTIFICATEUR" || c.statusV2 === "INACTIVE",
+      (c) => c.status === "VALIDE_PAR_CERTIFICATEUR" || c.status === "INACTIVE",
     )
     .map((certification) => ({
       id: certification.id,
       label: `${certification.codeRncp} - ${certification.label}${
-        certification.statusV2 === "INACTIVE" ? " (ancienne version)" : ""
+        certification.status === "INACTIVE" ? " (ancienne version)" : ""
       }`,
       selected: false,
     }));
diff --git a/packages/reva-api/modules/referential/features/addCertification.ts b/packages/reva-api/modules/referential/features/addCertification.ts
@@ -49,7 +49,7 @@ export const addCertification = async (params: { codeRncp: string }) => {
 
   const certification = await prismaClient.certification.create({
     data: {
-      statusV2: "BROUILLON",
+      status: "BROUILLON",
       feasibilityFormat: "DEMATERIALIZED",
       rncpId: codeRncp,
       label,
diff --git a/packages/reva-api/modules/referential/features/getActiveCertifications.ts b/packages/reva-api/modules/referential/features/getActiveCertifications.ts
@@ -16,7 +16,7 @@ export const getActiveCertifications = async (filters?: {
         where: {
           formacodeId: { in: domaines },
           certification: {
-            status: "AVAILABLE",
+            visible: true,
             level: { in: levels },
             certificationOnConventionCollective: {
               none: {},
@@ -54,7 +54,7 @@ export const getActiveCertifications = async (filters?: {
       await prismaClient.certificationOnConventionCollective.findMany({
         where: {
           certification: {
-            status: "AVAILABLE",
+            visible: true,
             level: { in: levels },
           },
         },
diff --git a/packages/reva-api/modules/referential/features/getFormacodes.ts b/packages/reva-api/modules/referential/features/getFormacodes.ts
@@ -29,7 +29,7 @@ export async function getAvailableFormacodes(): Promise<Formacode[]> {
   const formacodes: Formacode[] = await getFormacodes();
 
   const certifications = await prismaClient.certification.findMany({
-    where: { status: "AVAILABLE" },
+    where: { visible: true },
     include: { certificationOnFormacode: true },
   });
 
diff --git a/packages/reva-api/modules/referential/features/makeCertificationsAvailableIfAvailableAtDateIsPast.ts b/packages/reva-api/modules/referential/features/makeCertificationsAvailableIfAvailableAtDateIsPast.ts
@@ -6,9 +6,9 @@ export const makeCertificationsAvailableIfAvailableAtDateIsPast = () =>
   prismaClient.certification.updateMany({
     where: {
       visible: false,
-      statusV2: "VALIDE_PAR_CERTIFICATEUR",
+      status: "VALIDE_PAR_CERTIFICATEUR",
       availableAt: { lte: startOfToday() },
       expiresAt: { gt: startOfToday() },
     },
-    data: { status: "AVAILABLE", visible: true },
+    data: { visible: true },
   });
diff --git a/packages/reva-api/modules/referential/features/resetCompetenceBlocsByCertificationId.ts b/packages/reva-api/modules/referential/features/resetCompetenceBlocsByCertificationId.ts
@@ -17,7 +17,7 @@ export const resetCompetenceBlocsByCertificationId = async (params: {
     );
   }
 
-  if (certification.statusV2 != "BROUILLON") {
+  if (certification.status != "BROUILLON") {
     throw new Error(
       "Le statut de la certification doit être à l'état 'Brouillon'",
     );
diff --git a/packages/reva-api/modules/referential/features/searchCertificationsForAdmin.ts b/packages/reva-api/modules/referential/features/searchCertificationsForAdmin.ts
@@ -2,7 +2,7 @@ import { $Enums, Prisma } from "@prisma/client";
 
 import { prismaClient } from "../../../prisma/client";
 import { processPaginationInfo } from "../../shared/list/pagination";
-import { Certification, CertificationStatusV2 } from "../referential.types";
+import { Certification, CertificationStatus } from "../referential.types";
 
 export const searchCertificationsForAdmin = async ({
   offset,
@@ -14,7 +14,7 @@ export const searchCertificationsForAdmin = async ({
   offset?: number;
   limit?: number;
   searchText?: string;
-  status?: CertificationStatusV2;
+  status?: CertificationStatus;
   visible?: boolean;
 }): Promise<PaginatedListResult<Certification>> => {
   const realLimit = limit || 10;
@@ -46,7 +46,7 @@ export const searchCertificationsForAdmin = async ({
   if (status) {
     whereClause = {
       ...whereClause,
-      statusV2: status as $Enums.CertificationStatusV2,
+      status: status as $Enums.CertificationStatus,
     };
   }
 
diff --git a/packages/reva-api/modules/referential/features/sendCertificationToRegistryManager.ts b/packages/reva-api/modules/referential/features/sendCertificationToRegistryManager.ts
@@ -24,15 +24,15 @@ export const sendCertificationToRegistryManager = async ({
     );
   }
 
-  if (certification.statusV2 != "BROUILLON") {
+  if (certification.status != "BROUILLON") {
     throw new Error(
       "Le statut de la certification doit être à l'état 'Brouillon'",
     );
   }
 
   const updatedCertification = await prismaClient.certification.update({
     where: { id: certification.id },
-    data: { statusV2: "A_VALIDER_PAR_CERTIFICATEUR" },
+    data: { status: "A_VALIDER_PAR_CERTIFICATEUR" },
   });
 
   return updatedCertification;
diff --git a/packages/reva-api/modules/referential/referential.graphql b/packages/reva-api/modules/referential/referential.graphql
@@ -21,7 +21,7 @@ type Certification {
   accessibleJobType: String
   abilities: String
   codeRncp: String!
-  statusV2: CertificationStatusV2!
+  status: CertificationStatus!
   visible: Boolean!
   typeDiplome: String
   degree: Degree!
@@ -91,7 +91,7 @@ type ConventionCollective {
   label: String!
 }
 
-enum CertificationStatusV2 {
+enum CertificationStatus {
   BROUILLON
   A_VALIDER_PAR_CERTIFICATEUR
   VALIDE_PAR_CERTIFICATEUR
@@ -259,7 +259,7 @@ type Query {
     offset: Int
     limit: Int
     searchText: String
-    status: CertificationStatusV2
+    status: CertificationStatus
     visible: Boolean
   ): CertificationPage!
   searchCertificationsV2ForRegistryManager(
diff --git a/packages/reva-api/modules/referential/referential.test.ts b/packages/reva-api/modules/referential/referential.test.ts
@@ -16,7 +16,6 @@ const createCertifications = async () => {
   for (const cert of particulierEmployeurCertifications) {
     await createCertificationHelper({
       label: cert.label,
-      status: "AVAILABLE",
     });
   }
 };
diff --git a/packages/reva-api/modules/referential/referential.types.ts b/packages/reva-api/modules/referential/referential.types.ts
@@ -14,23 +14,14 @@ export interface DropOutReason {
 }
 
 const CertificationStatus = {
-  INACTIVE: "INACTIVE",
-  SOON: "SOON",
-  AVAILABLE: "AVAILABLE",
-};
-
-type CertificationStatus =
-  (typeof CertificationStatus)[keyof typeof CertificationStatus];
-
-export const CertificationStatusV2 = {
   BROUILLON: "BROUILLON",
   A_VALIDER_PAR_CERTIFICATEUR: "A_VALIDER_PAR_CERTIFICATEUR",
   VALIDE_PAR_CERTIFICATEUR: "VALIDE_PAR_CERTIFICATEUR",
   INACTIVE: "INACTIVE",
 };
 
-export type CertificationStatusV2 =
-  (typeof CertificationStatusV2)[keyof typeof CertificationStatusV2];
+export type CertificationStatus =
+  (typeof CertificationStatus)[keyof typeof CertificationStatus];
 
 export interface Certification {
   id: string;
@@ -43,7 +34,6 @@ export interface Certification {
   abilities: string | null;
   codeRncp: string;
   status: CertificationStatus;
-  statusV2: CertificationStatusV2;
   visible: boolean | null;
 }
 
diff --git a/packages/reva-api/prisma/migrations/20241210155217_update_certification_replace_status_by_status_v2/migration.sql b/packages/reva-api/prisma/migrations/20241210155217_update_certification_replace_status_by_status_v2/migration.sql
diff --git a/packages/reva-api/prisma/schema.prisma b/packages/reva-api/prisma/schema.prisma
diff --git a/packages/reva-api/prisma/seed/referentials/seed-certifications.ts b/packages/reva-api/prisma/seed/referentials/seed-certifications.ts
diff --git a/packages/reva-api/scripts/updateAvailableCertificationsWithRncpFields.ts b/packages/reva-api/scripts/updateAvailableCertificationsWithRncpFields.ts
diff --git a/packages/reva-api/scripts/updateAvailableCertificationsWithRncpFieldsAndSubDomains.ts b/packages/reva-api/scripts/updateAvailableCertificationsWithRncpFieldsAndSubDomains.ts
diff --git a/packages/reva-api/test/helpers/entities/create-certification-helper.ts b/packages/reva-api/test/helpers/entities/create-certification-helper.ts
diff --git a/packages/reva-candidate/src/app/(project)/(accompagne)/set-certification/set-certification.hooks.ts b/packages/reva-candidate/src/app/(project)/(accompagne)/set-certification/set-certification.hooks.ts

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ const PageContent = ({`
`65`	`65`	`}`
`66`	`66`	`};`
`67`	`67`
`68`		`- const isEditable = certification.statusV2 == "BROUILLON";`
	`68`	`+ const isEditable = certification.status == "BROUILLON";`
`69`	`69`
`70`	`70`	`return (`
`71`	`71`	`<div data-test="update-certification-page">`
Original file line number	Diff line number	Diff line change
@@ -29,7 +29,7 @@ const getAccountForConnectionUser = graphql(`
`29`	`29`	`id`
`30`	`30`	`label`
`31`	`31`	`codeRncp`
`32`		`- statusV2`
	`32`	`+ status`
`33`	`33`	`}`
`34`	`34`	`certificationAuthorityLocalAccounts {`
`35`	`35`	`id`