Skip to content

#SBCOSS-625: Textbook collection update upon csv update #1121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pallakartheekreddy merged 11 commits into from
Oct 16, 2025
Merged

#SBCOSS-625: Textbook collection update upon csv update #1121

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
41656f6
SBCOSS-625: Refactor linked content handling in CollectionCSVManager
Rakshitha-D Oct 14, 2025
75fb0a9
SBCOSS-625: updated dial code requirement
Rakshitha-D Oct 14, 2025
7871de5
SBCOSS-625: updated dial code requirement
Rakshitha-D Oct 14, 2025
a965cf9
SBCOSS-625: updated dial code requirement
Rakshitha-D Oct 14, 2025
a141a11
SBCOSS-625: reverted validation code
Rakshitha-D Oct 14, 2025
e01339f
SBCOSS-625: unlinking dial code when empty value in csv
Rakshitha-D Oct 14, 2025
986fe3a
SBCOSS-625: removed redundant code
Rakshitha-D Oct 14, 2025
c9d9938
SBCOSS-625: refactor dialcode handling to improve JSON serialization
Rakshitha-D Oct 14, 2025
5143ad3
SBCOSS-625: updated reverted dialcode unlinking changes
Rakshitha-D Oct 15, 2025
94479cb
SBCOSS-625: update reverted dialcode unlinking changes
Rakshitha-D Oct 15, 2025
71f89df
SBCOSS-625: update to safe handling
Rakshitha-D Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions ...on-csv-actors/src/main/scala/org.sunbird/collectioncsv/manager/CollectionCSVManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object CollectionCSVManager extends CollectionInputFileReader {
if (mode.equals(CollectionTOCConstants.UPDATE)) validateRecordsDataAuthenticity(inputFileExtension, csvRecords, collectionHierarchy) else List.empty[Map[String, AnyRef]]
}

def validateCollection(collection: Map[String, AnyRef], mode: String) {
def validateCollection(collection: Map[String, AnyRef], mode: String): Unit = {
if (!COLLECTION_TOC_ALLOWED_MIMETYPE.equalsIgnoreCase(collection(MIME_TYPE).toString))
throw new ClientException("INVALID_COLLECTION", "Invalid Collection. Please Provide Valid Collection Identifier.")
if(mode.equalsIgnoreCase("export")) {
Expand Down Expand Up @@ -480,19 +480,17 @@ object CollectionCSVManager extends CollectionInputFileReader {
childrenHierarchy.map(record => {
val UnitChildren = if (record.contains(CollectionTOCConstants.CHILDREN)) {
record(CollectionTOCConstants.CHILDREN).asInstanceOf[List[Map[String, AnyRef]]].map(childNode => {
if(record.getOrElse(CollectionTOCConstants.CONTENT_TYPE,"").toString.equalsIgnoreCase(collectionUnitType))
childNode(CollectionTOCConstants.IDENTIFIER).toString
else ""
}).filter(nodeId => nodeId.nonEmpty).asInstanceOf[Seq[String]]
val childContentType = childNode.getOrElse(CollectionTOCConstants.CONTENT_TYPE, "").toString
if(childContentType.equalsIgnoreCase(collectionUnitType)) childNode(CollectionTOCConstants.IDENTIFIER).toString else ""
}).filter(_.nonEmpty).toSeq
}
else Seq.empty[String]

val linkedContents = if (record.contains(CollectionTOCConstants.CHILDREN)) {
record(CollectionTOCConstants.CHILDREN).asInstanceOf[List[Map[String, AnyRef]]].map(childNode => {
if(!record.getOrElse(CollectionTOCConstants.CONTENT_TYPE,"").toString.equalsIgnoreCase(collectionUnitType))
childNode(CollectionTOCConstants.IDENTIFIER).toString
else ""
}).filter(nodeId => nodeId.nonEmpty).asInstanceOf[Seq[String]]
val childContentType = childNode.getOrElse(CollectionTOCConstants.CONTENT_TYPE, "").toString
if(!childContentType.equalsIgnoreCase(collectionUnitType)) childNode(CollectionTOCConstants.IDENTIFIER).toString else ""
}).filter(_.nonEmpty).toSeq
}
else Seq.empty[String]

Expand Down