[TECH] Supprime la colonne partnerKey (PIX-10162 )

#7659
1024pix · Dec 15, 2023 · eddfcd0 · eddfcd0
2 parents 3f730d5 + 4a95d4e
commit eddfcd0
Show file tree

Hide file tree

Showing 32 changed files with 70 additions and 115 deletions.
diff --git a/api/db/migrations/20231206185610_drop-column-partner-key.js b/api/db/migrations/20231206185610_drop-column-partner-key.js
@@ -0,0 +1,25 @@
+// Make sure you properly test your migration, especially DDL (Data Definition Language)
+// ! If the target table is large, and the migration take more than 20 minutes, the deployment will fail !
+
+// You can design and test your migration to avoid this by following this guide
+// https://1024pix.atlassian.net/wiki/spaces/DEV/pages/2153512965/Cr+er+une+migration
+
+// If your migrations target `answers` or `knowledge-elements`
+// contact @team-captains, because automatic migrations are not active on `pix-datawarehouse-production`
+// this may prevent data replication to succeed the day after your migration is deployed on `pix-api-production`
+const TABLE_NAME = 'complementary-certification-course-results';
+const COLUMN_NAME = 'partnerKey';
+
+const up = async function (knex) {
+  await knex.schema.table(TABLE_NAME, function (table) {
+    table.dropColumn(COLUMN_NAME);
+  });
+};
+
+const down = async function (knex) {
+  await knex.schema.table(TABLE_NAME, (table) => {
+    table.string(COLUMN_NAME).nullable();
+  });
+};
+
+export { up, down };
diff --git a/api/db/seeds/data/common/tooling/session-tooling.js b/api/db/seeds/data/common/tooling/session-tooling.js
@@ -961,7 +961,6 @@ async function _makeCandidatesComplementaryCertificationCertifiable(
     .select({
       badgeId: 'complementary-certification-badges.badgeId',
       complementaryCertificationBadgeId: 'complementary-certification-badges.id',
-      partnerKey: 'badges.key',
       campaignId: 'campaigns.id',
     })
     .join('badges', 'badges.id', 'complementary-certification-badges.badgeId')
@@ -973,7 +972,6 @@ async function _makeCandidatesComplementaryCertificationCertifiable(
       const {
         badgeId: selectedBadgeId,
         complementaryCertificationBadgeId,
-        partnerKey,
         campaignId,
       } = generic.pickOneRandomAmong(badgeAndComplementaryCertificationBadgeIds);
 
@@ -998,7 +996,10 @@ async function _makeCandidatesComplementaryCertificationCertifiable(
         type: Assessment.types.CAMPAIGN,
         campaignParticipationId,
       }).id;
-      certificationCandidate.complementaryCertificationBadgeInfo = { complementaryCertificationBadgeId, partnerKey };
+      certificationCandidate.complementaryCertificationBadgeInfo = {
+        complementaryCertificationBadgeId,
+        badgeId: selectedBadgeId,
+      };
       return { assessmentId, userId: certificationCandidate.userId };
     }),
   );
