From 1570189a87aba47ffdd4b6aad1b895702929cc63 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Mon, 3 Feb 2025 20:48:03 +0530
Subject: [PATCH 1/6] Added job to poll the fulfilled order items file from
 sftp and written a consume service to convert csv file to json and transform
 it.

---
 data/ServiceJobData.xml                      |  9 ++++
 data/SystemMessageData.xml                   | 10 ++++
 service/co/hotwax/netsuite/OrderServices.xml | 50 ++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/data/ServiceJobData.xml b/data/ServiceJobData.xml
index 0141ae3..7ffa6f7 100644
--- a/data/ServiceJobData.xml
+++ b/data/ServiceJobData.xml
@@ -29,4 +29,13 @@
         <parameters parameterName="systemMessageRemoteId" parameterValue=""/>
         <parameters parameterName="partyId" parameterValue=""/>
     </moqui.service.job.ServiceJob>
+
+    <!-- ServiceJob data for polling csv file from sftp location -->
+    <moqui.service.job.ServiceJob jobName="poll_fulfilledItemsNetsuiteToHotwax"
+            description="Poll Csv file from sftp location of fulfilled order items feed netsuite to hotwax"
+            serviceName="co.hotwax.ofbiz.SystemMessageServices.poll#SystemMessageFileSftp" cronExpression="0 0 * * * ?" paused="Y">
+        <parameters parameterName="systemMessageTypeId" parameterValue="FulfilledOrderItemsFeedNetsuiteToHotwax"/>
+        <parameters parameterName="systemMessageRemoteId" parameterValue="RemoteSftp"/>
+    </moqui.service.job.ServiceJob>
+
 </entity-facade-xml>
\ No newline at end of file
diff --git a/data/SystemMessageData.xml b/data/SystemMessageData.xml
index aa4da0d..a34d81b 100644
--- a/data/SystemMessageData.xml
+++ b/data/SystemMessageData.xml
@@ -40,4 +40,14 @@
     <moqui.service.message.SystemMessageTypeParameter systemMessageTypeId="CreateNetsuiteCustomerFeed"
        parameterName="resourcePath" parameterValue="" systemMessageRemoteId=""/>
 
+    <moqui.service.message.SystemMessageType systemMessageTypeId="FulfilledOrderItemsFeedNetsuiteToHotwax"
+       description="Generate 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"
+    />
+
 </entity-facade-xml>
diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index 1603a3a..dfd9b9a 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -476,4 +476,54 @@
             <set field="orderMapDetail" from="processedOrderMap"/>
         </actions>
     </service>
+    <service verb="consume" noun="FulfilledOrderItemFeed" authenticate="anonymous-all">
+        <implements service="org.moqui.impl.SystemMessageServices.consume#SystemMessage"/>
+        <actions>
+            <entity-find-one entity-name="moqui.service.message.SystemMessage" value-field="systemMessage"/>
+
+            <if condition="!systemMessage.messageText">
+                <return type="warning" message="System message [${systemMessageId}] for Type ${systemMessage?.systemMessageTypeId} has no message text, not consuming."/>
+            </if>
+            <script><![CDATA[
+            import groovy.json.JsonOutput
+            import org.apache.commons.csv.*
+
+            def reader = new BufferedReader(new StringReader(ec.resource.getLocationReference(systemMessage.messageText).getText()))
+            def parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(reader)
+
+            def orderMap = [:]
+            for (record in parser.iterator()) {
+                def orderId = record.get("orderId")
+
+                def orderItem = [
+                    orderItemSeqId    : record.get("orderItemSeqId"),
+                    externalFacilityId: record.get("externalFacilityId"),
+                    shippedDate       : record.get("shippedDate") + ":00",
+                    quantity          : record.get("quantity"),
+                    trackingNumber    : record.get("trackingNumber") ?: "",
+                    "validation-result": "success"
+                ]
+
+                def carrierName = record.get("shiphawkCarrierName")?.trim()?.toLowerCase()?.replaceAll("\\s+", "_") ?: ""
+
+                if (!orderMap.containsKey(orderId)) {
+                    orderMap[orderId] = [
+                        orderId           : orderId,
+                        shipHawkShipmentId: record.get("shipHawkShipmentId") ?: "",
+                        shiphawkCarrierName: carrierName,
+                        items             : []
+                    ]
+                }
+                orderMap[orderId].items << orderItem
+            }
+            reader.close()
+            def jsonWriter = new StringWriter()
+            def jsonGen = new groovy.json.JsonBuilder(orderMap.collect { key, value -> [orderMap: value] })
+            jsonWriter << jsonGen.toPrettyString()
+
+            jsonResult = jsonWriter.toString()
+        ]]></script>
+        </actions>
+    </service>
+
 </services>
