From 157f8ec5efa07d5f6fa4dac98d027b77945f3357 Mon Sep 17 00:00:00 2001
From: Deepak Dixit <deepak.dixit@hotwax.co>
Date: Fri, 30 Aug 2024 18:25:29 +0530
Subject: [PATCH] Used oms-rest and removed the old pattern to call the oms api

---
 service/co/hotwax/common/CommonServices.xml | 57 ++++++---------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/service/co/hotwax/common/CommonServices.xml b/service/co/hotwax/common/CommonServices.xml
index 8877649..7d305e9 100644
--- a/service/co/hotwax/common/CommonServices.xml
+++ b/service/co/hotwax/common/CommonServices.xml
@@ -1,51 +1,28 @@
 <?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">
+    <service verb="autoComplete" noun="SolrFacet" type="oms-rest" location="AutoCompleteSolrFacet" method="post">
         <in-parameters>
-            <parameter name="token"/>
-            <parameter name="omsBaseUrl"/>
+            <parameter name="facetToSelect"/>
+            <parameter name="coreName"/>
+            <parameter name="docType"/>
+            <parameter name="searchfield"/>
+            <parameter name="jsonQuery"/>
+            <parameter name="noConditionFind"/>
+            <parameter name="limit"/>
+            <parameter name="q"/>
+            <parameter name="term"/>
+            <parameter name="offset"/>
         </in-parameters>
+        <out-parameters>
+            <parameter name="response"/>
+        </out-parameters>
     </service>
-    <service verb="autoComplete" noun="OmsSolrFacetApi" type="interface">
+    <service verb="solr" noun="Query" type="oms-rest" location="solr-query" method="post">
         <in-parameters>
-            <parameter name="facetToSelect" type="String"/>
-            <parameter name="coreName" type="String"/>
-            <parameter name="docType" type="String"/>
-            <parameter name="searchfield" type="String"/>
-            <parameter name="jsonQuery" type="String"/>
-            <parameter name="noConditionFind" type="String"/>
-            <parameter name="limit" type="String"/>
-            <parameter name="q" type="String"/>
-            <parameter name="term" type="String"/>
-            <parameter name="offset" type="String"/>
+            <parameter name="json" type="Map"/>
         </in-parameters>
         <out-parameters>
-            <parameter name="facetResponse"/>
+            <parameter name="response" type="Map"/>
         </out-parameters>
     </service>
-    <service  verb="autoComplete" noun="OmsSolrFacet" type="remote-rest" location="${omsBaseUrl}/api/AutoCompleteSolrFacet?token=${token}" method="post" transaction-timeout="3600">
-        <implements service="co.hotwax.common.CommonServices.run#OmsApi"/>
-        <implements service="co.hotwax.common.CommonServices.autoComplete#OmsSolrFacetApi"/>
-    </service>
-    <service verb="autoComplete" noun="SolrFacet" transaction-timeout="3600">
-        <implements service="co.hotwax.common.CommonServices.autoComplete#OmsSolrFacetApi"/>
-        <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.oms.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.common.CommonServices.autoComplete#OmsSolrFacet" transaction-timeout="3600"
-                          in-map="context + [omsBaseUrl: omsBaseUrl, token: token]" transaction="force-new"
-                          out-map="facetResponse"/>
-        </actions>
-    </service>
-
 </services>
\ No newline at end of file