diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala index c09f7f961bc34da8f6c1180991ee102551442668..0faa1a2b2509fd37d35355090a484d0f4760ae55 100644 --- a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala +++ b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala @@ -145,7 +145,7 @@ class QuestionActor @Inject()(implicit oec: OntologyEngineContext) extends BaseA updateRequest.getContext.put("identifier", request.getContext.get("identifier")) if(request.getRequest.containsKey("rejectComment")) updateRequest.put("rejectComment", request.get("rejectComment").asInstanceOf[String]) - updateRequest.putAll(Map("versionKey" -> node.getMetadata.get("versionKey"), "status" -> "Draft", "prevStatus" -> node.getMetadata.get("status"), "lastStatusChangedOn" -> date, "lastUpdatedOn" -> date).asJava) + updateRequest.putAll(Map("versionKey" -> node.getMetadata.get("versionKey"), "status" -> "Rejected", "prevStatus" -> node.getMetadata.get("status"), "lastStatusChangedOn" -> date, "lastUpdatedOn" -> date).asJava) AssessmentManager.updateNode(updateRequest) }) } diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala index c9fbe3ef303ad980f1f18357d0660b7234149351..49459200381dc12f94b6dbcba981a521d5ef0410 100644 --- a/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala +++ b/assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala @@ -107,7 +107,7 @@ class QuestionSetActor @Inject()(implicit oec: OntologyEngineContext) extends Ba val (updatedHierarchy, nodeIds) = AssessmentManager.updateHierarchy(hierarchyString.asInstanceOf[String], "Draft", node.getMetadata.getOrDefault("createdBy", "").asInstanceOf[String]) val updateReq = new Request(request) val date = DateUtils.formatCurrentDate - updateReq.putAll(Map("identifiers" -> nodeIds, "metadata" -> Map("status" -> "Draft", "prevStatus" -> node.getMetadata.get("status"), "lastStatusChangedOn" -> date, "lastUpdatedOn" -> date).asJava).asJava) + updateReq.putAll(Map("identifiers" -> nodeIds, "metadata" -> Map("status" -> "Rejected", "prevStatus" -> node.getMetadata.get("status"), "lastStatusChangedOn" -> date, "lastUpdatedOn" -> date).asJava).asJava) val metadata: Map[String, AnyRef] = Map("status" -> "Draft", "hierarchy" -> updatedHierarchy) val updatedMetadata = if(request.getRequest.containsKey("rejectComment")) (metadata ++ Map("rejectComment" -> request.get("rejectComment").asInstanceOf[String])) else metadata updateHierarchyNodes(updateReq, node, updatedMetadata, nodeIds) diff --git a/content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala b/content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala index 89d19882f9fdae6317bedf4425be629988a4369a..1e5ba7d01bb2f7f9a601112bf544c3f1074d2a85 100644 --- a/content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala +++ b/content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala @@ -319,7 +319,7 @@ class ContentActor @Inject() (implicit oec: OntologyEngineContext, ss: StorageSe if (StringUtils.isBlank(status)) throw new ClientException("ERR_METADATA_ISSUE", "Content metadata error, status is blank for identifier:" + node.getIdentifier) if (StringUtils.equals("Review", status)) { - request.getRequest.put(ContentConstants.STATUS, "Draft") + request.getRequest.put(ContentConstants.STATUS, "Rejected") request.getRequest.put("prevStatus", "Review") } else if (StringUtils.equals("FlagReview", status)) { request.getRequest.put(ContentConstants.STATUS, "FlagDraft") diff --git a/schemas/collection/1.0/schema.json b/schemas/collection/1.0/schema.json index 2f897db5a3048e00f28a8cdb67daa18a69e1fda8..42dc46e9fef4c56df0771689942372926a1e29d0 100644 --- a/schemas/collection/1.0/schema.json +++ b/schemas/collection/1.0/schema.json @@ -43,7 +43,8 @@ "Processing", "FlagDraft", "FlagReview", - "Failed" + "Failed", + "Rejected" ], "default": "Draft" }, @@ -975,7 +976,7 @@ "type": "array" }, "difficultyLevel" : { - "type": "string" + "type": "array" }, "board" : { "type": "string" diff --git a/schemas/content/1.0/schema.json b/schemas/content/1.0/schema.json index 8764343f456dcc5a2008579bd2a9243db77ced06..600f20a7f923840a5de34f67015267d54a23004f 100644 --- a/schemas/content/1.0/schema.json +++ b/schemas/content/1.0/schema.json @@ -43,7 +43,8 @@ "Processing", "FlagDraft", "FlagReview", - "Failed" + "Failed", + "Rejected" ], "default": "Draft" }, @@ -1039,7 +1040,7 @@ "type": "array" }, "difficultyLevel" : { - "type": "string" + "type": "array" }, "board" : { "type": "string" diff --git a/schemas/question/1.0/schema.json b/schemas/question/1.0/schema.json index 0aedefbcddeb6e12e88a91899cb860ed5d964075..ecf1a8a7bac138cdea8434dfc81f14345ae2636b 100644 --- a/schemas/question/1.0/schema.json +++ b/schemas/question/1.0/schema.json @@ -128,7 +128,8 @@ "Draft", "Review", "Live", - "Retired" + "Retired", + "Rejected" ], "default": "Draft" }, diff --git a/schemas/questionset/1.0/schema.json b/schemas/questionset/1.0/schema.json index b801bf0010a8afbfa385edaf02f2f998f64de304..a9e0f86c098f10d86fbeed5af0ab4b00c79dae99 100644 --- a/schemas/questionset/1.0/schema.json +++ b/schemas/questionset/1.0/schema.json @@ -158,7 +158,8 @@ "Draft", "Review", "Live", - "Retired" + "Retired", + "Rejected" ], "default": "Draft" },