From 89ea287762b7243eac90c27629e531c5f5625fc4 Mon Sep 17 00:00:00 2001 From: Kumar Gauraw Date: Tue, 6 Jul 2021 10:04:26 +0530 Subject: [PATCH 1/2] Issue #000 fix: correction for topic --- .../org/sunbird/graph/schema/validator/FrameworkValidator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala b/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala index e3000be6d..25a4f5dde 100644 --- a/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala +++ b/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala @@ -78,7 +78,7 @@ trait FrameworkValidator extends IDefinition { val grades = fetchValidatedList(getList("gradeLevelIds", node), orgTermMap) if (CollectionUtils.isNotEmpty(grades)) node.getMetadata.putIfAbsent("gradeLevel", grades) val topics = fetchValidatedList(getList("topicsIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(topics)) node.getMetadata.putIfAbsent("topics", topics) + if (CollectionUtils.isNotEmpty(topics)) node.getMetadata.putIfAbsent("topic", topics) getValidatedTerms(node, targetFwTerms) }).flatMap(f => f) } From ab21d1b26a608582db2cb75d9171d7dcf0a43282 Mon Sep 17 00:00:00 2001 From: Kumar Gauraw Date: Tue, 6 Jul 2021 10:34:25 +0530 Subject: [PATCH 2/2] Issue #000 fix: fixed board issue --- .../graph/schema/validator/FrameworkValidator.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala b/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala index 25a4f5dde..a095f85fb 100644 --- a/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala +++ b/ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/schema/validator/FrameworkValidator.scala @@ -70,15 +70,15 @@ trait FrameworkValidator extends IDefinition { private def validateAndSetMultiFrameworks(node: Node, orgFwTerms: List[String], targetFwTerms: List[String])(implicit ec: ExecutionContext, oec: OntologyEngineContext): Future[Map[String, AnyRef]] = { getValidatedTerms(node, orgFwTerms).map(orgTermMap => { val boards = fetchValidatedList(getList("boardIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(boards)) node.getMetadata.putIfAbsent("board", boards.get(0)) + if (CollectionUtils.isNotEmpty(boards)) node.getMetadata.put("board", boards.get(0)) val mediums = fetchValidatedList(getList("mediumIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(mediums)) node.getMetadata.putIfAbsent("medium", mediums) + if (CollectionUtils.isNotEmpty(mediums)) node.getMetadata.put("medium", mediums) val subjects = fetchValidatedList(getList("subjectIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(subjects)) node.getMetadata.putIfAbsent("subject", subjects) + if (CollectionUtils.isNotEmpty(subjects)) node.getMetadata.put("subject", subjects) val grades = fetchValidatedList(getList("gradeLevelIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(grades)) node.getMetadata.putIfAbsent("gradeLevel", grades) + if (CollectionUtils.isNotEmpty(grades)) node.getMetadata.put("gradeLevel", grades) val topics = fetchValidatedList(getList("topicsIds", node), orgTermMap) - if (CollectionUtils.isNotEmpty(topics)) node.getMetadata.putIfAbsent("topic", topics) + if (CollectionUtils.isNotEmpty(topics)) node.getMetadata.put("topic", topics) getValidatedTerms(node, targetFwTerms) }).flatMap(f => f) }