\ No newline at end of file

From c4e9f43e7db168291cda94615aeb9c79afbf16c8 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Tue, 4 Feb 2025 13:10:04 +0530
Subject: [PATCH 2/6] Generated the system message to sent the fulfilled order
 item transformed json file at sftp location

---
 data/SystemMessageData.xml                   |  19 ++-
 service/co/hotwax/netsuite/OrderServices.xml | 144 ++++++++++++++-----
 2 files changed, 126 insertions(+), 37 deletions(-)

diff --git a/data/SystemMessageData.xml b/data/SystemMessageData.xml
index a34d81b..9e04d42 100644
--- a/data/SystemMessageData.xml
+++ b/data/SystemMessageData.xml
@@ -41,13 +41,26 @@
        parameterName="resourcePath" parameterValue="" systemMessageRemoteId=""/>
 
     <moqui.service.message.SystemMessageType systemMessageTypeId="FulfilledOrderItemsFeedNetsuiteToHotwax"
-       description="Generate Fulfilled Order Items feed Netsuite to Hotwax"
+       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"
-    />
+       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>
diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index dfd9b9a..b4c4517 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -479,51 +479,127 @@
     <service verb="consume" noun="FulfilledOrderItemFeed" authenticate="anonymous-all">
         <implements service="org.moqui.impl.SystemMessageServices.consume#SystemMessage"/>
         <actions>
+            <!-- Fetch System Message -->
             <entity-find-one entity-name="moqui.service.message.SystemMessage" value-field="systemMessage"/>
 
             <if condition="!systemMessage.messageText">
                 <return type="warning" message="System message [${systemMessageId}] for Type ${systemMessage?.systemMessageTypeId} has no message text, not consuming."/>
             </if>
