Code merge & updated build version 2.2.12 to 2.2.13

samagra-comms · Aug 22, 2023 · 4c54271 · 4c54271
2 parents 11cfeb2 + c7c58bc
commit 4c54271
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,15 +11,15 @@
 	</parent>
 	<groupId>com.uci</groupId>
 	<artifactId>orchestrator</artifactId>
-	<version>2.2.13</version>
+	<version>2.2.14</version>
 	<name>orchestrator</name>
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
 		<java.version>11</java.version>
-		<utils.version>2.2.8</utils.version>
-		<messagerosa.version>2.2.8</messagerosa.version>
-		<dao.version>2.2.8</dao.version>
+		<utils.version>2.2.9</utils.version>
+		<messagerosa.version>2.2.9</messagerosa.version>
+		<dao.version>2.2.9</dao.version>
 	</properties>
 
 	<!-- For Downloading repositories from github packages -->

diff --git a/src/main/java/com/uci/orchestrator/Consumer/CampaignConsumer.java b/src/main/java/com/uci/orchestrator/Consumer/CampaignConsumer.java
@@ -109,7 +109,8 @@ public void accept(JsonNode botNode) {
                         JsonNode firstTransformer = botNode.findValues("transformers").get(0);
 
                         if (message != null && (message.getProviderURI().equals("firebase") && message.getChannelURI().equals("web"))
-                                || ((message.getProviderURI().equals("cdac") || message.getProviderURI().equals("gupshup")) && message.getChannelURI().equals("sms"))) {
+                                || ((message.getProviderURI().equalsIgnoreCase("cdac") || message.getProviderURI().equalsIgnoreCase("gupshup")) && message.getChannelURI().equals("sms"))
+                                || ((message.getProviderURI().equalsIgnoreCase("netcore") || message.getProviderURI().equalsIgnoreCase("gupshup")) && message.getChannelURI().equalsIgnoreCase("whatsapp"))) {
                             if (firstTransformer.findValue("type") != null && firstTransformer.findValue("type").asText().equals(BotUtil.transformerTypeBroadcast)) {
                                 try {
                                     log.info("CampaignConsumer:broadcastNotificationChunkSize : " + broadcastNotificationChunkSize);