tech(api): simplifies checking if participation contributing to quest

Author: laura-bergoens

api/src/quest/domain/models/Quest.js

@@ -4,8 +4,11 @@ import {
   ComposedRequirement,
   TYPES as _REQUIREMENT_TYPES,
 } from './Requirement.js';
+/**
+ * @typedef {import ('./Eligibility.js').Eligibility} Eligibility
+ * @typedef {import ('./Success.js').Success} Success
+ */
 
-// warning, manque d'homogénéité sur les fonctions de comparaison, fixme !
 export const REQUIREMENT_COMPARISONS = _REQUIREMENT_COMPARISONS;
 export const CRITERION_COMPARISONS = _CRITERION_COMPARISONS;
 export const REQUIREMENT_TYPES = _REQUIREMENT_TYPES;
@@ -52,25 +55,16 @@ class Quest {
       this.#eligibilityRequirements.data,
       REQUIREMENT_TYPES.OBJECT.CAMPAIGN_PARTICIPATIONS,
     );
-    const otherRequirements = this.#omitRequirementsByType(
-      this.#eligibilityRequirements.data,
-      REQUIREMENT_TYPES.OBJECT.CAMPAIGN_PARTICIPATIONS,
-    );
 
-    const eligibilityRequirements = otherRequirements;
     if (campaignParticipationRequirements.length > 0) {
-      eligibilityRequirements.push(
-        new ComposedRequirement({
-          data: campaignParticipationRequirements,
-          comparison: REQUIREMENT_COMPARISONS.ONE_OF,
-        }),
-      );
+      const a = new ComposedRequirement({
+        data: campaignParticipationRequirements,
+        comparison: REQUIREMENT_COMPARISONS.ONE_OF,
+      });
+      return a.isFulfilled(scopedEligibility);
     }
-    const scopedEligibilityRequirements = new ComposedRequirement({
-      data: eligibilityRequirements,
-      comparison: REQUIREMENT_COMPARISONS.ALL,
-    });
-    return scopedEligibilityRequirements.isFulfilled(scopedEligibility);
+
+    return false;
   }
 
   /**
@@ -99,26 +93,6 @@ class Quest {
     };
   }
 
-  #omitRequirementsByType(requirements, type) {
-    const result = [];
-    for (const requirement of requirements) {
-      if (requirement.requirement_type === REQUIREMENT_TYPES.COMPOSE) {
-        const subRequirements = this.#omitRequirementsByType(requirement.data, type);
-        if (subRequirements.length > 0) {
-          result.push(
-            new ComposedRequirement({
-              data: subRequirements,
-              comparison: requirement.comparison,
-            }),
-          );
-        }
-      } else if (requirement.requirement_type !== type) {
-        result.push(requirement);
-      }
-    }
-    return result;
-  }
-
   #flattenRequirementsByType(requirements, type) {
     let result = [];
     const filteredRequirements = requirements.filter((requirement) =>

api/tests/quest/integration/domain/usecases/get-quest-results-for-campaign-participation_test.js

@@ -207,7 +207,7 @@ describe('Quest | Integration | Domain | Usecases | getQuestResultsForCampaignPa
       userId,
     });
     const rewardId = databaseBuilder.factory.buildAttestation().id;
-    const questId = databaseBuilder.factory.buildQuest({
+    databaseBuilder.factory.buildQuest({
       rewardType: 'attestations',
       rewardId,
       eligibilityRequirements: [
@@ -229,10 +229,7 @@ describe('Quest | Integration | Domain | Usecases | getQuestResultsForCampaignPa
 
     const result = await usecases.getQuestResultsForCampaignParticipation({ userId, campaignParticipationId });
 
-    expect(result[0]).to.be.instanceOf(QuestResult);
-    expect(result[0].id).to.equal(questId);
-    expect(result[0].obtained).to.equal(false);
-    expect(result[0].reward.id).to.equal(rewardId);
+    expect(result.length).to.equal(0);
   });
 
   it('should not return quest results for other campaign participation', async function () {

api/tests/quest/unit/domain/models/Quest_test.js

@@ -286,75 +286,7 @@ describe('Quest | Unit | Domain | Models | Quest ', function () {
     });
 
     context('eligibilityRequirement without campaignParticipation type', function () {
-      it('return false when none of eligiblityRequirement is eligible', function () {
-        // given
-        const eligibilityRequirements = [
-          {
-            requirement_type: REQUIREMENT_TYPES.OBJECT.ORGANIZATION,
-            data: {
-              type: {
-                data: 'PRO',
-                comparison: CRITERION_COMPARISONS.EQUAL,
-              },
-            },
-            comparison: REQUIREMENT_COMPARISONS.ALL,
-          },
-        ];
-        const quest = new Quest({ eligibilityRequirements, successRequirements: [] });
-        const campaignParticipations = [{ id: 10 }, { id: 11 }];
-        const eligibilityData = new Eligibility({ organization, organizationLearner, campaignParticipations });
-        const campaignParticipationIdToCheck = 11;
-
-        // when
-        const isContributing = quest.isCampaignParticipationContributingToQuest({
-          eligibility: eligibilityData,
-          campaignParticipationId: campaignParticipationIdToCheck,
-        });
-
-        // then
-        expect(isContributing).to.be.false;
-      });
-
-      it('return false when eligibilityRequirement is partially eligible', function () {
-        // given
-        const eligibilityRequirements = [
-          {
-            requirement_type: REQUIREMENT_TYPES.OBJECT.ORGANIZATION,
-            data: {
-              type: {
-                data: 'SCO',
-                comparison: CRITERION_COMPARISONS.EQUAL,
-              },
-            },
-            comparison: REQUIREMENT_COMPARISONS.ALL,
-          },
-          {
-            requirement_type: REQUIREMENT_TYPES.OBJECT.ORGANIZATION_LEARNER,
-            data: {
-              id: {
-                data: 456,
-                comparison: CRITERION_COMPARISONS.EQUAL,
-              },
-            },
-            comparison: REQUIREMENT_COMPARISONS.ALL,
-          },
-        ];
-        const quest = new Quest({ eligibilityRequirements, successRequirements: [] });
-        const campaignParticipations = [{ id: 10 }, { id: 11 }];
-        const eligibilityData = new Eligibility({ organization, organizationLearner, campaignParticipations });
-        const campaignParticipationIdToCheck = 11;
-
-        // when
-        const isContributing = quest.isCampaignParticipationContributingToQuest({
-          eligibility: eligibilityData,
-          campaignParticipationId: campaignParticipationIdToCheck,
-        });
-
-        // then
-        expect(isContributing).to.be.false;
-      });
-
-      it('return true if all eligibilityRequirement is valid', function () {
+      it('return false', function () {
         // given
         const eligibilityRequirements = [
           {
@@ -390,7 +322,7 @@ describe('Quest | Unit | Domain | Models | Quest ', function () {
         });
 
         // then
-        expect(isContributing).to.be.true;
+        expect(isContributing).to.be.false;
       });
     });
   });