From 6c6f010167b5dcfdcb235a9ceb3c0b72cd2a3baa Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Tue, 10 Dec 2024 12:34:01 +0530
Subject: [PATCH 1/2] Done the following: 1. Updated the
 send#ShopifyFulfillmentSystemMessage to send the shipment map as in from the
 polled feed file. 2. Updated create#Fulfillment service to not preapre the
 aggregated limne items map as now the feed will have the sum of quantities
 for the given item. 3. Updated the generate#ShopifyFulfillmentAckFeed to
 prepare the map at shipment level and not item level.

---
 .../ShopifyFulfillmentServices.xml            | 22 ++++---------------
 .../system/ShopifySystemMessageServices.xml   | 19 +++-------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml b/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
index 85ddeb4..6a89463 100644
--- a/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
+++ b/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
@@ -64,18 +64,6 @@ under the License.
         <actions>
             <service-call name="co.hotwax.shopify.fulfillment.ShopifyFulfillmentServices.get#FulfillmentOrders" in-map="[shopifyOrderId:shopifyOrderId, systemMessageRemoteId:systemMessageRemoteId]" out-map="context"/>
 
-            <set field="aggregatedLineItemMap" from="[:]"/>
-            <iterate list="lineItems" entry="lineItem">
-                <if condition="aggregatedLineItemMap.get(lineItem.shopifyLineItemId) == null">
-                    <then>
-                        <script>aggregatedLineItemMap.put(lineItem.shopifyLineItemId, lineItem.quantity)</script>
-                    </then>
-                    <else>
-                        <script>aggregatedLineItemMap.put(lineItem.shopifyLineItemId, aggregatedLineItemMap.get(lineItem.shopifyLineItemId) + lineItem.quantity)</script>
-                    </else>
-                </if>
-            </iterate>
-
             <set field="lineItemsMapById" from="[:]"/>
             <iterate list="fulfillmentOrders" entry="fulfillmentOrder">
                 <set field="fulfillmentOrderLineItems" from="fulfillmentOrder.line_items"/>
@@ -86,10 +74,10 @@ under the License.
             </iterate>
 
             <set field="fulfillmentItemsByFulfillmentOrderId" from="[:]"/>
-            <iterate list="aggregatedLineItemMap" entry="quantity" key="shopifyLineItemId">
-                <set field="lineItemMap" from="lineItemsMapById.get(shopifyLineItemId)"/>
+            <iterate list="lineItems" entry="lineItem">
+                <set field="lineItemMap" from="lineItemsMapById.get(lineItem.shopifyLineItemId)"/>
                 <script>
-                    org.moqui.util.CollectionUtilities.addToListInMap(lineItemMap.fulfillment_order_id, ["id": lineItemMap.id, "quantity": quantity], fulfillmentItemsByFulfillmentOrderId)
+                    org.moqui.util.CollectionUtilities.addToListInMap(lineItemMap.fulfillment_order_id, ["id": lineItemMap.id, "quantity": lineItemMap.quantity], fulfillmentItemsByFulfillmentOrderId)
                 </script>
             </iterate>
 
@@ -184,14 +172,12 @@ under the License.
 
             <iterate list="systemMessageList" entry="systemMessage">
                 <set field="shipment" from="org.moqui.impl.context.ContextJavaUtil.jacksonMapper.readValue(systemMessage.messageText, Map.class)"/>
-                <iterate list="shipment.shipmentItems" entry="shipmentItem">
-                    <set field="shopifyFulfillmentAckMap" from="[shipmentId:shipmentItem.shipmentId, orderId:shipmentItem.orderId, orderItemSeqId: shipmentItem.orderItemSeqId, externalFulfillmentId: systemMessage.remoteMessageId]"/>
+                    <set field="shopifyFulfillmentAckMap" from="[shipmentId:shipment.shipmentId, primaryOrderId:shipment.orderId, externalId: systemMessage.remoteMessageId]"/>
                     <script>
                         new ObjectMapper()
                         .setDateFormat(new java.text.SimpleDateFormat(System.getProperty('default_date_time_format')))
                         .writerWithDefaultPrettyPrinter().writeValue(jGenerator, shopifyFulfillmentAckMap)
                     </script>
-                </iterate>
             </iterate>
             <script>
                         jGenerator.writeEndArray()
diff --git a/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml b/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
index b889408..1f2d34d 100644
--- a/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
+++ b/service/co/hotwax/shopify/system/ShopifySystemMessageServices.xml
@@ -65,23 +65,10 @@ under the License.
             </entity-find-one>
 
             <set field="shipment" from="org.moqui.impl.context.ContextJavaUtil.jacksonMapper.readValue(systemMessage.messageText, Map.class)"/>