+
+            <entity-find-one entity-name="moqui.service.message.SystemMessageTypeParameter" value-field="sendSmrParam">
+                <field-map field-name="systemMessageTypeId" from="systemMessage.systemMessageTypeId"/>
+                <field-map field-name="parameterName" value="sendSmrId"/>
+            </entity-find-one>
+            <if condition="sendSmrParam">
+                <set field="sendSmrId" from="sendSmrParam.parameterValue"/>
+            </if>
+
+            <if condition="sendSmrId">
+                <!-- Find SystemMessageType related to systemMessage.systemMessageType to produce corresponding system message -->
+                <entity-find-one entity-name="moqui.basic.Enumeration" value-field="enumValue">
+                    <field-map field-name="enumId" from="systemMessage.systemMessageTypeId"/>
+                </entity-find-one>
+
+                <if condition="enumValue &amp;&amp; enumValue.relatedEnumId">
+                    <entity-find-one entity-name="moqui.service.message.SystemMessageType" value-field="relatedSystemMessageType">
+                        <field-map field-name="systemMessageTypeId" from="enumValue.relatedEnumId"/>
+                    </entity-find-one>
+                    <if condition="!relatedSystemMessageType"><log level="warn" message="Could not find SystemMessageType with ID ${enumValue.relatedEnumId}, not producing related system message."/></if>
+                    <else>
+                        <log level="warn" message="Related SystemMessageType to produce for ${systemMessage.systemMessageTypeId} not defined, not producing related system message."/>
+                    </else>
+                </if>
+                <else>
+                    <log level="warn" message="sendSmrId not defined for ${systemMessage.systemMessageTypeId} not defined, not producing related system message."/>
+                </else>
+            </if>
+
+            <!-- Prepare JSON File Path -->
+
+            <set field="jsonFilePathRef" from="ec.resource.expand(relatedSystemMessageType.receivePath, null,
+            [contentRoot: ec.user.getPreference('mantle.content.root') ?: 'dbresource://datamanager',
+             date: ec.l10n.format(nowDate, 'yyyy-MM-dd'),
+             dateTime: ec.l10n.format(nowDate, 'yyyy-MM-dd-HH-mm-ss-SSS')], false)"/>
+
+            <set field="jsonFilePath" from="ec.resource.getLocationReference(jsonFilePathRef).getUri().getPath()"/>
+
             <script><![CDATA[
-            import groovy.json.JsonOutput
+            import groovy.json.JsonGenerator
             import org.apache.commons.csv.*
+            import com.fasterxml.jackson.core.JsonFactory
+            import com.fasterxml.jackson.core.JsonGenerator
+            import com.fasterxml.jackson.databind.ObjectMapper
+
+            try {
+                // Prepare JSON file
+                File fulfilledOrderItemJsonFile = new File(jsonFilePath)
+                if (!fulfilledOrderItemJsonFile.parentFile.exists()) fulfilledOrderItemJsonFile.parentFile.mkdirs()
+
+                JsonFactory jsonFactory = new JsonFactory()
+
+                /* Use try-with-resources to automatically close PrintWriter & JsonGenerator */
+                try (PrintWriter pw = new PrintWriter(fulfilledOrderItemJsonFile, "UTF-8");
+                     JsonGenerator generator = jsonFactory.createGenerator(pw)) {
+
+                    generator.writeStartArray()
+
 
-            def reader = new BufferedReader(new StringReader(ec.resource.getLocationReference(systemMessage.messageText).getText()))
-            def parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(reader)
-
-            def orderMap = [:]
-            for (record in parser.iterator()) {
-                def orderId = record.get("orderId")
-
-                def orderItem = [
-                    orderItemSeqId    : record.get("orderItemSeqId"),
-                    externalFacilityId: record.get("externalFacilityId"),
-                    shippedDate       : record.get("shippedDate") + ":00",
-                    quantity          : record.get("quantity"),
-                    trackingNumber    : record.get("trackingNumber") ?: "",
-                    "validation-result": "success"
-                ]
-
-                def carrierName = record.get("shiphawkCarrierName")?.trim()?.toLowerCase()?.replaceAll("\\s+", "_") ?: ""
-
-                if (!orderMap.containsKey(orderId)) {
-                    orderMap[orderId] = [
-                        orderId           : orderId,
-                        shipHawkShipmentId: record.get("shipHawkShipmentId") ?: "",
-                        shiphawkCarrierName: carrierName,
-                        items             : []
-                    ]
+                    def reader = new BufferedReader(new StringReader(ec.resource.getLocationReference(systemMessage.messageText).getText()))
+                    def parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(reader)
+
+                    def orderMap = [:]
+
+                    for (record in parser.iterator()) {
+                        def orderId = record.get("orderId")
+
+                        def orderItem = [
+                            orderItemSeqId    : record.get("orderItemSeqId"),
+                            externalFacilityId: record.get("externalFacilityId"),
+                            shippedDate       : record.get("shippedDate") + ":00",
+                            quantity          : record.get("quantity"),
+                            trackingNumber    : record.get("trackingNumber") ?: "",
+                            "validation-result": "success"
+                        ]
+
+                        def carrierName = record.get("shiphawkCarrierName")?.trim()?.toLowerCase()?.replaceAll("\\s+", "_") ?: ""
+
+                        if (!orderMap.containsKey(orderId)) {
+                            orderMap[orderId] = [
+                                orderId           : orderId,
+                                shipHawkShipmentId: record.get("shipHawkShipmentId") ?: "",
+                                shiphawkCarrierName: carrierName,
+                                items             : []
+                            ]
+                        }
+                        orderMap[orderId].items << orderItem
+                    }
+
+                    reader.close()
+
+                    // Write each order as a separate object in the JSON array
+                    ObjectMapper mapper = new ObjectMapper()
+                    for (orderEntry in orderMap) {
+                        def orderJson = [orderMap: orderEntry.value]
+                        mapper.writerWithDefaultPrettyPrinter().writeValue(generator, orderJson)
+                    }
+
+                    generator.writeEndArray()
                 }
-                orderMap[orderId].items << orderItem
-            }
-            reader.close()
-            def jsonWriter = new StringWriter()
-            def jsonGen = new groovy.json.JsonBuilder(orderMap.collect { key, value -> [orderMap: value] })
-            jsonWriter << jsonGen.toPrettyString()
 
-            jsonResult = jsonWriter.toString()
+            } catch (IOException e) {
+                logger.error("Error preparing Fulfilled Order Item Feed JSON file", e)
+            }
         ]]></script>
+
+            <if condition="relatedSystemMessageType">
+                <service-call name="org.moqui.impl.SystemMessageServices.queue#SystemMessage"
+                    in-map="[systemMessageTypeId:relatedSystemMessageType.systemMessageTypeId, systemMessageRemoteId:sendSmrId,
+                        messageText:jsonFilePathRef, remoteMessageId: jsonFilePathRef.substring(jsonFilePathRef.lastIndexOf('/')+1), sendNow:true]"
+                    out-map="queueSystemMessageOut" ignore-error="true" transaction="force-new"/>
+            </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}"/>
         </actions>
     </service>
