From 4622b4524245f15b066ca22a2a42596cdf755f5b Mon Sep 17 00:00:00 2001
From: Deepak Dixit <deepak.dixit@hotwax.co>
Date: Thu, 1 Aug 2024 14:58:55 +0530
Subject: [PATCH] Used oms-rest service runner to call the OMS rest api. Also
 reduced service transaction timeout from 3600 tp 120

---
 service/co/hotwax/common/CommonServices.xml   | 11 ++----
 .../routing/InventoryReservationServices.xml  | 35 +------------------
 .../order/routing/OrderRoutingServices.xml    |  2 +-
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/service/co/hotwax/common/CommonServices.xml b/service/co/hotwax/common/CommonServices.xml
index c4477f8..0346e1b 100644
--- a/service/co/hotwax/common/CommonServices.xml
+++ b/service/co/hotwax/common/CommonServices.xml
@@ -3,16 +3,9 @@
 
     <service verb="check" noun="OmsConnection">
         <actions>
-            <script>
-                omsBaseUrl = co.hotwax.util.MaargUtil.getOmsInstanceUrl(ec.ecfi);
-            </script>
+            <set field="omsBaseUrl" from="co.hotwax.util.MaargUtil.getOmsInstanceUrl(ec.ecfi)"/>
             <if condition="!omsBaseUrl">
-                <entity-find-one entity-name="moqui.service.message.SystemMessageRemote" value-field="omsSystemMessageRemote">
-                    <field-map field-name="systemMessageRemoteId" value="HC_OMS_CONFIG"/>
-                </entity-find-one>
-                <if condition="!omsSystemMessageRemote || !omsSystemMessageRemote.remotePublicKey">
-                    <return error="true" message="OMS token not configured." />
-                </if>
+                <return error="true" message="OMS instance not configured." />
             </if>
         </actions>
     </service>
diff --git a/service/co/hotwax/order/routing/InventoryReservationServices.xml b/service/co/hotwax/order/routing/InventoryReservationServices.xml
index 583938e..261850e 100644
--- a/service/co/hotwax/order/routing/InventoryReservationServices.xml
+++ b/service/co/hotwax/order/routing/InventoryReservationServices.xml
@@ -1,43 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://moqui.org/xsd/service-definition-3.xsd">
 
-    <service verb="run" noun="OmsApi" type="interface">
-        <in-parameters>
-            <parameter name="token"/>
-            <parameter name="omsBaseUrl"/>
-        </in-parameters>
-    </service>
-    <service  verb="run" noun="OmsFacilityAllocation" type="remote-rest" location="${omsBaseUrl}/api/service/orderFulfillmentAllocation?token=${token}" method="post" transaction-timeout="3600">
-        <implements service="co.hotwax.order.routing.InventoryReservationServices.run#OmsApi"/>
+    <service  verb="run" noun="FacilityAllocation" type="oms-rest" location="service/orderFulfillmentAllocation" method="post" transaction-timeout="120">
         <in-parameters>
             <parameter name="facilityAllocation" type="List"/>
             <parameter name="orderId"/>
         </in-parameters>
     </service>
-    <service verb="run" noun="FacilityAllocation" transaction-timeout="3600">
-        <in-parameters>
-            <parameter name="facilityAllocation" type="List" required="true"/>
-            <parameter name="orderId" required="true"/>
-        </in-parameters>
-        <out-parameters>
-            <parameter name="result"/>
-        </out-parameters>
-        <actions>
-            <!-- In case of schedule job run no user logged in, use system user to get the token-->
-            <set field="userName" from="ec.user.username" default-value="${System.getProperty('default.brokering.user')}"/>
-            <script>
-                omsBaseUrl = co.hotwax.util.MaargUtil.getOmsInstanceUrl(ec.ecfi);
-                token = co.hotwax.util.MaargUtil.getOmsJwtToken(ec.ecfi, userName);
-            </script>
-            <if condition="!token">
-                <return error="true" message="Unable to generate oms token, check JWT configuration"/>
-            </if>
-            <if condition="!omsBaseUrl">
-                <return error="true" message="OMS base url not found"/>
-            </if>
-            <service-call name="co.hotwax.order.routing.InventoryReservationServices.run#OmsFacilityAllocation" transaction-timeout="3600"
-                           in-map="[orderId: orderId, token: token, facilityAllocation: facilityAllocation]" transaction="force-new"
-                           out-map="result"/>
-        </actions>
-    </service>
 </services>
\ No newline at end of file
diff --git a/service/co/hotwax/order/routing/OrderRoutingServices.xml b/service/co/hotwax/order/routing/OrderRoutingServices.xml
index 7721bbc..4b494c6 100644
--- a/service/co/hotwax/order/routing/OrderRoutingServices.xml
+++ b/service/co/hotwax/order/routing/OrderRoutingServices.xml
@@ -542,7 +542,7 @@
                 <script>
                     try {
                         outResult = ec.service.sync().name("co.hotwax.order.routing.InventoryReservationServices.run#FacilityAllocation")
-                                .requireNewTransaction(true).transactionTimeout(3600)
+                                .requireNewTransaction(true).transactionTimeout(120)
                                 .parameters([orderId: orderId, facilityAllocation: facilityAllocation])
                                 .call()
                         if (ec.message.hasError()) {