-            <set field="lineItems" from="[]"/>
-            <iterate list="shipment.shipmentItems" entry="shipmentItem">
-                <set field="lineItem" from="[:]"/>
-                <set field="lineItem.shopifyLineItemId" from="shipmentItem.shopifyOrderLineId"/>
-                <set field="lineItem.quantity" from="shipmentItem.quantity"/>
-                <script>lineItems.add(lineItem)</script>
-            </iterate>
 
-            <set field="fulfillmentContext" from="[:]"/>
-            <set field="fulfillmentContext.lineItems" from="lineItems"/>
-            <set field="fulfillmentContext.shopifyOrderId" from="shipment.shopifyOrderId"/>
-            <set field="fulfillmentContext.trackingNumber" from="shipment.trackingNumber"/>
-            <set field="fulfillmentContext.trackingUrl" from="shipment.trackingUrl"/>
-            <set field="fulfillmentContext.carrier" from="shipment.carrierPartyId"/>
-            <set field="fulfillmentContext.notifyCustomer" from="shipment.notifyCustomer"/>
-            <set field="fulfillmentContext.systemMessageRemoteId" from="systemMessage.systemMessageRemoteId"/>
-            <service-call name="co.hotwax.shopify.fulfillment.ShopifyFulfillmentServices.create#Fulfillment" in-map="fulfillmentContext" out-map="outMap"/>
+            <set field="shipment.systemMessageRemoteId" from="systemMessage.systemMessageRemoteId"/>
+
+            <service-call name="co.hotwax.shopify.fulfillment.ShopifyFulfillmentServices.create#Fulfillment" in-map="shipment" out-map="outMap"/>
 
             <set field="remoteMessageId" from="outMap.shopifyFulfillmentId"/>
         </actions>

From 5505ee793f489c9f4ea22c4c7dbc1158f01c0687 Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Mon, 16 Dec 2024 18:34:12 +0530
Subject: [PATCH 2/2] reverted the changes for aggregating the shopify order
 line items

---
 .../fulfillment/ShopifyFulfillmentServices.xml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml b/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
index 6a89463..21a6a12 100644
--- a/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
+++ b/service/co/hotwax/shopify/fulfillment/ShopifyFulfillmentServices.xml
@@ -64,6 +64,18 @@ under the License.
         <actions>
             <service-call name="co.hotwax.shopify.fulfillment.ShopifyFulfillmentServices.get#FulfillmentOrders" in-map="[shopifyOrderId:shopifyOrderId, systemMessageRemoteId:systemMessageRemoteId]" out-map="context"/>
 
+            <set field="aggregatedLineItemMap" from="[:]"/>
+            <iterate list="lineItems" entry="lineItem">
+                <if condition="aggregatedLineItemMap.get(lineItem.shopifyLineItemId) == null">
+                    <then>
+                        <script>aggregatedLineItemMap.put(lineItem.shopifyLineItemId, lineItem.quantity)</script>
+                    </then>
+                    <else>
+                        <script>aggregatedLineItemMap.put(lineItem.shopifyLineItemId, aggregatedLineItemMap.get(lineItem.shopifyLineItemId) + lineItem.quantity)</script>
+                    </else>
+                </if>
+            </iterate>
+
             <set field="lineItemsMapById" from="[:]"/>
             <iterate list="fulfillmentOrders" entry="fulfillmentOrder">
                 <set field="fulfillmentOrderLineItems" from="fulfillmentOrder.line_items"/>
@@ -74,10 +86,10 @@ under the License.
             </iterate>
 
             <set field="fulfillmentItemsByFulfillmentOrderId" from="[:]"/>
-            <iterate list="lineItems" entry="lineItem">
-                <set field="lineItemMap" from="lineItemsMapById.get(lineItem.shopifyLineItemId)"/>
+            <iterate list="aggregatedLineItemMap" entry="quantity" key="shopifyLineItemId">
+                <set field="lineItemMap" from="lineItemsMapById.get(shopifyLineItemId)"/>
                 <script>
-                    org.moqui.util.CollectionUtilities.addToListInMap(lineItemMap.fulfillment_order_id, ["id": lineItemMap.id, "quantity": lineItemMap.quantity], fulfillmentItemsByFulfillmentOrderId)
+                    org.moqui.util.CollectionUtilities.addToListInMap(lineItemMap.fulfillment_order_id, ["id": lineItemMap.id, "quantity": quantity], fulfillmentItemsByFulfillmentOrderId)
                 </script>
             </iterate>