Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
976a3290
Commit
976a3290
authored
1 year ago
by
Radheshhathwar
Browse files
Options
Download
Patches
Plain Diff
Removed hardcoded values
parent
a7d8a3ba
Gcloud_fix
1 merge request
!19
Added validations
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
+2
-3
...sment-service/app/controllers/v4/QuestionController.scala
assessment-api/assessment-service/app/utils/Constants.java
+1
-1
assessment-api/assessment-service/app/utils/Constants.java
with
3 additions
and
4 deletions
+3
-4
assessment-api/assessment-service/app/controllers/v4/QuestionController.scala
+
2
−
3
View file @
976a3290
...
...
@@ -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
=>
...
...
This diff is collapsed.
Click to expand it.
assessment-api/assessment-service/app/utils/Constants.java
+
1
−
1
View file @
976a3290
...
...
@@ -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"
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets