Code merged from PR #173

sunbird-cb · Feb 14, 2023 · 2cc5c07 · 2cc5c07
1 parent 2c10188
commit 2cc5c07
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/main/java/org/sunbird/assessment/service/AssessmentServiceV2Impl.java b/src/main/java/org/sunbird/assessment/service/AssessmentServiceV2Impl.java
@@ -279,16 +279,16 @@ private Map<String, String> validateQuestionListAPI(Map<String, Object> requestB
             List<String> questionsFromAssessment = new ArrayList<>();
             List<Map<String, Object>> sections = (List<Map<String, Object>>) userAssessmentAllDetail.get(Constants.CHILDREN);
             for (Map<String, Object> section : sections) {
-                questionsFromAssessment.addAll((List<String>) section.get(Constants.CHILD_NODES));
-                // Out of the list of questions received in the payload, checking if the request
+            	// Out of the list of questions received in the payload, checking if the request
                 // has only those ids which are a part of the user's latest assessment
                 // Fetching all the remaining questions details from the Redis
-                if (Boolean.FALSE.equals(validateQuestionListRequest(identifierList, questionsFromAssessment))) {
-                    result.put(Constants.ERROR_MESSAGE, Constants.THE_QUESTIONS_IDS_PROVIDED_DONT_MATCH);
-                    return result;
-                }
+                questionsFromAssessment.addAll((List<String>) section.get(Constants.CHILD_NODES));
             }
-            result.put(Constants.ERROR_MESSAGE, "");
+            if (validateQuestionListRequest(identifierList, questionsFromAssessment)) {
+				result.put(Constants.ERROR_MESSAGE, StringUtils.EMPTY);
+			} else {
+				result.put(Constants.ERROR_MESSAGE, Constants.THE_QUESTIONS_IDS_PROVIDED_DONT_MATCH);
+			}
             return result;
         } else {
             result.put(Constants.ERROR_MESSAGE, Constants.ASSESSMENT_ID_INVALID);