From 4670cc5f607995de843d179290391b8a828adbda Mon Sep 17 00:00:00 2001
From: Nutan Shinde <112821431+Shinde-nutan@users.noreply.github.com>
Date: Fri, 21 Feb 2025 21:03:00 +0530
Subject: [PATCH] added upgrade data

---
 data/SystemMessageData.xml                   |  1 -
 data/Upgrade_upcomming.xml                   | 26 ++++++++++++++++++++
 service/co/hotwax/netsuite/OrderServices.xml |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 data/Upgrade_upcomming.xml

diff --git a/data/SystemMessageData.xml b/data/SystemMessageData.xml
index 049b83a..fe8071d 100644
--- a/data/SystemMessageData.xml
+++ b/data/SystemMessageData.xml
@@ -84,7 +84,6 @@
       sendServiceName="co.hotwax.ofbiz.SystemMessageServices.send#SystemMessageFileSftp"/>
 
      <!-- Enumeration to create relation between FulfilledOrderItemsFeedNetsuiteToHotwax and SendFulfilledOrderItemsFeed SystemMessageType(s) -->
-     <moqui.basic.EnumerationType description="Netsuite System message Type" enumTypeId="NetsuiteMessageTypeEnum"/>
      <moqui.basic.Enumeration description="Send fulfilledOrderItem Feed" enumId="SendFulfilledOrderItemsFeed" enumTypeId="NetsuiteMessageTypeEnum"/>
      <moqui.basic.Enumeration description="Product Updates Feed" enumId="FulfilledOrderItemsFeedNetsuiteToHotwax" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendFulfilledOrderItemsFeed" relatedEnumTypeId="NetsuiteMessageTypeEnum"/>
 
diff --git a/data/Upgrade_upcomming.xml b/data/Upgrade_upcomming.xml
new file mode 100644
index 0000000..28e979b
--- /dev/null
+++ b/data/Upgrade_upcomming.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-facade-xml type="ext-upgrade">
+    <moqui.service.message.SystemMessageType systemMessageTypeId="FulfilledOrderItemsFeedNetsuiteToHotwax"
+        description="Fetch Fulfilled Order Items feed Netsuite to Hotwax"
+        parentTypeId="LocalFeedFile"
+        receiveResponseEnumId="MsgRrMove"
+        sendPath="${contentRoot}/Netsuite/FulfilledOrderItems"
+        receivePath="/home/${sftpUsername}/netsuite/salesorder/import/fulfillment-nifi"
+        receiveMovePath="/home/${sftpUsername}/netsuite/salesorder/import/fulfillment-nifi/archive"
+        consumeServiceName="co.hotwax.netsuite.OrderServices.consume#FulfilledOrderItemFeed">
+        <parameters parameterName="sendSmrId" parameterValue="RemoteSftp" systemMessageRemoteId=""/>
+        </moqui.service.message.SystemMessageType>
+
+        <moqui.service.message.SystemMessageType systemMessageTypeId="SendFulfilledOrderItemsFeed"
+        description="Send Fulfilled Order Items feed Netsuite to Hotwax"
+        parentTypeId="LocalFeedFile"
+        receivePath="${contentRoot}/Netsuite/Fulfillment/fulfilledOrderItemFeed-${dateTime}.json"
+        sendPath="/home/${sftpUsername}/netsuite/salesorder/import/fulfillment/FulfilledOrderItemsFeed-${systemMessageId}-${dateTime}.json"
+        sendServiceName="co.hotwax.ofbiz.SystemMessageServices.send#SystemMessageFileSftp"/>
+
+        <!-- Enumeration to create relation between FulfilledOrderItemsFeedNetsuiteToHotwax and SendFulfilledOrderItemsFeed SystemMessageType(s) -->
+        <moqui.basic.EnumerationType description="Netsuite System message Type" enumTypeId="NetsuiteMessageTypeEnum"/>
+        <moqui.basic.Enumeration description="Send fulfilledOrderItem Feed" enumId="SendFulfilledOrderItemsFeed" enumTypeId="NetsuiteMessageTypeEnum"/>
+        <moqui.basic.Enumeration description="Product Updates Feed" enumId="FulfilledOrderItemsFeedNetsuiteToHotwax" enumTypeId="ShopifyMessageTypeEnum" relatedEnumId="SendFulfilledOrderItemsFeed" relatedEnumTypeId="NetsuiteMessageTypeEnum"/>
+
+</entity-facade-xml>
\ No newline at end of file
diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index 04d47c9..0f049a6 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -674,7 +674,7 @@
             </if>
 
             <return message="Created the fulfilledOrderItems Feed file at time ${ec.user.nowTimestamp} with type ${relatedSystemMessageType.systemMessageTypeId}
-                and remote ${sendSmrId} saved response in messages ${queueSystemMessageOut.systemMessageId}"/>
+                and remote ${sendSmrId} saved response in messages ${queueSystemMessageOut?.systemMessageId}"/>
         </actions>
     </service>
 </services>
\ No newline at end of file