[TECH] Supprimer le double model Campaign (PIX-16997)

 #11620

Author: pix-service-auto-merge

api/src/prescription/campaign-participation/domain/models/CampaignParticipation.js

@@ -6,7 +6,7 @@ import {
   CantImproveCampaignParticipationError,
 } from '../../../../../src/shared/domain/errors.js';
 import { ArchivedCampaignError } from '../../../campaign/domain/errors.js';
-import { CampaignParticipationStatuses, CampaignTypes } from '../../../shared/domain/constants.js';
+import { CampaignParticipationStatuses } from '../../../shared/domain/constants.js';
 import { CampaignParticiationInvalidStatus, CampaignParticipationDeletedError } from '../errors.js';
 
 class CampaignParticipation {
@@ -67,10 +67,6 @@ class CampaignParticipation {
     return _.maxBy(this.assessments, 'createdAt');
   }
 
-  getTargetProfileId() {
-    return _.get(this, 'campaign.targetProfileId', null);
-  }
-
   get campaignId() {
     return _.get(this, 'campaign.id', null);
   }
@@ -96,8 +92,7 @@ class CampaignParticipation {
       throw new CampaignParticiationInvalidStatus(this.id, CampaignParticipationStatuses.TO_SHARE);
     }
 
-    //TODO: rewrite when we have only one model for Campaign, for now now tests are based on Campaign.js from api context
-    if (this.campaign.type === CampaignTypes.PROFILES_COLLECTION) {
+    if (this.campaign.isProfilesCollection) {
       throw new CantImproveCampaignParticipationError();
     }
   }
@@ -110,14 +105,13 @@ class CampaignParticipation {
     if (this.isShared) {
       throw new AlreadySharedCampaignParticipationError();
     }
-    if (!this.campaign.isAccessible()) {
+    if (!this.campaign.isAccessible) {
       throw new ArchivedCampaignError('Cannot share results on an archived campaign.');
     }
     if (this.isDeleted) {
       throw new CampaignParticipationDeletedError('Cannot share results on a deleted participation.');
     }
-    //TODO: rewrite when we have only one model for Campaign, for now tests are based on Campaign.js from api context
-    if (this.campaign.type === CampaignTypes.ASSESSMENT && lastAssessmentNotCompleted(this)) {
+    if (this.campaign.isAssessment && lastAssessmentNotCompleted(this)) {
       throw new AssessmentNotCompletedError();
     }
   }

api/src/prescription/campaign-participation/domain/usecases/send-shared-participation-results-to-pole-emploi.js

@@ -27,8 +27,7 @@ const sendSharedParticipationResultsToPoleEmploi = async ({
   const campaign = await campaignRepository.get(participation.campaignId);
   const organization = await organizationRepository.get(campaign.organizationId);
 
-  //TODO: rewrite when we have only one model for Campaign, for now tests are based on Campaign.js from api context
-  if (campaign.type === 'ASSESSMENT' && organization.isPoleEmploi) {
+  if (campaign.isAssessment && organization.isPoleEmploi) {
     const badges = await badgeRepository.findByCampaignId(participation.campaignId);
     const badgeAcquiredIds = await badgeAcquisitionRepository.getAcquiredBadgeIds({
       badgeIds: badges.map((badge) => badge.id),

api/src/prescription/campaign-participation/infrastructure/repositories/campaign-participation-repository.js

@@ -5,8 +5,8 @@ import { constants } from '../../../../shared/domain/constants.js';
 import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.js';
 import { NotFoundError } from '../../../../shared/domain/errors.js';
 import { Assessment } from '../../../../shared/domain/models/Assessment.js';
-import { Campaign } from '../../../../shared/domain/models/Campaign.js';
 import * as knowledgeElementRepository from '../../../../shared/infrastructure/repositories/knowledge-element-repository.js';
+import { Campaign } from '../../../campaign/domain/models/Campaign.js';
 import * as campaignRepository from '../../../campaign/infrastructure/repositories/campaign-repository.js';
 import * as knowledgeElementSnapshotRepository from '../../../campaign/infrastructure/repositories/knowledge-element-snapshot-repository.js';
 import { CampaignParticipationStatuses, CampaignTypes } from '../../../shared/domain/constants.js';

api/src/prescription/campaign-participation/infrastructure/serializers/jsonapi/campaign-participation-serializer.js

@@ -2,7 +2,7 @@ import jsonapiSerializer from 'jsonapi-serializer';
 
 const { Serializer, Deserializer } = jsonapiSerializer;
 
-import { Campaign } from '../../../../../shared/domain/models/Campaign.js';
+import { Campaign } from '../../../../campaign/domain/models/Campaign.js';
 import { CampaignParticipation } from '../../../domain/models/CampaignParticipation.js';
 
 const serialize = function (campaignParticipation) {

api/src/prescription/campaign/domain/models/Campaign.js

@@ -13,17 +13,17 @@ class Campaign {
     id,
     name,
     code,
+    title,
+    externalIdLabel,
+    externalIdType,
     organizationId,
+    externalIdHelpImageUrl,
+    alternativeTextToExternalIdHelpImage,
     creatorId,
     createdAt,
     targetProfileId,
-    externalIdLabel,
-    externalIdType,
-    title,
     customLandingPageText,
     type,
-    externalIdHelpImageUrl,
-    alternativeTextToExternalIdHelpImage,
     isForAbsoluteNovice,
     customResultPageText,
     customResultPageButtonText,
@@ -38,6 +38,7 @@ class Campaign {
     participationCount,
   } = {}) {
     this.id = id;
+    this.isForAbsoluteNovice = isForAbsoluteNovice;
     this.code = code;
     this.externalIdLabel = externalIdLabel;
     this.externalIdType = externalIdType;
@@ -47,7 +48,6 @@ class Campaign {
     this.externalIdHelpImageUrl = externalIdHelpImageUrl;
     this.alternativeTextToExternalIdHelpImage = alternativeTextToExternalIdHelpImage;
     this.customLandingPageText = customLandingPageText;
-    this.isForAbsoluteNovice = isForAbsoluteNovice;
     this.customResultPageText = customResultPageText;
     this.customResultPageButtonText = customResultPageButtonText;
     this.customResultPageButtonUrl = customResultPageButtonUrl;

api/src/prescription/campaign/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream.js

@@ -23,7 +23,6 @@ const startWritingCampaignProfilesCollectionResultsToStream = async function ({
   const translate = i18n.__;
   let additionalHeaders = [];
 
-  //TODO: rewrite when we have only one model for Campaign, for now tests are based on Campaign.js from api context
   if (!campaign.isProfilesCollection) {
     throw new CampaignTypeError();
   }

api/src/prescription/campaign/infrastructure/repositories/campaign-repository.js

@@ -2,9 +2,9 @@ import { knex } from '../../../../../db/knex-database-connection.js';
 import { CAMPAIGN_FEATURES } from '../../../../shared/domain/constants.js';
 import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.js';
 import { NotFoundError } from '../../../../shared/domain/errors.js';
-import { Campaign } from '../../../../shared/domain/models/Campaign.js';
 import * as skillRepository from '../../../../shared/infrastructure/repositories/skill-repository.js';
 import * as tubeRepository from '../../../../shared/infrastructure/repositories/tube-repository.js';
+import { Campaign } from '../../domain/models/Campaign.js';
 
 const areKnowledgeElementsResettable = async function ({ id }) {
   const knexConn = DomainTransaction.getConnection();
@@ -23,7 +23,7 @@ const areKnowledgeElementsResettable = async function ({ id }) {
 const getByCode = async function (code) {
   const campaign = await knex('campaigns').first().where({ code });
   if (!campaign) return null;
-  return new Campaign({ ...campaign, organization: { id: campaign.organizationId } });
+  return new Campaign(campaign);
 };
 
 const get = async function (id) {
@@ -44,9 +44,6 @@ const get = async function (id) {
   return new Campaign({
     ...campaign,
     ...{ externalIdLabel: featureExternalId?.params?.label, externalIdType: featureExternalId?.params?.type },
-    organization: { id: campaign.organizationId },
-    targetProfile: { id: campaign.targetProfileId },
-    creator: { id: campaign.creatorId },
   });
 };
 

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

@@ -55,7 +55,6 @@ import { AuthenticationSessionContent } from './AuthenticationSessionContent.js'
 import { BadgeCriterionForCalculation } from './BadgeCriterionForCalculation.js';
 import { BadgeDetails } from './BadgeDetails.js';
 import { BadgeForCalculation } from './BadgeForCalculation.js';
-import { Campaign } from './Campaign.js';
 import { CampaignLearningContent } from './CampaignLearningContent.js';
 import { CampaignParticipationResult } from './CampaignParticipationResult.js';
 import { CertifiableBadgeAcquisition } from './CertifiableBadgeAcquisition.js';
@@ -124,7 +123,6 @@ export {
   BadgeCriterionForCalculation,
   BadgeDetails,
   BadgeForCalculation,
-  Campaign,
   CampaignCreator,
   CampaignForCreation,
   CampaignLearningContent,

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

@@ -19,39 +19,6 @@ import { catchErr, catchErrSync, domainBuilder, expect, sinon } from '../../../.
 const { TO_SHARE, SHARED, STARTED } = CampaignParticipationStatuses;
 
 describe('Unit | Domain | Models | CampaignParticipation', function () {
-  describe('#getTargetProfileId', function () {
-    it('should return the targetProfileId from campaign associated', function () {
-      // given
-      const campaign = domainBuilder.buildCampaign.ofTypeAssessment();
-      const campaignParticipation = new CampaignParticipation({
-        id: 1,
-        campaign,
-        assessmentId: 1,
-      });
-
-      // when
-      const targetProfileId = campaignParticipation.getTargetProfileId();
-
-      // then
-      expect(targetProfileId).to.equal(campaign.targetProfile.id);
-    });
-
-    it('should return null if has not campaign', function () {
-      // given
-      const campaignParticipation = new CampaignParticipation({
-        id: 1,
-        campaign: null,
-        assessmentId: 1,
-      });
-
-      // when
-      const targetProfileId = campaignParticipation.getTargetProfileId();
-
-      // then
-      expect(targetProfileId).to.equal(null);
-    });
-  });
-
   describe('delete', function () {
     let clock;
     const now = new Date('2021-09-25');
@@ -219,7 +186,7 @@ describe('Unit | Domain | Models | CampaignParticipation', function () {
 
     context('when the campaign is not accessible', function () {
       it('throws an ArchivedCampaignError error', async function () {
-        const campaign = { isAccessible: () => false };
+        const campaign = { isAccessible: false };
         const campaignParticipation = new CampaignParticipation({ campaign });
 
         const error = await catchErr(campaignParticipation.share, campaignParticipation)();

api/tests/prescription/campaign-participation/unit/domain/models/CampaignParticipation_test.js

@@ -154,8 +154,8 @@ describe('Unit | Domain | UseCase | send-shared-participation-results-to-pole-em
         createdAt: new Date('2020-01-01'),
         archivedAt: new Date('2020-02-01'),
         type: 'ASSESSMENT',
-        targetProfile: { id: 'targetProfileId1' },
-        organization: { id: organizationId },
+        targetProfileId: 'targetProfileId1',
+        organizationId,
       });
       campaignParticipationRepository.get.withArgs(campaignParticipationId).resolves(
         domainBuilder.buildCampaignParticipation({
@@ -231,7 +231,7 @@ describe('Unit | Domain | UseCase | send-shared-participation-results-to-pole-em
       const campaign = domainBuilder.buildCampaign({
         id: campaignId,
         type: 'ASSESSMENT',
-        organization: { id: organizationId },
+        organizationId,
       });
       campaignParticipationRepository.get.withArgs(campaignParticipationId).resolves(
         domainBuilder.buildCampaignParticipation({

api/tests/prescription/campaign-participation/unit/domain/usecases/send-shared-participation-results-to-pole-emploi_test.js

@@ -1,10 +1,10 @@
 import _ from 'lodash';
 
+import { Campaign } from '../../../../../../src/prescription/campaign/domain/models/Campaign.js';
 import * as campaignRepository from '../../../../../../src/prescription/campaign/infrastructure/repositories/campaign-repository.js';
 import { CampaignExternalIdTypes } from '../../../../../../src/prescription/shared/domain/constants.js';
 import { CAMPAIGN_FEATURES } from '../../../../../../src/shared/domain/constants.js';
 import { NotFoundError } from '../../../../../../src/shared/domain/errors.js';
-import { Campaign } from '../../../../../../src/shared/domain/models/Campaign.js';
 import { databaseBuilder, domainBuilder, expect } from '../../../../../test-helper.js';
 
 describe('Integration | Repository | Campaign', function () {

api/tests/prescription/campaign/integration/infrastructure/repositories/campaign-repository_test.js

@@ -1,7 +1,7 @@
 import * as campaignApi from '../../../../../../src/prescription/campaign/application/api/campaigns-api.js';
 import { UserNotAuthorizedToCreateCampaignError } from '../../../../../../src/prescription/campaign/domain/errors.js';
+import { Campaign } from '../../../../../../src/prescription/campaign/domain/models/Campaign.js';
 import { usecases } from '../../../../../../src/prescription/campaign/domain/usecases/index.js';
-import { Campaign } from '../../../../../../src/shared/domain/models/Campaign.js';
 import { CampaignReport } from '../../../../../../src/shared/domain/read-models/CampaignReport.js';
 import { catchErr, expect, sinon } from '../../../../../test-helper.js';
 import { domainBuilder } from '../../../../../tooling/domain-builder/domain-builder.js';

api/tests/prescription/campaign/unit/application/api/campaigns-api_test.js

@@ -46,7 +46,7 @@ describe('Unit | Domain | Use Cases | start-writing-campaign-profiles-collection
     const organization = domainBuilder.buildOrganization();
     const user = domainBuilder.buildUser();
     domainBuilder.buildMembership({ user, organization });
-    const campaign = domainBuilder.buildCampaign.ofTypeAssessment({ organization });
+    const campaign = domainBuilder.buildCampaign.ofTypeAssessment({ organizationId: organization.id });
     campaignRepository.get.withArgs(campaign.id).resolves(campaign);
     userRepository.getWithMemberships.withArgs(user.id).resolves(user);
 
@@ -77,7 +77,7 @@ describe('Unit | Domain | Use Cases | start-writing-campaign-profiles-collection
     const organization = domainBuilder.buildOrganization();
     const user = domainBuilder.buildUser();
     domainBuilder.buildMembership({ user, organization });
-    const campaign = domainBuilder.buildCampaign.ofTypeProfilesCollection();
+    const campaign = domainBuilder.buildCampaign.ofTypeProfilesCollection({ organizationId: organization.id });
     campaignRepository.get.withArgs(campaign.id).resolves(campaign);
     userRepository.getWithMemberships.withArgs(user.id).resolves(user);
     organizationRepository.get.withArgs(organization.id).resolves(organization);

api/tests/prescription/campaign/unit/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream_test.js

@@ -28,7 +28,7 @@ describe('Unit | UseCase | reconcile-sco-organization-learner-automatically', fu
     campaignRepository = { getByCode: sinon.stub() };
     getCampaignStub = campaignRepository.getByCode
       .withArgs(campaignCode)
-      .resolves(domainBuilder.buildCampaign({ organization: { id: organizationId } }));
+      .resolves(domainBuilder.buildCampaign({ organizationId }));
 
     organizationLearnerRepository = {
       reconcileUserByNationalStudentIdAndOrganizationId: sinon.stub(),