[FEATURE] Récupérer les inscriptions candidats après réconciliation (v3 uniquement) (PIX-14209)

api/src/certification/enrolment/domain/read-models/CertificationCandidateSubscription.js

@@ -1,8 +1,8 @@
 class CertificationCandidateSubscription {
-  constructor({ id, sessionId, eligibleSubscription, nonEligibleSubscription, sessionVersion }) {
+  constructor({ id, sessionId, eligibleSubscriptions, nonEligibleSubscription, sessionVersion }) {
     this.id = id;
     this.sessionId = sessionId;
-    this.eligibleSubscription = eligibleSubscription;
+    this.eligibleSubscriptions = eligibleSubscriptions;
     this.nonEligibleSubscription = nonEligibleSubscription;
     this.sessionVersion = sessionVersion;
   }

api/src/certification/enrolment/domain/usecases/get-certification-candidate-subscription.js

@@ -17,7 +17,7 @@ const getCertificationCandidateSubscription = async function ({
     return new CertificationCandidateSubscription({
       id: certificationCandidateId,
       sessionId: certificationCandidate.sessionId,
-      eligibleSubscription: null,
+      eligibleSubscriptions: [],
       nonEligibleSubscription: null,
       sessionVersion: session.version,
     });
@@ -27,10 +27,11 @@ const getCertificationCandidateSubscription = async function ({
     id: session.certificationCenterId,
   });
 
-  let eligibleSubscription = null;
+  let eligibleSubscriptions = [];
   let nonEligibleSubscription = null;
   const certifiableBadgeAcquisitions = await certificationBadgesService.findStillValidBadgeAcquisitions({
     userId: certificationCandidate.userId,
+    limitDate: certificationCandidate.reconciledAt,
   });
 
   if (center.isHabilitated(certificationCandidate.complementaryCertification.key)) {
@@ -40,7 +41,12 @@ const getCertificationCandidateSubscription = async function ({
     );
 
     if (isSubscriptionEligible) {
-      eligibleSubscription = certificationCandidate.complementaryCertification;
+      eligibleSubscriptions = certificationCandidate.subscriptions.map((subscription) => {
+        return {
+          label: subscription.type === 'COMPLEMENTARY' ? certificationCandidate.complementaryCertification.label : null,
+          type: subscription.type,
+        };
+      });
     } else {
       nonEligibleSubscription = certificationCandidate.complementaryCertification;
     }
@@ -49,7 +55,7 @@ const getCertificationCandidateSubscription = async function ({
   return new CertificationCandidateSubscription({
     id: certificationCandidateId,
     sessionId: certificationCandidate.sessionId,
-    eligibleSubscription,
+    eligibleSubscriptions,
     nonEligibleSubscription,
     sessionVersion: session.version,
   });

api/src/certification/enrolment/infrastructure/repositories/certification-candidate-repository.js

@@ -5,16 +5,27 @@ import { ComplementaryCertification } from '../../domain/models/ComplementaryCer
 import { Subscription } from '../../domain/models/Subscription.js';
 
 const getBySessionIdAndUserId = async function ({ sessionId, userId }) {
-  const certificationCandidate = await _candidateBaseQuery().where({ sessionId, userId }).first();
-  return certificationCandidate ? _toDomain(certificationCandidate) : undefined;
+  const candidateData = await _candidateBaseQuery().where({ sessionId, userId }).first();
+  const subscriptionData = candidateData ? await _getSubscriptions(candidateData.id) : undefined;
+  return candidateData ? _toDomain({ candidateData, subscriptionData }) : undefined;
 };
 
 const findBySessionId = async function (sessionId) {
-  const results = await _candidateBaseQuery()
+  const certificationCandidates = await _candidateBaseQuery()
     .where({ 'certification-candidates.sessionId': sessionId })
     .orderByRaw('LOWER("certification-candidates"."lastName") asc')
     .orderByRaw('LOWER("certification-candidates"."firstName") asc');
-  return results.map(_toDomain);
+
+  const result = [];
+
+  for (const candidateData of certificationCandidates) {
+    const subscriptions = await _getSubscriptions(candidateData.id);
+    const certificationCandidate = _toDomain({ candidateData, subscriptions });
+
+    result.push(certificationCandidate);
+  }
+
+  return result;
 };
 
 const update = async function (certificationCandidate) {
@@ -30,24 +41,22 @@ const update = async function (certificationCandidate) {
 const getWithComplementaryCertification = async function ({ id }) {
   const candidateData = await _candidateBaseQuery().where('certification-candidates.id', id).first();
 
+  const subscriptionData = await _getSubscriptions(id);
+
   if (!candidateData) {
     throw new NotFoundError('Candidate not found');
   }
 
-  return _toDomain(candidateData);
+  return _toDomain({ candidateData, subscriptionData });
 };
 
 export { findBySessionId, getBySessionIdAndUserId, getWithComplementaryCertification, update };
 
-/**
- * @deprecated migration: new ComplementaryCertification(...) should not be done here
- * it should come from internal API complementary-certification bounded context.
- * Please beware of that when refactoring this code in the future
- */
-function _toDomain(candidateData) {
+function _toDomain({ candidateData, subscriptionData }) {
+  const subscriptions = subscriptionData?.map((subscription) => new Subscription({ ...subscription }));
   return new CertificationCandidate({
     ...candidateData,
-    subscriptions: [Subscription.buildCore({ id: candidateData.certificationCandidateId })],
+    subscriptions,
     complementaryCertification: candidateData.complementaryCertificationId
       ? new ComplementaryCertification({
           id: candidateData.complementaryCertificationId,
@@ -63,8 +72,8 @@ function _candidateBaseQuery() {
     .select({
       certificationCandidate: 'certification-candidates.*',
       complementaryCertificationId: 'complementary-certifications.id',
-      complementaryCertificationKey: 'complementary-certifications.key',
       complementaryCertificationLabel: 'complementary-certifications.label',
+      complementaryCertificationKey: 'complementary-certifications.key',
     })
     .from('certification-candidates')
     .leftJoin('certification-subscriptions', (builder) =>
@@ -79,3 +88,7 @@ function _candidateBaseQuery() {
     )
     .groupBy('certification-candidates.id', 'complementary-certifications.id');
 }
+
+async function _getSubscriptions(candidateId) {
+  return knex.select('*').from('certification-subscriptions').where('certificationCandidateId', candidateId);
+}

api/src/certification/enrolment/infrastructure/serializers/certification-candidate-subscription-serializer.js

@@ -4,7 +4,7 @@ const { Serializer } = jsonapiSerializer;
 
 const serialize = function (certificationCandidateSubscription) {
   return new Serializer('certification-candidate-subscription', {
-    attributes: ['sessionId', 'eligibleSubscription', 'nonEligibleSubscription', 'sessionVersion'],
+    attributes: ['sessionId', 'eligibleSubscriptions', 'nonEligibleSubscription', 'sessionVersion'],
   }).serialize(certificationCandidateSubscription);
 };
 

api/src/shared/domain/models/CertificationCandidate.js

@@ -1,7 +1,6 @@
 import lodash from 'lodash';
 
-import { Subscription } from '../../../certification/enrolment/domain/models/Subscription.js';
-import { BILLING_MODES, SUBSCRIPTION_TYPES } from '../../../certification/shared/domain/constants.js';
+import { BILLING_MODES } from '../../../certification/shared/domain/constants.js';
 
 const { isNil } = lodash;
 
@@ -65,27 +64,6 @@ class CertificationCandidate {
     this.hasSeenCertificationInstructions = hasSeenCertificationInstructions;
     this.accessibilityAdjustmentNeeded = accessibilityAdjustmentNeeded;
     this.reconciledAt = reconciledAt;
-
-    Object.defineProperty(this, 'complementaryCertification', {
-      enumerable: true,
-      get: function () {
-        return this.#complementaryCertification;
-      },
-
-      set: function (complementaryCertification) {
-        this.#complementaryCertification = complementaryCertification;
-        this.subscriptions = this.subscriptions.filter((subscription) => subscription.type === SUBSCRIPTION_TYPES.CORE);
-        if (complementaryCertification?.id) {
-          this.subscriptions.push(
-            Subscription.buildComplementary({
-              certificationCandidateId: this.id,
-              complementaryCertificationId: complementaryCertification.id,
-            }),
-          );
-        }
-      },
-    });
-
     this.complementaryCertification = complementaryCertification;
   }