From 692d7c2ced43f686e7fdb7d696c60b6b684c79ea Mon Sep 17 00:00:00 2001
From: karthik-tarento <karthikeyan.rajendran@tarento.com>
Date: Thu, 24 Mar 2022 14:42:20 +0530
Subject: [PATCH] Fixes for type cast issue in assessment submit

---
 .../service/AssessmentUtilServiceV2Impl.java  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/sunbird/assessment/service/AssessmentUtilServiceV2Impl.java b/src/main/java/org/sunbird/assessment/service/AssessmentUtilServiceV2Impl.java
index e17b1f113..e7384b23b 100644
--- a/src/main/java/org/sunbird/assessment/service/AssessmentUtilServiceV2Impl.java
+++ b/src/main/java/org/sunbird/assessment/service/AssessmentUtilServiceV2Impl.java
@@ -72,7 +72,7 @@ public Map<String, Object> validateQumlAssessment(List<String> originalQuestionL
 					case MCQ_MCA:
 						for (Map<String, Object> option : options) {
 							if ((boolean) option.get(SELECTED_ANSWER)) {
-								marked.add(Integer.toString((int) option.get(INDEX)));
+								marked.add((String) option.get(INDEX));
 							}
 						}
 						break;
@@ -131,23 +131,25 @@ private Map<String, Object> getQumlAnswers(List<String> questions) throws Except
 			if (question.containsKey(QUESTION_TYPE)) {
 				String questionType = ((String) question.get(QUESTION_TYPE)).toLowerCase();
 				Map<String, Object> editorStateObj = (Map<String, Object>) question.get(EDITOR_STATE);
+				List<Map<String, Object>> options = (List<Map<String, Object>>) editorStateObj.get(OPTIONS);
 				switch (questionType) {
 				case MTF:
-					for (Map<String, Object> options : (List<Map<String, Object>>) editorStateObj.get(OPTIONS)) {
-						Map<String, Object> valueObj = (Map<String, Object>) options.get(VALUE);
-						correctOption
-								.add(valueObj.get(VALUE).toString() + "-" + valueObj.get(BODY).toString().toLowerCase()
-										+ "-" + options.get(ANSWER).toString().toLowerCase());
+					for (Map<String, Object> option : options) {
+						Map<String, Object> valueObj = (Map<String, Object>) option.get(VALUE);
+						correctOption.add(
+								valueObj.get(VALUE).toString() + "-" + option.get(ANSWER).toString().toLowerCase());
 					}
 					break;
 				case FTB:
-					correctOption.add((String) editorStateObj.get(ANSWER));
+					for (Map<String, Object> option : options) {
+						correctOption.add((String) option.get(SELECTED_ANSWER));
+					}
 					break;
 				case MCQ_SCA:
 				case MCQ_MCA:
-					for (Map<String, Object> options : (List<Map<String, Object>>) editorStateObj.get(OPTIONS)) {
-						if ((boolean) options.get(ANSWER)) {
-							Map<String, Object> valueObj = (Map<String, Object>) options.get(VALUE);
+					for (Map<String, Object> option : options) {
+						if ((boolean) option.get(ANSWER)) {
+							Map<String, Object> valueObj = (Map<String, Object>) option.get(VALUE);
 							correctOption.add(valueObj.get(VALUE).toString());
 						}
 					}