[FEATURE] Reprise mdl bien-ecrire-son-adresse-mail pour coval 16/10 (MODC-2)

admin/app/components/target-profiles/target-profile.gjs

@@ -208,6 +208,9 @@ export default class TargetProfile extends Component {
                   "pages.target-profiles.resettable-checkbox.label"
                 }}&#x20;:&#x20;</span>{{this.displayBooleanState this.areKnowledgeElementsResettable}}
             </li>
+            <li><span class="bold">{{t
+                  "pages.target-profiles.tubes-count"
+                }}&#x20;:&#x20;</span>{{@model.tubesCount}}</li>
             {{#if @model.description}}
               <li>
                 <span class="bold">Description&#x20;:&#x20;</span>

admin/app/models/target-profile.js

@@ -33,6 +33,7 @@ export default class TargetProfile extends Model {
   @attr('boolean') hasLinkedCampaign;
   @attr('boolean') hasLinkedAutonomousCourse;
   @attr('number') maxLevel;
+  @attr('number') tubesCount;
   @attr() cappedTubes;
 
   @hasMany('badge', { async: true, inverse: null }) badges;

admin/tests/integration/components/target-profiles/target-profile-test.gjs

@@ -1,4 +1,5 @@
 import { render } from '@1024pix/ember-testing-library';
+import { t } from 'ember-intl/test-support';
 import TargetProfile from 'pix-admin/components/target-profiles/target-profile';
 import { module, test } from 'qunit';
 
@@ -19,9 +20,29 @@ module('Integration | Component | TargetProfile', function (hooks) {
     name: 'Dummy target-profile',
     outdated: false,
     ownerOrganizationId: '100',
+    tubesCount: 6,
   };
 
-  module('campaign / autonomous course link', function () {
+  module('target profile overview section', function () {
+    module('basic informations', function () {
+      test('it should display target profile basic informations', async function (assert) {
+        //given
+        const model = { ...targetProfileSampleData };
+
+        // when
+        const screen = await render(<template><TargetProfile @model={{model}} /></template>);
+
+        // then
+        assert.ok(_findByListItemText(screen, `ID : ${model.id}`));
+        assert.ok(_findByListItemText(screen, `Organisation de référence : ${model.ownerOrganizationId}`));
+        assert.ok(_findByListItemText(screen, 'Date de création : 01/03/2024'));
+        assert.ok(_findByListItemText(screen, 'Obsolète : Non'));
+        assert.ok(_findByListItemText(screen, 'Parcours Accès Simplifié : Non'));
+        assert.ok(_findByListItemText(screen, `${t('pages.target-profiles.resettable-checkbox.label')} : Non`));
+        assert.ok(_findByListItemText(screen, `${t('pages.target-profiles.tubes-count')} : ${model.tubesCount}`));
+      });
+    });
+
     module('when no campaign is linked', function () {
       test('it should display a no-link information', async function (assert) {
         // given

admin/translations/en.json

@@ -644,7 +644,8 @@
       },
       "resettable-checkbox": {
         "label": "Allow resetting for evaluation-type campaigns when multiple submissions are enabled for the organisation"
-      }
+      },
+      "tubes-count": "Number of subjects included in this target profile"
     },
     "trainings": {
       "training": {

admin/translations/fr.json

@@ -661,7 +661,8 @@
       },
       "resettable-checkbox": {
         "label": "Permettre la remise à zéro des acquis du profil cible"
-      }
+      },
+      "tubes-count": "Nombre de sujets compris dans ce profil cible"
     },
     "trainings": {
       "training": {

api/lib/domain/events/index.js

@@ -2,7 +2,6 @@ import perf_hooks from 'node:perf_hooks';
 
 import _ from 'lodash';
 
-import * as complementaryCertificationBadgesRepository from '../../../src/certification/complementary-certification/infrastructure/repositories/complementary-certification-badge-repository.js';
 import * as flashAlgorithmService from '../../../src/certification/flash-certification/domain/services/algorithm-methods/flash.js';
 import { scoringDegradationService } from '../../../src/certification/scoring/domain/services/scoring-degradation-service.js';
 import * as certificationAssessmentHistoryRepository from '../../../src/certification/scoring/infrastructure/repositories/certification-assessment-history-repository.js';
@@ -17,6 +16,7 @@ import * as certificationCenterRepository from '../../../src/certification/share
 import * as certificationCourseRepository from '../../../src/certification/shared/infrastructure/repositories/certification-course-repository.js';
 import * as certificationIssueReportRepository from '../../../src/certification/shared/infrastructure/repositories/certification-issue-report-repository.js';
 import * as competenceMarkRepository from '../../../src/certification/shared/infrastructure/repositories/competence-mark-repository.js';
+import * as complementaryCertificationBadgesRepository from '../../../src/certification/shared/infrastructure/repositories/complementary-certification-badge-repository.js';
 import * as flashAlgorithmConfigurationRepository from '../../../src/certification/shared/infrastructure/repositories/flash-algorithm-configuration-repository.js';
 import * as authenticationMethodRepository from '../../../src/identity-access-management/infrastructure/repositories/authentication-method.repository.js';
 import * as userRepository from '../../../src/identity-access-management/infrastructure/repositories/user.repository.js';

api/lib/domain/usecases/retrieve-last-or-create-certification-course.js

@@ -83,6 +83,8 @@ const retrieveLastOrCreateCertificationCourse = async function ({
   );
 
   if (existingCertificationCourse) {
+    existingCertificationCourse.adjustForAccessibility(certificationCandidate.accessibilityAdjustmentNeeded);
+
     return {
       created: false,
       certificationCourse: existingCertificationCourse,

api/lib/infrastructure/serializers/jsonapi/certification-course-serializer.js

@@ -18,6 +18,7 @@ const serialize = function (certificationCourse) {
       'firstName',
       'lastName',
       'version',
+      'isAdjustedForAccessibility',
     ],
     assessment: {
       ref: 'id',

api/lib/infrastructure/serializers/jsonapi/target-profile-for-admin-serializer.js

@@ -44,6 +44,7 @@ const serialize = function ({ targetProfile, filter }) {
       'stageCollection',
       'areas',
       'maxLevel',
+      'tubesCount',
       'cappedTubes',
     ],
     badges: {

api/src/certification/complementary-certification/domain/usecases/attach-badges.js

@@ -1,7 +1,7 @@
 /**
  * @typedef {import ('../../domain/usecases/index.js').ComplementaryCertificationBadgesRepository} ComplementaryCertificationBadgesRepository
  * @typedef {import ('../models/ComplementaryCertification.js').ComplementaryCertification} ComplementaryCertification
- * @typedef {import ('../models/ComplementaryCertificationBadge.js').ComplementaryCertificationBadge} ComplementaryCertificationBadge
+ * @typedef {import ('../../../shared/domain/models/ComplementaryCertificationBadge.js').ComplementaryCertificationBadge} ComplementaryCertificationBadge
  */
 import lodash from 'lodash';
 

api/src/certification/complementary-certification/infrastructure/repositories/complementary-certification-badge-repository.js

@@ -1,8 +1,6 @@
 import { knex } from '../../../../../db/knex-database-connection.js';
 import { Badge } from '../../../../evaluation/domain/models/Badge.js';
 import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.js';
-import { NotFoundError } from '../../../../shared/domain/errors.js';
-import { ComplementaryCertificationBadge } from '../../domain/models/ComplementaryCertificationBadge.js';
 
 const getAllIdsByTargetProfileId = async function ({ targetProfileId }) {
   const knexConn = DomainTransaction.getConnection();
@@ -54,27 +52,6 @@ const findAttachableBadgesByIds = async function ({ ids }) {
   });
 };
 
-const getAllWithSameTargetProfile = async function (complementaryCertificationBadgeId) {
-  const complementaryCertificationBadges = await knex('complementary-certification-badges')
-    .select('complementary-certification-badges.*')
-    .join('badges', 'badges.id', '=', 'complementary-certification-badges.badgeId')
-    .where(
-      'badges.targetProfileId',
-      '=',
-      knex('complementary-certification-badges')
-        .select('target-profiles.id')
-        .join('badges', 'badges.id', '=', 'complementary-certification-badges.badgeId')
-        .join('target-profiles', 'target-profiles.id', '=', 'badges.targetProfileId')
-        .where('complementary-certification-badges.id', '=', complementaryCertificationBadgeId),
-    );
-
-  if (complementaryCertificationBadges.length === 0) {
-    throw new NotFoundError('No complementary certification badge found');
-  }
-
-  return complementaryCertificationBadges.map(_toDomain);
-};
-
 const isRelatedToCertification = async function (badgeId) {
   const knexConn = DomainTransaction.getConnection();
   const complementaryCertificationBadge = await knexConn('complementary-certification-badges')
@@ -83,15 +60,4 @@ const isRelatedToCertification = async function (badgeId) {
   return !!complementaryCertificationBadge;
 };
 
-function _toDomain(complementaryCertificationBadgeDTO) {
-  return new ComplementaryCertificationBadge(complementaryCertificationBadgeDTO);
-}
-
-export {
-  attach,
-  detachByIds,
-  findAttachableBadgesByIds,
-  getAllIdsByTargetProfileId,
-  getAllWithSameTargetProfile,
-  isRelatedToCertification,
-};
+export { attach, detachByIds, findAttachableBadgesByIds, getAllIdsByTargetProfileId, isRelatedToCertification };

api/src/certification/enrolment/application/http-error-mapper-configuration.js

@@ -1,6 +1,7 @@
 import { HttpErrors } from '../../../shared/application/http-errors.js';
 import { DomainErrorMappingConfiguration } from '../../../shared/application/models/domain-error-mapping-configuration.js';
 import {
+  CertificationCandidateEligibilityError,
   CertificationCandidateForbiddenDeletionError,
   CertificationCandidateNotFoundError,
   InvalidCertificationCandidate,
@@ -26,6 +27,10 @@ const enrolmentDomainErrorMappingConfiguration = [
     name: InvalidCertificationCandidate.name,
     httpErrorFn: (error) => new HttpErrors.UnprocessableEntityError(error.message),
   },
+  {
+    name: CertificationCandidateEligibilityError.name,
+    httpErrorFn: (error) => new HttpErrors.UnprocessableEntityError(error.message, error.code),
+  },
 ].map((domainErrorMappingConfiguration) => new DomainErrorMappingConfiguration(domainErrorMappingConfiguration));
 
 export { enrolmentDomainErrorMappingConfiguration };

api/src/certification/enrolment/application/services/register-candidate-participation-service.js

@@ -1,7 +1,7 @@
 /**
  * @typedef {import ('../../domain/models/Candidate.js').Candidate} Candidate
  */
-
+import { withTransaction } from '../../../../shared/domain/DomainTransaction.js';
 import { usecases } from '../../domain/usecases/index.js';
 
 /**
@@ -15,29 +15,31 @@ import { usecases } from '../../domain/usecases/index.js';
  * @param {Function} params.normalizeStringFnc
  * @returns {Promise<Candidate>}
  */
-export const registerCandidateParticipation = async ({
-  userId,
-  sessionId,
-  firstName,
-  lastName,
-  birthdate,
-  normalizeStringFnc,
-}) => {
-  const candidate = await usecases.verifyCandidateIdentity({
-    userId,
-    sessionId,
-    firstName,
-    lastName,
-    birthdate,
-    normalizeStringFnc,
-  });
+export const registerCandidateParticipation = withTransaction(
+  async ({ userId, sessionId, firstName, lastName, birthdate, normalizeStringFnc }) => {
+    const candidate = await usecases.verifyCandidateIdentity({
+      userId,
+      sessionId,
+      firstName,
+      lastName,
+      birthdate,
+      normalizeStringFnc,
+    });
+
+    if (candidate.isReconciled()) {
+      return candidate;
+    }
+
+    const reconciliedCandidate = await usecases.reconcileCandidate({
+      userId,
+      candidate,
+    });
 
-  if (candidate.isReconciled()) {
-    return candidate;
-  }
+    await usecases.verifyCandidateSubscriptions({
+      candidate: reconciliedCandidate,
+      sessionId,
+    });
 
-  return usecases.reconcileCandidate({
-    userId,
-    candidate,
-  });
-};
+    return reconciliedCandidate;
+  },
+);

api/src/certification/enrolment/domain/errors.js

@@ -90,7 +90,15 @@ class InvalidCertificationCandidate extends DomainError {
   }
 }
 
+class CertificationCandidateEligibilityError extends DomainError {
+  constructor(message = "Le candidat n'est pas éligible") {
+    super(message);
+    this.code = 'CERTIFICATION_CANDIDATE_ELIGIBILITY_ERROR';
+  }
+}
+
 export {
+  CertificationCandidateEligibilityError,
   CertificationCandidateForbiddenDeletionError,
   CertificationCandidateNotFoundError,
   InvalidCertificationCandidate,

api/src/certification/enrolment/domain/models/ComplementaryCertificationBadge.js

@@ -1,4 +1,4 @@
-export class ComplementaryCertificationBadge {
+export class ComplementaryCertificationBadgeWithOffsetVersion {
   constructor({ id, requiredPixScore, offsetVersion, currentAttachedComplementaryCertificationBadgeId }) {
     this.id = id;
     this.requiredPixScore = requiredPixScore;

api/src/certification/enrolment/domain/usecases/get-user-certification-eligibility.js

@@ -1,17 +1,24 @@
+/**
+ * @typedef {import ('./index.js').ComplementaryCertificationBadgeWithOffsetVersionRepository} ComplementaryCertificationBadgeWithOffsetVersionRepository
+ */
 import _ from 'lodash';
 
 import { AssessmentResult } from '../../../../shared/domain/models/index.js';
 import { ComplementaryCertificationKeys } from '../../../shared/domain/models/ComplementaryCertificationKeys.js';
 import { CertificationEligibility, UserCertificationEligibility } from '../read-models/UserCertificationEligibility.js';
 
+/**
+ * @param {Object} params
+ * @param {ComplementaryCertificationBadgeWithOffsetVersionRepository} params.complementaryCertificationBadgeWithOffsetVersionRepository
+ */
 const getUserCertificationEligibility = async function ({
   userId,
   limitDate = new Date(),
   placementProfileService,
   certificationBadgesService,
   complementaryCertificationCourseRepository,
   pixCertificationRepository,
-  complementaryCertificationBadgeRepository,
+  complementaryCertificationBadgeWithOffsetVersionRepository,
 }) {
   const placementProfile = await placementProfileService.getPlacementProfile({ userId, limitDate });
   const isCertifiable = placementProfile.isCertifiable();
@@ -25,7 +32,8 @@ const getUserCertificationEligibility = async function ({
       userId,
     });
   const userPixCertifications = await pixCertificationRepository.findByUserId({ userId });
-  const allComplementaryCertificationBadges = await complementaryCertificationBadgeRepository.findAll();
+  const allComplementaryCertificationBadges =
+    await complementaryCertificationBadgeWithOffsetVersionRepository.findAll();
 
   const certificationEligibilities = [];
   for (const acquiredBadge of userAcquiredBadges) {

api/src/certification/enrolment/domain/usecases/index.js

@@ -10,6 +10,7 @@ import * as attendanceSheetPdfUtils from '../../../enrolment/infrastructure/util
 import * as certificationBadgesService from '../../../shared/domain/services/certification-badges-service.js';
 import * as certificationCpfService from '../../../shared/domain/services/certification-cpf-service.js';
 import * as sessionValidator from '../../../shared/domain/validators/session-validator.js';
+import * as complementaryCertificationBadgesRepository from '../../../shared/infrastructure/repositories/complementary-certification-badge-repository.js';
 import { enrolmentRepositories } from '../../infrastructure/repositories/index.js';
 import * as certificationCandidatesOdsService from '../services/certification-candidates-ods-service.js';
 import * as sessionCodeService from '../services/session-code-service.js';
@@ -18,6 +19,7 @@ import * as temporarySessionsStorageForMassImportService from '../services/tempo
 
 /**
  * @typedef {import('../../infrastructure/repositories/index.js').ComplementaryCertificationRepository} ComplementaryCertificationRepository
+ * @typedef {import('../../infrastructure/repositories/index.js').ComplementaryCertificationBadgeWithOffsetVersionRepository} ComplementaryCertificationBadgeWithOffsetVersionRepository
  * @typedef {import('../../infrastructure/repositories/index.js').SessionRepository} SessionRepository
  * @typedef {import('../../infrastructure/repositories/index.js').CertificationCandidateRepository} CertificationCandidateRepository
  * @typedef {import('../../../session-management/infrastructure/repositories/index.js').CertificationCandidateForSupervisingRepository} CertificationCandidateForSupervisingRepository
@@ -35,7 +37,6 @@ import * as temporarySessionsStorageForMassImportService from '../services/tempo
  * @typedef {import('../../../shared/domain/services/certification-cpf-service.js')} CertificationCpfService
  * @typedef {import('../../infrastructure/utils/pdf/attendance-sheet-pdf.js')} AttendanceSheetPdfUtils
  * @typedef {import('../services/temporary-sessions-storage-for-mass-import-service.js').TemporarySessionsStorageForMassImportService} TemporarySessionsStorageForMassImportService
- * @typedef {import('../../../shared/domain/services/certification-badges-service.js')} CertificationBadgesService
  * @typedef {import('../services/certification-candidates-ods-service.js')} CertificationCandidatesOdsService
  * @typedef {import('../../../../shared/domain/services/placement-profile-service.js')} PlacementProfileService
  * @typedef {import('../../../../shared/domain/services/language-service.js')} languageService
@@ -64,10 +65,11 @@ import * as temporarySessionsStorageForMassImportService from '../services/tempo
  * @typedef {TemporarySessionsStorageForMassImportService} TemporarySessionsStorageForMassImportService
  * @typedef {SessionValidator} SessionValidator
  * @typedef {AttendanceSheetPdfUtils} AttendanceSheetPdfUtils
- * @typedef {CertificationBadgesService} CertificationBadgesService
+ * @typedef {certificationBadgesService} CertificationBadgesService
  * @typedef {CertificationCandidatesOdsService} CertificationCandidatesOdsService
  * @typedef {PlacementProfileService} PlacementProfileService
  * @typedef {LanguageService} LanguageService
+ * @typedef {complementaryCertificationBadgesRepository} ComplementaryCertificationBadgesRepository
  **/
 const dependencies = {
   certificationBadgesService,
@@ -81,6 +83,7 @@ const dependencies = {
   certificationCandidatesOdsService,
   placementProfileService,
   languageService,
+  complementaryCertificationBadgesRepository,
 };
 
 const path = dirname(fileURLToPath(import.meta.url));