From b99c01b23870022771ec0fee6126d58424f069dc Mon Sep 17 00:00:00 2001
From: Deepak Dixit <deepak.dixit@hotwax.co>
Date: Mon, 29 Jul 2024 17:14:51 +0530
Subject: [PATCH] Return brokered order item count and attempted order count in
 routing group run success message

---
 .../OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml   | 2 +-
 service/co/hotwax/order/routing/OrderRoutingServices.xml | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml b/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
index 16dc615..f47249f 100644
--- a/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
+++ b/screen/OrderRoutingGroup/OrderRoutingGroupRuns/OrderRoutingGroupRunList.xml
@@ -75,7 +75,7 @@
                 <default-field><display/></default-field>
             </field>
             <field name="message">
-                <default-field><display text="${errors?:messages}"/></default-field>
+                <default-field><display text="${errors?:messages?: ''}"/></default-field>
             </field>
             <field name="findButton">
                 <header-field title="Find"><submit/></header-field><default-field>
diff --git a/service/co/hotwax/order/routing/OrderRoutingServices.xml b/service/co/hotwax/order/routing/OrderRoutingServices.xml
index 19a9789..abff600 100644
--- a/service/co/hotwax/order/routing/OrderRoutingServices.xml
+++ b/service/co/hotwax/order/routing/OrderRoutingServices.xml
@@ -124,13 +124,16 @@
             <if condition="!orderRoutings">
                 <return type="warning" message="No order routing configuration found for the specified routing group ${orderRoutingGroup.groupName} [${routingGroupId}]."/>
             </if>
+            <set field="groupItemCount" value="0" type="Long"/>
+            <set field="groupBrokeredItemCount"  value="0" type="Long"/>
             <log message="Started order routing for ${orderRoutingGroup.groupName} [${routingGroupId}] routing group."/>
             <iterate list="orderRoutings" entry="orderRouting">
                 <service-call name="create#co.hotwax.order.routing.OrderRoutingRun" transaction="force-new" ignore-error="true"
                         in-map="[routingGroupId:routingGroupId, orderRoutingId: orderRouting.orderRoutingId,
                                 productStoreId: productStoreId, startDate:ec.user.nowTimestamp]"
                         out-map="routingRunResult"/>
-                <set field="attemptedItemCount" type="Long"/>
+                <set field="attemptedItemCount" value="0" type="Long"/>
+                <set field="brokeredItemCount" value="0" type="Long"/>
                 <script>
                    /*
                         Calling a service in a script with ignore-error="true".
@@ -145,6 +148,8 @@
                                 .call()
                         attemptedItemCount = orderRoutingResult.attemptedItemCount
                         brokeredItemCount = orderRoutingResult.brokeredItemCount
+                        groupItemCount += attemptedItemCount
+                        groupBrokeredItemCount +=brokeredItemCount
                     } catch (Throwable e) {
                         ec.logger.error("There is an issue with run#OrderRouting", e)
                     }
@@ -167,7 +172,7 @@
                                 endDate:ec.user.nowTimestamp, orderItemCount: attemptedItemCount, brokeredItemCount: brokeredItemCount]"
                         out-map="routingRunResult"/>
             </iterate>
-            <message type="success">Finished order routing for ${orderRoutingGroup.groupName} [${routingGroupId}] routing group.</message>
+            <message type="success">Finished order routing for the ${orderRoutingGroup.groupName} routing group with an attempted order item count of ${attemptedItemCount} and a brokered item count of ${groupBrokeredItemCount}</message>
         </actions>
     </service>