From 605e1c9886a20d973f2660f87b98cf8fde594ae4 Mon Sep 17 00:00:00 2001 From: Laura Bergoens Date: Thu, 6 Mar 2025 11:48:57 +0100 Subject: [PATCH] tech?(api): replace functions by getters for campaign type in shared/models/Campaign Co-authored-by: Yvonnick Frin Co-authored-by: Xavier Carron --- ...campaign-profiles-collection-results-to-stream.js | 2 +- api/src/shared/domain/models/Assessment.js | 2 +- api/src/shared/domain/models/Campaign.js | 6 +++--- api/tests/unit/domain/models/Campaign_test.js | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/src/prescription/campaign/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream.js b/api/src/prescription/campaign/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream.js index d7923df3a45..03272c379f3 100644 --- a/api/src/prescription/campaign/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream.js +++ b/api/src/prescription/campaign/domain/usecases/start-writing-campaign-profiles-collection-results-to-stream.js @@ -24,7 +24,7 @@ const startWritingCampaignProfilesCollectionResultsToStream = async function ({ 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()) { + if (!campaign.isProfilesCollection) { throw new CampaignTypeError(); } diff --git a/api/src/shared/domain/models/Assessment.js b/api/src/shared/domain/models/Assessment.js index bbe072638d6..31488e9af9a 100644 --- a/api/src/shared/domain/models/Assessment.js +++ b/api/src/shared/domain/models/Assessment.js @@ -129,7 +129,7 @@ class Assessment { this.showProgressBar = false; this.hasCheckpoints = false; this.showLevelup = false; - if (!this.isFlash() && (campaign.isAssessment() || campaign.isExam())) { + if (!this.isFlash() && (campaign.isAssessment || campaign.isExam)) { this.showProgressBar = true; this.hasCheckpoints = true; this.showLevelup = true; diff --git a/api/src/shared/domain/models/Campaign.js b/api/src/shared/domain/models/Campaign.js index 9096167ee6d..32b3374c350 100644 --- a/api/src/shared/domain/models/Campaign.js +++ b/api/src/shared/domain/models/Campaign.js @@ -65,15 +65,15 @@ class Campaign { return _.get(this, 'targetProfile.id', null); } - isAssessment() { + get isAssessment() { return this.type === CampaignTypes.ASSESSMENT; } - isExam() { + get isExam() { return this.type === CampaignTypes.EXAM; } - isProfilesCollection() { + get isProfilesCollection() { return this.type === CampaignTypes.PROFILES_COLLECTION; } diff --git a/api/tests/unit/domain/models/Campaign_test.js b/api/tests/unit/domain/models/Campaign_test.js index b878e617257..a563b5c46d1 100644 --- a/api/tests/unit/domain/models/Campaign_test.js +++ b/api/tests/unit/domain/models/Campaign_test.js @@ -56,7 +56,7 @@ describe('Unit | Domain | Models | Campaign', function () { const campaign = domainBuilder.buildCampaign({ type: CampaignTypes.EXAM }); // when / then - expect(campaign.isExam()).to.be.true; + expect(campaign.isExam).to.be.true; }); it('should return false when campaign is not of type exam', function () { @@ -64,7 +64,7 @@ describe('Unit | Domain | Models | Campaign', function () { const campaign = domainBuilder.buildCampaign.ofTypeProfilesCollection(); // when / then - expect(campaign.isExam()).to.be.false; + expect(campaign.isExam).to.be.false; }); }); @@ -74,7 +74,7 @@ describe('Unit | Domain | Models | Campaign', function () { const campaign = domainBuilder.buildCampaign.ofTypeAssessment(); // when / then - expect(campaign.isAssessment()).to.be.true; + expect(campaign.isAssessment).to.be.true; }); it('should return false when campaign is not of type assessment', function () { @@ -82,7 +82,7 @@ describe('Unit | Domain | Models | Campaign', function () { const campaign = domainBuilder.buildCampaign.ofTypeProfilesCollection(); // when / then - expect(campaign.isAssessment()).to.be.false; + expect(campaign.isAssessment).to.be.false; }); }); @@ -93,7 +93,7 @@ describe('Unit | Domain | Models | Campaign', function () { // when / then //TODO: rewrite when we have only one Campaign model on domainBuilder - expect(campaign.isProfilesCollection()).to.be.true; + expect(campaign.isProfilesCollection).to.be.true; }); it('should return false when campaign is not of type profiles collection', function () { @@ -102,7 +102,7 @@ describe('Unit | Domain | Models | Campaign', function () { // when / then //TODO: rewrite when we have only one Campaign model on domainBuilder - expect(campaign.isProfilesCollection()).to.be.false; + expect(campaign.isProfilesCollection).to.be.false; }); });