From de79a7d39e5de773215b95b5c02f0af52ea304a9 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Tue, 28 May 2024 12:10:55 +0530
Subject: [PATCH] Fixed: Corrected condition to upload csv file to ftp after
 successful execution of atp rules. Also improved few messages for better
 understanding. Added 'ATP' prefix in the job name. (#1)

---
 service/co/hotwax/product/ProductFacilityServices.xml | 6 ++++--
 service/co/hotwax/rule/DecisionRuleServices.xml       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/service/co/hotwax/product/ProductFacilityServices.xml b/service/co/hotwax/product/ProductFacilityServices.xml
index 0a995d5..50171dc 100644
--- a/service/co/hotwax/product/ProductFacilityServices.xml
+++ b/service/co/hotwax/product/ProductFacilityServices.xml
@@ -100,7 +100,9 @@
             <script>
                 kieSession.dispose();
             </script>
-            <if condition="!productFacilityDetail.values()">
+
+            <!--If no products fall under any rule, no CSV will be created, and there will be no need to attempt to upload it to FTP.-->
+            <if condition="!csvFilePath">
                 <return message="No products falls under any rule in this rule group."/>
             </if>
 
@@ -108,7 +110,7 @@
                     in-map="[filePath: csvFilePath, systemMessageRemoteId: systemMessageRemoteId]"
                     out-map="result"/>
 
-            <log message="Product facility rules executed successfully for rule group [${ruleGroupId}]."/>
+            <return message="Product facility rules executed successfully for rule group [${ruleGroupId}]."/>
         </actions>
     </service>
     <service verb="prepare" noun="ProductFacilityCsv" authenticate="false" transaction-timeout="7200">
diff --git a/service/co/hotwax/rule/DecisionRuleServices.xml b/service/co/hotwax/rule/DecisionRuleServices.xml
index 03d8b47..8c65753 100644
--- a/service/co/hotwax/rule/DecisionRuleServices.xml
+++ b/service/co/hotwax/rule/DecisionRuleServices.xml
@@ -110,7 +110,7 @@
                     in-map="[ruleGroupRunId:ruleGroupResult.ruleGroupRunId, ruleGroupRunResult:ruleGroupRunResult, hasError:hasError, endDate:ec.user.nowTimestamp]"
                     out-map="ruleGroupResult"/>
 
-            <message type="success">Finished rule group execution for ${ruleGroup.groupName} [${ruleGroupId}] rule group.</message>
+            <message type="success">Finished rule group execution for rule group [${ruleGroupId}].</message>
         </actions>
     </service>
 
@@ -196,7 +196,7 @@
                 <if condition="!paused">
                     <set field="paused" value="N"/>
                 </if>
-                <set field="jobName" value="Rule_Group_${ruleGroup.ruleGroupId}"/>
+                <set field="jobName" value="ATP_Rule_Group_${ruleGroup.ruleGroupId}"/>
                 <service-call name="create#moqui.service.job.ServiceJob" in-map="context + [jobName: jobName]" out-map="context"/>
                 <!-- Set the JobName in RuleGroup entity -->
                 <set field="ruleGroup.jobName" from="jobName"/>