-
 </services>
\ No newline at end of file

From 504272929d95e273152e49e4298fbcb08a6df45b Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Tue, 4 Feb 2025 16:44:51 +0530
Subject: [PATCH 3/6] added the missing import

---
 service/co/hotwax/netsuite/OrderServices.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index b4c4517..1cc6f5b 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -515,20 +515,17 @@
             </if>
 
             <!-- Prepare JSON File Path -->
-
             <set field="jsonFilePathRef" from="ec.resource.expand(relatedSystemMessageType.receivePath, null,
-            [contentRoot: ec.user.getPreference('mantle.content.root') ?: 'dbresource://datamanager',
-             date: ec.l10n.format(nowDate, 'yyyy-MM-dd'),
-             dateTime: ec.l10n.format(nowDate, 'yyyy-MM-dd-HH-mm-ss-SSS')], false)"/>
-
+            [contentRoot: ec.user.getPreference('mantle.content.root') ?: 'dbresource://datamanager', date:ec.l10n.format(nowDate, 'yyyy-MM-dd'), dateTime:ec.l10n.format(nowDate, 'yyyy-MM-dd-HH-mm-ss-SSS'),
+             productStoreId:productStoreId], false)"/>
             <set field="jsonFilePath" from="ec.resource.getLocationReference(jsonFilePathRef).getUri().getPath()"/>
 
             <script><![CDATA[
-            import groovy.json.JsonGenerator
             import org.apache.commons.csv.*
             import com.fasterxml.jackson.core.JsonFactory
             import com.fasterxml.jackson.core.JsonGenerator
             import com.fasterxml.jackson.databind.ObjectMapper
+            import java.nio.charset.StandardCharsets
 
             try {
                 // Prepare JSON file
@@ -538,7 +535,7 @@
                 JsonFactory jsonFactory = new JsonFactory()
 
                 /* Use try-with-resources to automatically close PrintWriter & JsonGenerator */
-                try (PrintWriter pw = new PrintWriter(fulfilledOrderItemJsonFile, "UTF-8");
+                try (PrintWriter pw = new PrintWriter(StandardCharsets.UTF_8, fulfilledOrderItemJsonFile);
                      JsonGenerator generator = jsonFactory.createGenerator(pw)) {
 
                     generator.writeStartArray()

From 0ceeaf94ba734c357cfcd037ad173a0f3daba25e Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Thu, 6 Feb 2025 11:35:30 +0530
Subject: [PATCH 4/6] improve the formating of date

---
 service/co/hotwax/netsuite/OrderServices.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index 6e68031..58a64da 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -548,10 +548,12 @@
                     for (record in parser.iterator()) {
                         def orderId = record.get("orderId")
 
+                        shippedDate = ec.l10n.format(ec.l10n.parseDateTime(record.get("shippedDate"), "M/d/yyyy h:mm a"), "yyyy-MM-dd HH:mm:ss")
+
                         def orderItem = [
                             orderItemSeqId    : record.get("orderItemSeqId"),
                             externalFacilityId: record.get("externalFacilityId"),
-                            shippedDate       : record.get("shippedDate") + ":00",
+                            shippedDate       : shippedDate ,
                             quantity          : record.get("quantity"),
                             trackingNumber    : record.get("trackingNumber") ?: "",
                             "validation-result": "success"

From 6781f8cc85aec2e90e5428b52b8e7876237c5543 Mon Sep 17 00:00:00 2001
From: nutan shinde <nutan.shinde@hotwax.co>
Date: Fri, 14 Feb 2025 18:23:34 +0530
Subject: [PATCH 5/6] added try with resource in consume fulfillment feed

---
 service/co/hotwax/netsuite/OrderServices.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/service/co/hotwax/netsuite/OrderServices.xml b/service/co/hotwax/netsuite/OrderServices.xml
index 06f5469..04d47c9 100644
--- a/service/co/hotwax/netsuite/OrderServices.xml
+++ b/service/co/hotwax/netsuite/OrderServices.xml
@@ -617,14 +617,13 @@
                      JsonGenerator generator = jsonFactory.createGenerator(pw)) {
 
                     generator.writeStartArray()
-
-
-                    def reader = new BufferedReader(new StringReader(ec.resource.getLocationReference(systemMessage.messageText).getText()))
-                    def parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(reader)
+                    /* Use try-with-resources to automatically close BufferedReader & CSVParser */
+                    try (BufferedReader reader = new BufferedReader(new StringReader(ec.resource.getLocationReference(systemMessage.messageText).getText()));
+                         CSVParser parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(reader)) {
 
                     def orderMap = [:]
 
-                    for (record in parser.iterator()) {
+                    for (CSVRecord record : parser) {
                         def orderId = record.get("orderId")
 
                         shippedDate = ec.l10n.format(ec.l10n.parseDateTime(record.get("shippedDate"), "M/d/yyyy h:mm a"), "yyyy-MM-dd HH:mm:ss")
@@ -651,20 +650,19 @@
                         orderMap[orderId].items << orderItem
                     }
 
-                    reader.close()
-
                     // Write each order as a separate object in the JSON array
                     ObjectMapper mapper = new ObjectMapper()
                     for (orderEntry in orderMap) {
                         def orderJson = [orderMap: orderEntry.value]
                         mapper.writerWithDefaultPrettyPrinter().writeValue(generator, orderJson)
                     }
-
-                    generator.writeEndArray()
+                }
+                generator.writeEndArray()
                 }
 
             } catch (IOException e) {
                 logger.error("Error preparing Fulfilled Order Item Feed JSON file", e)
+                ec.message.addError("Error preparing order feed file ${e}")
             }
         ]]></script>
 

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 6/6] 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