Skip to content
GitLab

Adding Rejected status

Merged shishir suman requested to merge github/fork/reshmi-nair/AddRejectedStatus into Gcloud_fix
Compare
and
7 files
+ 13
− 9
assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
+ 1
− 1
@@ -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)
})
}
assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionActor.scala
+ 1
− 1
@@ -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)
})
}
assessment-api/assessment-actors/src/main/scala/org/sunbird/actors/QuestionSetActor.scala
+ 1
− 1
@@ -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)
content-api/content-actors/src/main/scala/org/sunbird/content/actors/ContentActor.scala
+ 1
− 1
@@ -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")
schemas/collection/1.0/schema.json
+ 3
− 2
@@ -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"
schemas/content/1.0/schema.json
+ 3
− 2
@@ -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"
schemas/question/1.0/schema.json
+ 2
− 1
@@ -128,7 +128,8 @@
"Draft",
"Review",
"Live",
"Retired"
"Retired",
"Rejected"
],
"default": "Draft"
},
schemas/questionset/1.0/schema.json
+ 2
− 1
@@ -158,7 +158,8 @@
"Draft",
"Review",
"Live",
"Retired"
"Retired",
"Rejected"
],
"default": "Draft"
},