Merge pull request #72 from ONSdigital/adding-set-condition

Added a set condition to all not equals
ONSdigital · Jul 11, 2018 · b15f054 · b15f054
2 parents 8c0f625 + 15ba3ce
commit b15f054
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/eq_schema/RoutingConditions.js b/src/eq_schema/RoutingConditions.js
@@ -12,13 +12,18 @@ class RoutingConditions {
 
     return flatMap(condition => {
       const optionIds = map("id", condition.answer.options);
-      const notIds = xor(condition.routingValue.value, optionIds);
+      const unselectedIds = xor(condition.routingValue.value, optionIds);
 
-      return notIds.map(id => ({
-        id: `answer${condition.answer.id}`,
-        condition: "not equals",
-        value: optionById[id].label
-      }));
+      return unselectedIds
+        .map(id => ({
+          id: `answer${condition.answer.id}`,
+          condition: "not equals",
+          value: optionById[id].label
+        }))
+        .concat({
+          id: `answer${condition.answer.id}`,
+          condition: "set"
+        });
     }, conditions);
   }
 }

diff --git a/src/eq_schema/RoutingRule.test.js b/src/eq_schema/RoutingRule.test.js
@@ -132,7 +132,8 @@ describe("Rule", () => {
             block: "block2",
             when: [
               { id: "answer2", condition: "not equals", value: "no" },
-              { id: "answer2", condition: "not equals", value: "maybe" }
+              { id: "answer2", condition: "not equals", value: "maybe" },
+              { id: "answer2", condition: "set" }
             ]
           }
         },
@@ -160,7 +161,8 @@ describe("Rule", () => {
             group: "summary-group",
             when: [
               { id: "answer2", condition: "not equals", value: "no" },
-              { id: "answer2", condition: "not equals", value: "maybe" }
+              { id: "answer2", condition: "not equals", value: "maybe" },
+              { id: "answer2", condition: "set" }
             ]
           }
         },
@@ -189,8 +191,10 @@ describe("Rule", () => {
             when: [
               { id: "answer2", condition: "not equals", value: "no" },
               { id: "answer2", condition: "not equals", value: "maybe" },
+              { id: "answer2", condition: "set" },
               { id: "answer3", condition: "not equals", value: "pepperoni" },
-              { id: "answer3", condition: "not equals", value: "chorizo" }
+              { id: "answer3", condition: "not equals", value: "chorizo" },
+              { id: "answer3", condition: "set" }
             ]
           }
         },