From 7df381b63df8c6d7cbe0a49e25dff18a26feb890 Mon Sep 17 00:00:00 2001
From: Reshmi <revas.nair@gmail.com>
Date: Wed, 17 Jan 2024 17:49:38 +0530
Subject: [PATCH] Adding Rejected status
---
.../src/main/scala/org/sunbird/actors/QuestionActor.scala | 2 +-
.../src/main/scala/org/sunbird/actors/QuestionSetActor.scala | 2 +-
.../main/scala/org/sunbird/content/actors/ContentActor.scala | 2 +-
schemas/collection/1.0/schema.json | 5 +++--
schemas/content/1.0/schema.json | 5 +++--
schemas/question/1.0/schema.json | 3 ++-
schemas/questionset/1.0/schema.json | 3 ++-
7 files changed, 13 insertions(+), 9 deletions(-)
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 c09f7f961..0faa1a2b2 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 c9fbe3ef3..494592003 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 89d19882f..1e5ba7d01 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 2f897db5a..42dc46e9f 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 8764343f4..600f20a7f 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 0aedefbcd..ecf1a8a7b 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 b801bf001..a9e0f86c0 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"
},
--
GitLab