From 976a3290aaa4ed1d9d13c64c379d80b0ac2ec3a1 Mon Sep 17 00:00:00 2001 From: Radheshhathwar <radheshhathwar.bh@gmail.com> Date: Tue, 30 Jan 2024 09:01:13 +0530 Subject: [PATCH] Removed hardcoded values --- .../app/controllers/v4/QuestionController.scala | 5 ++--- assessment-api/assessment-service/app/utils/Constants.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala b/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala index 605a1a2a0..d7fc41847 100644 --- a/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala +++ b/assessment-api/assessment-service/app/controllers/v4/QuestionController.scala @@ -9,7 +9,7 @@ import org.sunbird.common.dto.Response import org.sunbird.utils.AssessmentConstants import play.api.libs.json.Json import play.api.mvc.{ControllerComponents, Result} -import utils.{ActorNames, ApiId, JavaJsonUtils, QuestionOperations} +import utils.{ActorNames, ApiId, Constants, JavaJsonUtils, QuestionOperations} import javax.inject.{Inject, Named} import scala.collection.JavaConverters._ @@ -22,7 +22,6 @@ class QuestionController @Inject()(@Named(ActorNames.QUESTION_ACTOR) questionAct val objectType = "Question" val schemaName: String = "question" val version = "1.0" - val frameworkUrl = "https://uphrh.in/api/framework/v1/read/nirayama_frccl_fw?categories=difficultyLevel,subject" private val logger: Logger = LoggerFactory.getLogger(RedisCache.getClass.getCanonicalName) @@ -143,7 +142,7 @@ class QuestionController @Inject()(@Named(ActorNames.QUESTION_ACTOR) questionAct val validatedQuestions: List[Map[String, Any]] = QuestionExcelParser.validateQuestions(questions) // Step 3: Read framework from the API - val frameworkMap = QuestionExcelParser.frameworkRead(frameworkUrl) + val frameworkMap = QuestionExcelParser.frameworkRead(Constants.frameworkUrl) // Step 4: Check if questions are valid against the framework val isQuestionsValid: Boolean = validatedQuestions.forall { question => diff --git a/assessment-api/assessment-service/app/utils/Constants.java b/assessment-api/assessment-service/app/utils/Constants.java index 80e9a14d0..752b3544b 100644 --- a/assessment-api/assessment-service/app/utils/Constants.java +++ b/assessment-api/assessment-service/app/utils/Constants.java @@ -40,7 +40,7 @@ public class Constants { public static String subject = "subject"; public static String gradeLevel = "gradeLevel"; public static String difficultyLevel = "difficultyLevel"; - + public static String frameworkUrl = "https://uphrh.in/api/framework/v1/read/nirayama_frccl_fw?categories=difficultyLevel,subject"; -- GitLab