From 0b0b452c030f0a508808ec0069dda9112fb61ae4 Mon Sep 17 00:00:00 2001
From: ravisaurav-tarento
 <142487505+ravisaurav-tarento@users.noreply.github.com>
Date: Fri, 22 Dec 2023 16:00:35 +0530
Subject: [PATCH] Cbrelease 4.8.9 (#139)

* Moved content hierarchy from contant to configuration property

* formatted code
---
 .../org/sunbird/workflow/config/Configuration.java    | 11 +++++++++++
 .../workflow/consumer/NotificationConsumer.java       |  6 +++++-
 src/main/resources/application.properties             |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/sunbird/workflow/config/Configuration.java b/src/main/java/org/sunbird/workflow/config/Configuration.java
index 0ed1208c..9eda33a9 100644
--- a/src/main/java/org/sunbird/workflow/config/Configuration.java
+++ b/src/main/java/org/sunbird/workflow/config/Configuration.java
@@ -188,6 +188,9 @@ public class Configuration {
     @Value("${domain.validation.regex}")
     private String domainValidationRegex;
 
+    @Value("${env.hierarchy.keystore.keyspace}")
+    private String envHierarchyKeystoreKeyspaceName;
+
     public String getModificationRecordAllowActions() {
         return modificationRecordAllowActions;
     }
@@ -683,4 +686,12 @@ public String getDomainValidationRegex() {
     public void setDomainValidationRegex(String domainValidationRegex) {
         this.domainValidationRegex = domainValidationRegex;
     }
+
+    public String getEnvHierarchyKeystoreKeyspaceName() {
+        return envHierarchyKeystoreKeyspaceName;
+    }
+
+    public void setEnvHierarchyKeystoreKeyspaceName(String envHierarchyKeystoreKeyspaceName) {
+        this.envHierarchyKeystoreKeyspaceName = envHierarchyKeystoreKeyspaceName;
+    }
 }
diff --git a/src/main/java/org/sunbird/workflow/consumer/NotificationConsumer.java b/src/main/java/org/sunbird/workflow/consumer/NotificationConsumer.java
index 34f4d702..aef52e37 100644
--- a/src/main/java/org/sunbird/workflow/consumer/NotificationConsumer.java
+++ b/src/main/java/org/sunbird/workflow/consumer/NotificationConsumer.java
@@ -8,6 +8,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Service;
+import org.sunbird.workflow.config.Configuration;
 import org.sunbird.workflow.config.Constants;
 import org.sunbird.workflow.models.WfRequest;
 import org.sunbird.workflow.service.impl.NotificationServiceImpl;
@@ -33,6 +34,9 @@ public class NotificationConsumer {
 	@Autowired
 	private CassandraOperation cassandraOperation;
 
+	@Autowired
+	private Configuration configuration;
+
 	@KafkaListener(groupId = "workflowNotificationTopic-consumer", topics = "${kafka.topics.workflow.notification}")
 	public void processMessage(ConsumerRecord<String, String> data) {
 		WfRequest wfRequest = null;
@@ -76,7 +80,7 @@ public Map<String, Object> getCourseAttributes(String courseId){
 		Map<String, Object> propertiesMap = new HashMap<>();
 		Map<String, Object> courseDetails = new HashMap<>();
 		propertiesMap.put(Constants.IDENTIFIER, courseId);
-		List<Map<String, Object>> coursesDataList = cassandraOperation.getRecordsByProperties(Constants.DEV_HIERARCHY_STORE,
+		List<Map<String, Object>> coursesDataList = cassandraOperation.getRecordsByProperties(configuration.getEnvHierarchyKeystoreKeyspaceName(),
 				Constants.CONTENT_HIERARCHY,
 				propertiesMap,
 				Arrays.asList(Constants.IDENTIFIER, Constants.HIERARCHY));
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index dfb2bdd5..af6ea34d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -118,4 +118,5 @@ bp.approval.request.mail.body=You have received a request for enrollment for #us
 bp.request.forwarded.mail.body=The enrollment request for #username in #batch_name of the #blended_programme_name Program, starting on #batch_start_date , has been forwarded to the #role for approval.
 bp.nomination.request.mail.body=The enrollment request for #username in #batch_name of the #blended_programme_name Program, starting on #batch_start_date , has been #state.
 
-domain.validation.regex=^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$
\ No newline at end of file
+domain.validation.regex=^[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$
+env.hierarchy.keystore.keyspace=dev_hierarchy_store
\ No newline at end of file