@@ -1108,7 +1109,7 @@ function _makeCandidatesPassCertification({
         createdAt: configSession.sessionDate,
       }).id;
       databaseBuilder.factory.buildComplementaryCertificationCourseResult({
-        partnerKey: certificationCandidate.complementaryCertificationBadgeInfo.partnerKey,
+        badgeId: certificationCandidate.complementaryCertificationBadgeInfo.badgeId,
         complementaryCertificationBadgeId:
           certificationCandidate.complementaryCertificationBadgeInfo.complementaryCertificationBadgeId,
         acquired: true,

diff --git a/api/lib/domain/models/ComplementaryCertificationScoringWithComplementaryReferential.js b/api/lib/domain/models/ComplementaryCertificationScoringWithComplementaryReferential.js
@@ -5,15 +5,13 @@ class ComplementaryCertificationScoringWithComplementaryReferential extends Part
   constructor({
     complementaryCertificationCourseId,
     complementaryCertificationBadgeId,
-    complementaryCertificationBadgeKey,
     reproducibilityRate,
     hasAcquiredPixCertification,
     minimumReproducibilityRate,
   } = {}) {
     super({
       complementaryCertificationCourseId,
       complementaryCertificationBadgeId,
-      partnerKey: complementaryCertificationBadgeKey,
       source: ComplementaryCertificationCourseResult.sources.PIX,
     });
 

diff --git a/api/lib/domain/read-models/CertifiedBadge.js b/api/lib/domain/read-models/CertifiedBadge.js
@@ -1,8 +1,7 @@
 import _ from 'lodash';
 
 class CertifiedBadge {
-  constructor({ partnerKey, label, imageUrl, stickerUrl, isTemporaryBadge, message }) {
-    this.partnerKey = partnerKey;
+  constructor({ label, imageUrl, stickerUrl, isTemporaryBadge, message }) {
     this.label = label;
     this.imageUrl = imageUrl;
     this.stickerUrl = stickerUrl;
@@ -18,10 +17,9 @@ class CertifiedBadge {
 
     return Object.values(complementaryCertificationCourseResultsByComplementaryCertificationCourseId)
       .map((complementaryCertificationCourseResultsForCourseId) => {
-        const { partnerKey, label, acquired, hasExternalJury, imageUrl, stickerUrl, certificateMessage } =
+        const { label, acquired, hasExternalJury, imageUrl, stickerUrl, certificateMessage } =
           complementaryCertificationCourseResultsForCourseId[0];
         const acquiredCertifiedBadge = {
-          partnerKey,
           label,
           imageUrl,
           stickerUrl,
@@ -51,14 +49,12 @@ function _getLowestByLevel(complementaryCertificationCourseResults) {
 function _getAcquiredCertifiedBadgesDTOWithExternalJury(complementaryCertificationCourseResults) {
   if (complementaryCertificationCourseResults.length === 1) {
     const {
-      partnerKey,
       label,
       imageUrl,
       stickerUrl,
       temporaryCertificateMessage: message,
     } = complementaryCertificationCourseResults[0];
     return new CertifiedBadge({
-      partnerKey,
       label,
       imageUrl,
       stickerUrl,
@@ -67,13 +63,12 @@ function _getAcquiredCertifiedBadgesDTOWithExternalJury(complementaryCertificati
     });
   }
 
-  const { partnerKey, label, imageUrl, stickerUrl, certificateMessage, acquired } = _getLowestByLevel(
+  const { label, imageUrl, stickerUrl, certificateMessage, acquired } = _getLowestByLevel(
     complementaryCertificationCourseResults,
   );
 
   if (acquired) {
     return new CertifiedBadge({
-      partnerKey,
       label,
       imageUrl,
       stickerUrl,

diff --git a/api/lib/infrastructure/repositories/certificate-repository.js b/api/lib/infrastructure/repositories/certificate-repository.js
@@ -71,7 +71,6 @@ export { getPrivateCertificate, findPrivateCertificatesByUserId, getShareableCer
 async function _getCertifiedBadges(certificationCourseId) {
   const complementaryCertificationCourseResults = await knex
     .select(
-      'badges.key as partnerKey',
       'complementary-certification-course-results.source',
       'complementary-certification-course-results.acquired',
       'complementary-certification-course-results.complementaryCertificationCourseId',

diff --git a/api/src/certification/course/infrastructure/repositories/certificate-repository.js b/api/src/certification/course/infrastructure/repositories/certificate-repository.js
@@ -142,7 +142,6 @@ function _toDomainForCertificationAttestation({ certificationCourseDTO, competen
 async function _getCertifiedBadges(certificationCourseId) {
   const complementaryCertificationCourseResults = await knex
     .select(
-      'badges.key as partnerKey',
       'complementary-certification-course-results.source',
       'complementary-certification-course-results.acquired',
       'complementary-certification-course-results.complementaryCertificationCourseId',

diff --git a/api/tests/acceptance/application/certifications/index_test.js b/api/tests/acceptance/application/certifications/index_test.js
@@ -294,7 +294,6 @@ describe('Acceptance | API | Certifications', function () {
                 imageUrl: 'http://tarte.fr/mirabelle.png',
                 isTemporaryBadge: false,
                 label: 'tarte à la mirabelle',
-                partnerKey: 'charlotte_aux_fraises',
                 stickerUrl: 'http://tarte.fr/sticker.png',
                 message: 'Miam',
               },
@@ -458,7 +457,6 @@ describe('Acceptance | API | Certifications', function () {
                   imageUrl: 'http://tarte.fr/mirabelle.png',
                   isTemporaryBadge: false,
                   label: 'tarte à la mirabelle',
-                  partnerKey: 'charlotte_aux_fraises',
                   stickerUrl: 'http://tarte.fr/sticker.png',
                   message: 'Miam',
                 },
@@ -661,7 +659,6 @@ async function _buildDatabaseForV2Certification() {
   const cc = databaseBuilder.factory.buildComplementaryCertification();
   const ccBadge = databaseBuilder.factory.buildComplementaryCertificationBadge({
     complementaryCertificationId: cc.id,
-    partnerKey: 'charlotte_aux_fraises',
     badgeId: badge.id,
     imageUrl: 'http://tarte.fr/mirabelle.png',
     isTemporaryBadge: false,
@@ -697,7 +694,6 @@ async function _buildDatabaseForV2Certification() {
   databaseBuilder.factory.buildComplementaryCertificationCourseResult({
     complementaryCertificationCourseId: id,
     complementaryCertificationBadgeId: ccBadge.id,
-    partnerKey: badge.key,
   });
   return { userId, session, badge, certificationCourse, assessment, assessmentResult };
 }
diff --git a/...ertification-course-results/complementary-certification-course-results-controller_test.js b/...ertification-course-results/complementary-certification-course-results-controller_test.js
@@ -51,7 +51,6 @@ describe('Acceptance | API | Certifications', function () {
       databaseBuilder.factory.buildComplementaryCertificationCourseResult({
         complementaryCertificationCourseId: 1234,
         complementaryCertificationBadgeId: 24,
-        partnerKey: badge.key,
         source: ComplementaryCertificationCourseResult.sources.PIX,
       });
 

diff --git a/...cceptance/application/session/session-controller-get-jury-certification-summaries_test.js b/...cceptance/application/session/session-controller-get-jury-certification-summaries_test.js
@@ -75,7 +75,6 @@ describe('Acceptance | Controller | session-controller-get-jury-certification-su
         dbf.buildComplementaryCertificationCourseResult({
           complementaryCertificationCourseId: id,
           complementaryCertificationBadgeId,
-          partnerKey: badge.key,
           acquired: true,
         });
         asr1 = dbf.buildAssessmentResult.last({

diff --git a/...tests/certification/course/acceptance/application/certification-attestation-route_test.js b/...tests/certification/course/acceptance/application/certification-attestation-route_test.js
@@ -241,7 +241,6 @@ async function _buildDatabaseForV2Certification({ userId, certificationCourseId
   const cc = databaseBuilder.factory.buildComplementaryCertification();
   const ccBadge = databaseBuilder.factory.buildComplementaryCertificationBadge({
     complementaryCertificationId: cc.id,
-    partnerKey: 'charlotte_aux_fraises',
     badgeId: badge.id,
     imageUrl: 'http://tarte.fr/mirabelle.png',
     isTemporaryBadge: false,
@@ -279,7 +278,6 @@ async function _buildDatabaseForV2Certification({ userId, certificationCourseId
   databaseBuilder.factory.buildComplementaryCertificationCourseResult({
     complementaryCertificationCourseId: id,
     complementaryCertificationBadgeId: ccBadge.id,
-    partnerKey: badge.key,
   });
   return { userId, session, badge, certificationCourse, assessment, assessmentResult };
 }
diff --git a/...rtification/course/integration/infrastructure/repositories/certificate-repository_test.js b/...rtification/course/integration/infrastructure/repositories/certificate-repository_test.js
@@ -383,15 +383,13 @@ describe('Integration | Infrastructure | Repository | Certification', function (
             {
               isTemporaryBadge: false,
               label: 'Pix+ Test 1',
-              partnerKey: 'PIX_TEST_1',
               imageUrl: 'https://images.pix.fr/badge1.svg',
               stickerUrl: 'https://images.pix.fr/skicker1.pdf',
               message: 'Pix+ Test 1 certificate message',
             },
             {
               isTemporaryBadge: true,
               label: 'Pix+ Test 2',
-              partnerKey: 'PIX_TEST_2',
               imageUrl: 'https://images.pix.fr/badge2.svg',
               stickerUrl: 'https://images.pix.fr/skicker2.pdf',
               message: 'Pix+ Test 2 temporary certificate message',

diff --git a/...on/shared/integration/infrastructure/repositories/certification-course-repository_test.js b/...on/shared/integration/infrastructure/repositories/certification-course-repository_test.js
@@ -227,7 +227,6 @@ describe('Integration | Repository | Certification Course', function () {
             complementaryCertificationBadgeId,
           }).id;
           databaseBuilder.factory.buildComplementaryCertificationCourseResult({
-            partnerKey: badge.partnerKey,
             complementaryCertificationCourseId,
             certificationCourseId,
           });

diff --git a/api/tests/integration/domain/event/handle-complementary-certifications-scoring_test.js b/api/tests/integration/domain/event/handle-complementary-certifications-scoring_test.js
@@ -87,7 +87,7 @@ describe('Integration | Event | Handle Complementary Certifications Scoring', fu
             .select()
             .first();
 
-          expect(_.omit(complementaryCertificationCourseResults, ['id', 'partnerKey'])).to.deep.equal({
+          expect(_.omit(complementaryCertificationCourseResults, ['id'])).to.deep.equal({
             acquired: true,
             complementaryCertificationCourseId,
             complementaryCertificationBadgeId: 501,

diff --git a/api/tests/integration/infrastructure/repositories/certificate-repository_private_test.js b/api/tests/integration/infrastructure/repositories/certificate-repository_private_test.js
@@ -552,15 +552,13 @@ describe('Integration | Infrastructure | Repository | Certificate_private', func
               isTemporaryBadge: false,
               label: 'Pix+ test',
               message: 'message badge 1',
-              partnerKey: 'PIX_TEST_1',
             },
             {
               imageUrl: 'https://images.pix.fr/badge2.svg',
               stickerUrl: 'https://images.pix.fr/skicker2.pdf',
               isTemporaryBadge: true,
               label: 'Pix+ test',
               message: 'temporary message badge 2',
-              partnerKey: 'PIX_TEST_2',
             },
           ],
         };
@@ -1005,7 +1003,6 @@ async function _buildValidPrivateCertificateWithAcquiredAndNotAcquiredBadges({
       databaseBuilder.factory.buildComplementaryCertificationCourseResult({
         complementaryCertificationCourseId,
         complementaryCertificationBadgeId: acquiredComplementaryBadgeId,
-        partnerKey: key,
         acquired: true,
       });
     },

diff --git a/api/tests/integration/infrastructure/repositories/certificate-repository_shareable_test.js b/api/tests/integration/infrastructure/repositories/certificate-repository_shareable_test.js
@@ -509,15 +509,13 @@ describe('Integration | Infrastructure | Repository | Shareable Certificate', fu
               isTemporaryBadge: false,
               label: 'Pix+ test',
               message: 'message badge 1',
-              partnerKey: 'PIX_TEST_1',
             },
             {
               imageUrl: 'https://images.pix.fr/badge2.svg',
               stickerUrl: 'https://images.pix.fr/skicker2.pdf',
               isTemporaryBadge: true,
               label: 'Pix+ test',
               message: 'temporary message badge 2',
-              partnerKey: 'PIX_TEST_2',
             },
           ],
         };
@@ -660,7 +658,6 @@ async function _buildValidShareableCertificateWithAcquiredBadges({ shareableCert
       databaseBuilder.factory.buildComplementaryCertificationCourseResult({
         complementaryCertificationCourseId,
         complementaryCertificationBadgeId,
-        partnerKey: key,
         acquired: true,
       });
     },

diff --git a/...rastructure/utils/csv/certification-results/get-session-certification-results-csv_test.js b/...rastructure/utils/csv/certification-results/get-session-certification-results-csv_test.js
@@ -167,7 +167,6 @@ describe('Integration | Application | UseCases | certification-results | get-ses
     context(`when at least one candidate has passed PIX_EMPLOI_CLEA_V3 certification`, function () {
       it(`should return correct csvContent with the PIX_EMPLOI_CLEA_V3 information`, async function () {
         // given
-        const partnerKey = 'PARTNER_KEY';
         const expectedHeader = 'Certification skateboard numérique';
         const label = 'skateboard numérique';
         const session = domainBuilder.buildSession({ id: 777, certificationCenter: 'CentreCertif' });
@@ -187,7 +186,7 @@ describe('Integration | Application | UseCases | certification-results | get-ses
           commentForOrganization: 'RAS',
           competencesWithMark: competencesWithMark,
           complementaryCertificationCourseResults: [
-            domainBuilder.buildComplementaryCertificationCourseResult({ partnerKey, acquired: true, label }),
+            domainBuilder.buildComplementaryCertificationCourseResult({ acquired: true, label }),
           ],
         });
 
@@ -207,7 +206,6 @@ describe('Integration | Application | UseCases | certification-results | get-ses
 
       it(`should return a cancelled complementary certification when certification pix is cancelled`, async function () {
         // given
-        const partnerKey = 'PARTNER_KEY';
         const expectedHeader = 'Certification skateboard numérique';
         const label = 'skateboard numérique';
         const session = domainBuilder.buildSession({ id: 777, certificationCenter: 'CentreCertif' });
@@ -227,7 +225,7 @@ describe('Integration | Application | UseCases | certification-results | get-ses
           commentForOrganization: 'RAS',
           competencesWithMark: competencesWithMark,
           complementaryCertificationCourseResults: [
-            domainBuilder.buildComplementaryCertificationCourseResult({ partnerKey, acquired: true, label }),
+            domainBuilder.buildComplementaryCertificationCourseResult({ acquired: true, label }),
           ],
         });
 
@@ -268,13 +266,11 @@ describe('Integration | Application | UseCases | certification-results | get-ses
           complementaryCertificationCourseResults: [
             domainBuilder.buildComplementaryCertificationCourseResult({
               id: 1,
-              partnerKey: '1ST_PARTNER_KEY',
               acquired: false,
               label: 'Pix+ Bandjo Maître',
             }),
             domainBuilder.buildComplementaryCertificationCourseResult({
               id: 2,
-              partnerKey: '2ND_PARTNER_KEY',
               acquired: true,
               label: 'Pix+ Bandjo Expert',
             }),

diff --git a/...main-builder/factory/build-complementary-certification-course-result-for-certification.js b/...main-builder/factory/build-complementary-certification-course-result-for-certification.js
@@ -2,13 +2,13 @@ import { ComplementaryCertificationCourseResultForJuryCertification } from '../.
 
 const buildComplementaryCertificationCourseResultForJuryCertification = function ({
   id = 1234,
-  partnerKey = 'PARTNER_KEY',
+  complementaryCertificationBadgeId = 99,
   acquired = true,
   label = 'label par défaut',
 } = {}) {
   return new ComplementaryCertificationCourseResultForJuryCertification({
     id,
-    partnerKey,
+    complementaryCertificationBadgeId,
     acquired,
     label,
   });

diff --git a/api/tests/tooling/domain-builder/factory/build-complementary-certification-course-result.js b/api/tests/tooling/domain-builder/factory/build-complementary-certification-course-result.js
@@ -3,15 +3,13 @@ import { ComplementaryCertificationCourseResult } from './../../../../lib/domain
 const buildComplementaryCertificationCourseResult = function ({
   complementaryCertificationCourseId = 2,
   complementaryCertificationBadgeId = 2,
-  partnerKey = 'PARTNER_KEY',
   acquired = false,
   source = ComplementaryCertificationCourseResult.sources.PIX,
   label,
 } = {}) {
   return new ComplementaryCertificationCourseResult({
     complementaryCertificationCourseId,
     complementaryCertificationBadgeId,
-    partnerKey,
     acquired,
     source,
     label,

diff --git a/...er/factory/build-complementary-certification-scoring-without-complementary-referential.js b/...er/factory/build-complementary-certification-scoring-without-complementary-referential.js
@@ -5,7 +5,6 @@ const buildComplementaryCertificationScoringWithoutComplementaryReferential = fu
   complementaryCertificationBadgeId = 60,
   certificationCourseId = 42,
   reproducibilityRate = 50,
-  complementaryCertificationBadgeKey = 'badge_key',
   pixScore,
   minimumEarnedPix,
   minimumReproducibilityRate,
@@ -15,7 +14,6 @@ const buildComplementaryCertificationScoringWithoutComplementaryReferential = fu
     complementaryCertificationBadgeId,
     certificationCourseId,
     reproducibilityRate,
-    complementaryCertificationBadgeKey,
     pixScore,
     minimumEarnedPix,
     minimumReproducibilityRate,