Merge pull request #3114 from ONSdigital/EAR-2405-Enable-one-answer-f…

…rom-a-list-collector-follow-up-question-on-a-calculated-summary

EAR-2405-Enable one answer from a list collector follow-up question on a calculated summary

eq-author-api/src/validation/customKeywords/calculatedSummaryMinAnswers.js

@@ -1,7 +1,7 @@
 const createValidationError = require("../createValidationError");
 
 const { ERR_NO_ANSWERS } = require("../../../constants/validationErrorCodes");
-const { getPages, getFolders } = require("../../../schema/resolvers/utils");
+const { getFolderByAnswerId } = require("../../../schema/resolvers/utils");
 
 module.exports = (ajv) =>
   ajv.addKeyword({
@@ -20,41 +20,26 @@ module.exports = (ajv) =>
     ) {
       if (parentData.summaryAnswers.length > 1) {
         return true;
-      } else {
-        const folders = getFolders({ questionnaire });
-        const pages = getPages({ questionnaire });
-
-        const allAnswers = pages.reduce(
-          (acc, page) => (page.answers ? [...acc, ...page.answers] : acc),
-          []
-        );
+      }
 
-        const selectedAnswers = allAnswers.filter((answer) =>
-          parentData.summaryAnswers.includes(answer.id)
+      if (parentData.summaryAnswers.length === 1) {
+        let selectedFolder = getFolderByAnswerId(
+          { questionnaire },
+          parentData.summaryAnswers[0]
         );
-
-        let selectedFolder;
-        folders.forEach((folder) => {
-          folder.pages.forEach((page) => {
-            if (page.id === selectedAnswers[0]?.questionPageId) {
-              selectedFolder = folder;
-            }
-          });
-        });
-
-        if (parentData.summaryAnswers.length === 1 && selectedFolder?.listId) {
+        if (selectedFolder?.listId) {
           return true;
-        } else {
-          isValid.errors = [
-            createValidationError(
-              instancePath,
-              fieldName,
-              ERR_NO_ANSWERS,
-              questionnaire
-            ),
-          ];
-          return false;
         }
       }
+
+      isValid.errors = [
+        createValidationError(
+          instancePath,
+          fieldName,
+          ERR_NO_ANSWERS,
+          questionnaire
+        ),
+      ];
+      return false;
     },
   });