refactor(api): rename accessibility1 and 2 for better clarity

1024pix · Sep 23, 2024 · e84feee · e84feee
1 parent a95d6b5
commit e84feee
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 52 deletions.
diff --git a/api/src/shared/domain/models/Challenge.js b/api/src/shared/domain/models/Challenge.js
@@ -54,8 +54,8 @@ class Challenge {
    * @param successProbabilityThreshold
    * @param shuffled
    * @param alternativeVersion
-   * @param accessibility1
-   * @param accessibility2
+   * @param blindnessCompatibility
+   * @param colorBlindnessCompatibility
    */
   constructor({
     id,
@@ -87,8 +87,8 @@ class Challenge {
     responsive,
     shuffled,
     alternativeVersion,
-    accessibility1,
-    accessibility2,
+    blindnessCompatibility,
+    colorBlindnessCompatibility,
   } = {}) {
     this.id = id;
     this.answer = answer;
@@ -119,8 +119,8 @@ class Challenge {
     this.successProbabilityThreshold = successProbabilityThreshold;
     this.shuffled = shuffled;
     this.alternativeVersion = alternativeVersion;
-    this.accessibility1 = accessibility1;
-    this.accessibility2 = accessibility2;
+    this.blindnessCompatibility = blindnessCompatibility;
+    this.colorBlindnessCompatibility = colorBlindnessCompatibility;
   }
 
   isTimed() {
@@ -161,8 +161,8 @@ class Challenge {
 
   get isAccessible() {
     return (
-      (this.accessibility1 === Accessibility.OK || this.accessibility1 === Accessibility.RAS) &&
-      (this.accessibility2 === Accessibility.OK || this.accessibility2 === Accessibility.RAS)
+      (this.blindnessCompatibility === Accessibility.OK || this.blindnessCompatibility === Accessibility.RAS) &&
+      (this.colorBlindnessCompatibility === Accessibility.OK || this.colorBlindnessCompatibility === Accessibility.RAS)
     );
   }
 

diff --git a/api/src/shared/infrastructure/repositories/challenge-repository.js b/api/src/shared/infrastructure/repositories/challenge-repository.js
@@ -205,7 +205,7 @@ function _toDomain({ challengeDataObject, skillDataObject, successProbabilityThr
     shuffled: challengeDataObject.shuffled,
     successProbabilityThreshold,
     alternativeVersion: challengeDataObject.alternativeVersion,
-    accessibility1: challengeDataObject.accessibility1,
-    accessibility2: challengeDataObject.accessibility2,
+    blindnessCompatibility: challengeDataObject.accessibility1,
+    colorBlindnessCompatibility: challengeDataObject.accessibility2,
   });
 }
diff --git a/api/tests/certification/evaluation/unit/domain/usecases/get-next-challenge_test.js b/api/tests/certification/evaluation/unit/domain/usecases/get-next-challenge_test.js
@@ -66,7 +66,7 @@ describe('Unit | Domain | Use Cases | get-next-challenge', function () {
       it('should save the returned next challenge', async function () {
         // given
         const nextChallengeToAnswer = domainBuilder.buildChallenge({
-          accessibility1: 'KO',
+          blindnessCompatibility: 'KO',
         });
         const v3CertificationCourse = domainBuilder.buildCertificationCourse({
           version: CERTIFICATION_VERSIONS.V3,
@@ -143,19 +143,19 @@ describe('Unit | Domain | Use Cases | get-next-challenge', function () {
         it('should only pick among challenges with no accessibilities issues', async function () {
           // given
           const nextChallengeToAnswer = domainBuilder.buildChallenge({
-            accessibility1: 'RAS',
-            accessibility2: 'OK',
+            blindnessCompatibility: 'RAS',
+            colorBlindnessCompatibility: 'OK',
           });
           const accessibleChallenge = domainBuilder.buildChallenge({
-            accessibility1: 'OK',
-            accessibility2: 'RAS',
+            blindnessCompatibility: 'OK',
+            colorBlindnessCompatibility: 'RAS',
           });
           const allChallenges = [
             nextChallengeToAnswer,
             accessibleChallenge,
             domainBuilder.buildChallenge({
-              accessibility1: 'autre chose',
-              accessibility2: 'OK',
+              blindnessCompatibility: 'autre chose',
+              colorBlindnessCompatibility: 'OK',
             }),
           ];
           const v3CertificationCourse = domainBuilder.buildCertificationCourse({

diff --git a/api/tests/shared/integration/infrastructure/repositories/challenge-repository_test.js b/api/tests/shared/integration/infrastructure/repositories/challenge-repository_test.js
@@ -27,6 +27,8 @@ describe('Integration | Repository | challenge-repository', function () {
         ...challenge,
         focused: challenge.focusable,
         skill: domainBuilder.buildSkill({ ...skill, difficulty: skill.level }),
+        blindnessCompatibility: challenge.accessibility1,
+        colorBlindnessCompatibility: challenge.accessibility2,
       });
 
       // when
@@ -89,6 +91,8 @@ describe('Integration | Repository | challenge-repository', function () {
           webComponentProps: { prop1: 'value1', prop2: 'value2' },
           focused: challenge.focusable,
           skill: domainBuilder.buildSkill({ ...skill, difficulty: skill.level }),
+          blindnessCompatibility: challenge.accessibility1,
+          colorBlindnessCompatibility: challenge.accessibility2,
         });
 
         // when
@@ -113,7 +117,16 @@ describe('Integration | Repository | challenge-repository', function () {
 
           const learningContent = {
             skills: [{ ...skill, status: 'actif' }],
-            challenges: [{ ...challenge, skillId: 'recSkill1', alpha: 1, delta: 0 }],
+            challenges: [
+              {
+                ...challenge,
+                skillId: 'recSkill1',
+                alpha: 1,
+                delta: 0,
+                blindnessCompatibility: challenge.accessibility1,
+                colorBlindnessCompatibility: challenge.accessibility2,
+              },
+            ],
           };
 
           mockLearningContent(learningContent);

diff --git a/api/tests/tooling/domain-builder/factory/build-challenge.js b/api/tests/tooling/domain-builder/factory/build-challenge.js
@@ -27,8 +27,8 @@ const buildChallenge = function ({
   focused = false,
   shuffled = false,
   alternativeVersion = undefined,
-  accessibility1 = 'OK',
-  accessibility2 = 'RAS',
+  blindnessCompatibility = 'OK',
+  colorBlindnessCompatibility = 'RAS',
   // includes
   answer,
   validator = new Validator(),
@@ -61,8 +61,8 @@ const buildChallenge = function ({
     illustrationAlt,
     shuffled,
     alternativeVersion,
-    accessibility1,
-    accessibility2,
+    blindnessCompatibility,
+    colorBlindnessCompatibility,
     // includes
     answer,
     validator,
@@ -97,8 +97,8 @@ const buildChallengeWithWebComponent = function ({
   focused = false,
   shuffled = false,
   alternativeVersion = undefined,
-  accessibility1,
-  accessibility2,
+  blindnessCompatibility,
+  colorBlindnessCompatibility,
   // includes
   answer,
   validator = new Validator(),
@@ -131,8 +131,8 @@ const buildChallengeWithWebComponent = function ({
     illustrationAlt,
     shuffled,
     alternativeVersion,
-    accessibility1,
-    accessibility2,
+    blindnessCompatibility,
+    colorBlindnessCompatibility,
     // includes
     answer,
     validator,

diff --git a/api/tests/unit/domain/models/Challenge_test.js b/api/tests/unit/domain/models/Challenge_test.js
@@ -44,8 +44,8 @@ describe('Unit | Domain | Models | Challenge', function () {
         responsive: 'Smartphone',
         shuffled: false,
         alternativeVersion: 1,
-        accessibility1: 'OK',
-        accessibility2: 'KO',
+        blindnessCompatibility: 'OK',
+        colorBlindnessCompatibility: 'KO',
       };
 
       const expectedChallengeDataObject = {
@@ -80,8 +80,8 @@ describe('Unit | Domain | Models | Challenge', function () {
         responsive: 'Smartphone',
         shuffled: false,
         alternativeVersion: 1,
-        accessibility1: 'OK',
-        accessibility2: 'KO',
+        blindnessCompatibility: 'OK',
+        colorBlindnessCompatibility: 'KO',
       };
 
       // when
@@ -126,8 +126,8 @@ describe('Unit | Domain | Models | Challenge', function () {
         responsive: 'Smartphone',
         shuffled: false,
         alternativeVersion: 1,
-        accessibility1: 'OK',
-        accessibility2: 'KO',
+        blindnessCompatibility: 'OK',
+        colorBlindnessCompatibility: 'KO',
       };
 
       const expectedChallengeDataObject = {
@@ -162,8 +162,8 @@ describe('Unit | Domain | Models | Challenge', function () {
         responsive: 'Smartphone',
         shuffled: false,
         alternativeVersion: 1,
-        accessibility1: 'OK',
-        accessibility2: 'KO',
+        blindnessCompatibility: 'OK',
+        colorBlindnessCompatibility: 'KO',
       };
 
       // when
@@ -342,25 +342,28 @@ describe('Unit | Domain | Models | Challenge', function () {
   describe('#isAccessible', function () {
     /* eslint-disable mocha/no-setup-in-describe */
     [
-      { accessibility1: Accessibility.OK, accessibility2: Accessibility.OK, isAccessible: true },
-      { accessibility1: Accessibility.OK, accessibility2: Accessibility.RAS, isAccessible: true },
-      { accessibility1: Accessibility.RAS, accessibility2: Accessibility.OK, isAccessible: true },
-      { accessibility1: Accessibility.RAS, accessibility2: Accessibility.RAS, isAccessible: true },
-      { accessibility1: Accessibility.OK, accessibility2: 'KO', isAccessible: false },
-      { accessibility1: Accessibility.OK, accessibility2: 'autre chose', isAccessible: false },
-      { accessibility1: 'autre chose', accessibility2: Accessibility.OK, isAccessible: false },
-      { accessibility1: 'KO', accessibility2: Accessibility.RAS, isAccessible: false },
+      { blindnessCompatibility: Accessibility.OK, colorBlindnessCompatibility: Accessibility.OK, isAccessible: true },
+      { blindnessCompatibility: Accessibility.OK, colorBlindnessCompatibility: Accessibility.RAS, isAccessible: true },
+      { blindnessCompatibility: Accessibility.RAS, colorBlindnessCompatibility: Accessibility.OK, isAccessible: true },
+      { blindnessCompatibility: Accessibility.RAS, colorBlindnessCompatibility: Accessibility.RAS, isAccessible: true },
+      { blindnessCompatibility: Accessibility.OK, colorBlindnessCompatibility: 'KO', isAccessible: false },
+      { blindnessCompatibility: Accessibility.OK, colorBlindnessCompatibility: 'autre chose', isAccessible: false },
+      { blindnessCompatibility: 'autre chose', colorBlindnessCompatibility: Accessibility.OK, isAccessible: false },
+      { blindnessCompatibility: 'KO', colorBlindnessCompatibility: Accessibility.RAS, isAccessible: false },
       /* eslint-enable mocha/no-setup-in-describe */
-    ].forEach(({ accessibility1, accessibility2, isAccessible }) => {
-      context(`when accessibility1 is ${accessibility1} and accessibility2 is ${accessibility2}`, function () {
-        it(`returns ${isAccessible}`, function () {
-          // given
-          const challenge = domainBuilder.buildChallenge({ accessibility1, accessibility2 });
-
-          // when then
-          expect(challenge.isAccessible).to.equal(isAccessible);
-        });
-      });
+    ].forEach(({ blindnessCompatibility, colorBlindnessCompatibility, isAccessible }) => {
+      context(
+        `when blindnessCompatibility is ${blindnessCompatibility} and colorBlindnessCompatibility is ${colorBlindnessCompatibility}`,
+        function () {
+          it(`returns ${isAccessible}`, function () {
+            // given
+            const challenge = domainBuilder.buildChallenge({ blindnessCompatibility, colorBlindnessCompatibility });
+
+            // when then
+            expect(challenge.isAccessible).to.equal(isAccessible);
+          });
+        },
+      );
     });
   });
 });