From 4c8976690308a5d722a690417ceb9e3cf60a00e9 Mon Sep 17 00:00:00 2001
From: Sukhpal <6563909+sukhpalp@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:13:23 -0700
Subject: [PATCH] WFNEWS-2203 : Use ROF API field instead of comments for
 visible flames

---
 server/wfnews-api/wfnews-service-api/pom.xml  |  2 +-
 .../pom.xml                                   |  2 +-
 .../wfone-notifications-service-api/pom.xml   |  2 +-
 .../api/v1/impl/RecordRoFServiceImpl.java     | 34 ++++++-------------
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/server/wfnews-api/wfnews-service-api/pom.xml b/server/wfnews-api/wfnews-service-api/pom.xml
index 781643e72c..292de831fd 100644
--- a/server/wfnews-api/wfnews-service-api/pom.xml
+++ b/server/wfnews-api/wfnews-service-api/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>ca.bc.gov.nrs.wfim</groupId>
       <artifactId>wfim-incidents-api-rest-common</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <version>1.9.5-SNAPSHOT</version>
     </dependency>
   	 <dependency>
 			<groupId>org.postgresql</groupId>
diff --git a/server/wfone-notifications-api/wfone-notifications-quartz-scheduler/pom.xml b/server/wfone-notifications-api/wfone-notifications-quartz-scheduler/pom.xml
index 9f36334f87..5bd4be824d 100644
--- a/server/wfone-notifications-api/wfone-notifications-quartz-scheduler/pom.xml
+++ b/server/wfone-notifications-api/wfone-notifications-quartz-scheduler/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>ca.bc.gov.nrs.wfim</groupId>
       <artifactId>wfim-incidents-api-rest-common</artifactId>
-      <version>1.6.1</version>
+      <version>1.9.5-SNAPSHOT</version>
     </dependency>
 
 	</dependencies>
diff --git a/server/wfone-notifications-api/wfone-notifications-service-api/pom.xml b/server/wfone-notifications-api/wfone-notifications-service-api/pom.xml
index e2ee41e4de..7ae27129dd 100644
--- a/server/wfone-notifications-api/wfone-notifications-service-api/pom.xml
+++ b/server/wfone-notifications-api/wfone-notifications-service-api/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>ca.bc.gov.nrs.wfim</groupId>
 			<artifactId>wfim-incidents-api-rest-common</artifactId>
-			<version>1.6.1</version>
+			<version>1.9.5-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/server/wfone-notifications-api/wfone-notifications-service-api/src/main/java/ca/bc/gov/nrs/wfone/service/api/v1/impl/RecordRoFServiceImpl.java b/server/wfone-notifications-api/wfone-notifications-service-api/src/main/java/ca/bc/gov/nrs/wfone/service/api/v1/impl/RecordRoFServiceImpl.java
index 4e04486781..99f2b86488 100644
--- a/server/wfone-notifications-api/wfone-notifications-service-api/src/main/java/ca/bc/gov/nrs/wfone/service/api/v1/impl/RecordRoFServiceImpl.java
+++ b/server/wfone-notifications-api/wfone-notifications-service-api/src/main/java/ca/bc/gov/nrs/wfone/service/api/v1/impl/RecordRoFServiceImpl.java
@@ -116,11 +116,6 @@ public class RecordRoFServiceImpl implements RecordRoFService {
 	EmailNotificationService emailNotificationService;
 
 	private Date codeTableRefresh;
-	private String visibleFlameString = "Visible Flames = Yes; ";
-	private String noVisibleFlameString = "Visible Flames = No; ";
-	private String noCommentVisibleFlameString = "Visible Flames = N/C; ";
-	private String noCommentString = "No comments";
-
 	private Properties applicationProperties;
 	private RoFFormDao rofFormDao;
 	private RoFImageDao rofImageDao;
@@ -575,25 +570,18 @@ private String prepareRoF(JSONObject rofFormDataJson, ObjectMapper mapper)
 			rof.setSubmittedTimestamp(Date.from(submittedDateTime.atZone(ZoneId.systemDefault()).toInstant()));
 		}
 
-		// set default visible flame string as No Comment
-		String visibleFlame = noCommentVisibleFlameString;
-
-		if (rofFormDataJson.has("visibleFlame") && rofFormDataJson.optJSONArray("visibleFlame") != null) {
-			if (rofFormDataJson.optJSONArray("visibleFlame").isEmpty()) {
-				visibleFlame = noCommentVisibleFlameString;
-			} else if (rofFormDataJson.getJSONArray("visibleFlame").toString().replace("[", "").replace("]", "")
-					.replace("\"", "").equalsIgnoreCase("YES")) {
-				visibleFlame = visibleFlameString;
-			} else if (rofFormDataJson.getJSONArray("visibleFlame").toString().replace("[", "").replace("]", "")
-					.replace("\"", "").equalsIgnoreCase("NO")) {
-				visibleFlame = noVisibleFlameString;
-			}
-		}
+		Boolean visibleFlame = rofFormDataJson.has("visibleFlame")
+				&& rofFormDataJson.optJSONArray("visibleFlame") != null
+				&& rofFormDataJson.getJSONArray("visibleFlame").toString()
+					.replace("[", "").replace("]", "")
+					.replace("\"", "")
+				.equalsIgnoreCase("YES");
+		rof.setFlamesVisibleInd(visibleFlame);
 
-		if (rofFormDataJson.has("otherInfo") && !rofFormDataJson.optString("otherInfo", "").equals(""))
-			rof.setCallerReportDetails(visibleFlame + rofFormDataJson.optString("otherInfo"));
-		else if (rofFormDataJson.has("otherInfo") && rofFormDataJson.optString("otherInfo", "").equals(""))
-			rof.setCallerReportDetails(visibleFlame + noCommentString);
+
+		if (rofFormDataJson.has("otherInfo") && !rofFormDataJson.optString("otherInfo", "").isEmpty()) {
+			rof.setCallerReportDetails(rofFormDataJson.optString("otherInfo"));
+		}
 
 		logger.info(" ### START POST - Serializing and executing RoF POST...");
 		mapper.activateDefaultTyping(mapper.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.JAVA_LANG_OBJECT,