repeating answers and empty list collectors (#210)

ONSdigital · Feb 14, 2024 · f8e3d0d · f8e3d0d
1 parent cd01341
commit f8e3d0d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 deletions.
diff --git a/src/eq_schema/schema/Question/index.js b/src/eq_schema/schema/Question/index.js
@@ -1,5 +1,5 @@
 const { find, get, flow, concat, last } = require("lodash/fp");
-const { set, remove, cloneDeep } = require("lodash");
+const { set, remove, cloneDeep, filter } = require("lodash");
 
 const { getInnerHTMLWithPiping } = require("../../../utils/HTMLUtils");
 const convertPipes = require("../../../utils/convertPipes");
@@ -8,6 +8,7 @@ const {
   reversePipeContent,
 } = require("../../../utils/compoundFunctions");
 const { getList, getSupplementaryList } = require("../../../utils/functions/listGetters");
+const { getPagesByListId } = require("../../../utils/functions/pageGetters")
 
 const Answer = require("../Answer");
 const { getValueSource } = require("../../builders/valueSource");
@@ -79,30 +80,31 @@ class Question {
         answers: this.buildAnswers(question.answers, ctx),
       };
 
-      const newSkip = {
-        expressions: [
-          {
-            secondaryCondition: "Equal",
-            right: {
-              customValue: {
-                number: 0
-              },
-              type: "Custom",
-            },
-            condition: "CountOf",
+      const ListCollectorPages = filter(getPagesByListId(ctx, question.answers[0].repeatingLabelAndInputListId), { pageType: "ListCollectorConfirmationPage" })
+
+      if (ListCollectorPages.length) {
+        const expressions = ListCollectorPages.map((page) => ({
+            condition: "Unanswered",
             left: {
-              listId: question.answers[0].repeatingLabelAndInputListId,
-              type: "List",
+              answerId: page.answers[0].id,
+              type: "Answer"
             },
-          }
-        ],
-        operator: "And"
-      }
+            right: {
+              optionIds: [
+              ]
+            }
+          })
+        )
+        const newSkip = {
+          expressions: expressions,
+          operator: "And"
+        }
 
-      if(question.skipConditions) {
-        question.skipConditions = [newSkip, ...question.skipConditions]
-      } else {      
-        question.skipConditions = [newSkip]
+        if(question.skipConditions) {
+          question.skipConditions = [newSkip, ...question.skipConditions]
+        } else {      
+          question.skipConditions = [newSkip]
+        }
       }
 
       if (question.totalValidation && question.totalValidation.enabled) {

diff --git a/src/utils/functions/pageGetters.js b/src/utils/functions/pageGetters.js
@@ -1,3 +1,10 @@
+const { flatMap, filter } = require("lodash");
+
+const getPages = (ctx) =>
+  flatMap(ctx.questionnaireJson.sections, (section) =>
+    flatMap(section.folders, ({ pages }) => pages)
+  );
+
 const getPageById = (ctx, pageId) => {
   let result;
   ctx.questionnaireJson.sections.forEach((section) => {
@@ -13,4 +20,9 @@ const getPageById = (ctx, pageId) => {
   return result;
 };
 
-module.exports = { getPageById };
+const getPagesByListId = (ctx, listId) => 
+  flatMap(ctx.questionnaireJson.sections, (section) =>
+    flatMap(filter(section.folders, { listId:listId }), ({ pages }) => pages)
+  );
+
+module.exports = { getPageById, getPagesByListId, getPages };