From 0fe1bf530a02b48f5f43272e60ae0b054a232fac Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Wed, 8 Jan 2025 15:33:35 +0530
Subject: [PATCH 1/4] Added services to update products and its variants

---
 service/co/hotwax/oms/ProductServices.xml | 178 ++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 service/co/hotwax/oms/ProductServices.xml

diff --git a/service/co/hotwax/oms/ProductServices.xml b/service/co/hotwax/oms/ProductServices.xml
new file mode 100644
index 0000000..867042b
--- /dev/null
+++ b/service/co/hotwax/oms/ProductServices.xml
@@ -0,0 +1,178 @@
+<?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="update" noun="ProductAndVariants">
+        <description>This service will update product and create new variants</description>
+        <in-parameters>
+            <parameter name="productJson" type="Map" required="true"/>
+        </in-parameters>
+        <actions>
+            <log level="info" message="====updateProductAndVariants============productJson: ${productJson}================"/>
+            <set field="productVariants" from="productJson.variants"/>
+            <set field="shopifyShopProduct" from="productJson.shopifyShopProduct"/>
+            <!-- Remove variants from the productJson -->
+            <script>
+                productJson.remove("variants")
+                productJson.remove("shopifyShopProduct")
+            </script>
+            <!-- If the productId is null, then create a new product and create a new ShopifyShopProduct record-->
+            <if condition="productJson.productId == null">
+                <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductCreate" in-map="productJson" out-map="prepareProductCreateOutput"/>
+                <service-call name="create#org.apache.ofbiz.product.product.Product" in-map="prepareProductCreateOutput.productJson" out-map="createProductOutput"/>
+                <set field="parentProductId" from="createProductOutput.productId"/>
+                <service-call name="create#co.hotwax.shopify.ShopifyShopProduct" in-map="[productId:parentProductId, shopId:shopifyShopProduct.shopId, shopifyShopProductId:shopifyShopProduct.shopifyShopProductId]"/>
+                <else>
+                    <!-- If the productId is not null, then update the product and ShopifyShopProduct record-->
+                    <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductUpdate" in-map="context" out-map="prepareUpdateProductOutput"/>
+                    <service-call name="update#org.apache.ofbiz.product.product.Product" in-map="prepareUpdateProductOutput" out-map="updateProductOutput" />
+                    <!-- TODO: We can remove the below commented block as this is not really needed for update flow -->
+                    <set field="parentProductId" from="productJson.productId"/>
+                    <!-- <service-call name="update#co.hotwax.shopify.ShopifyShopProduct" in-map="[productId:productJson.productId, shopId:shopifyShopProduct.shopId, shopifyProductId:shopifyShopProduct.shopifyProductId]"/> -->
+                    <!-- If we have deleteProductFeatureAppls in the output, then delete each productFeatureAppl -->
+                    <iterate list="updateProductOutput.deleteProductFeatureAppls" entry="productFeatureAppl">
+                        <service-call name="delete#org.apache.ofbiz.product.feature.ProductFeatureAppl" in-map="productFeatureAppl"/>
+                    </iterate>
+                </else>
+            </if>
+            <iterate list="productVariants" entry="productVariant">
+                <set field="productVariantMap" from="[:]"/>
+                <set field="productVariantMap.parentProductId" from="parentProductId"/>
+                <set field="productVariantMap.productVariantJson" from="productVariant"/>
+                <service-call name="co.hotwax.oms.product.ProductServices.update#ProductVariant" in-map="productVariantMap"/>
+            </iterate>
+        </actions>
+    </service>
+
+    <service verb="prepare" noun="ProductUpdate">
+        <in-parameters>
+            <parameter name="productJson" type="Map" required="true"/>
+        </in-parameters>
+        <out-parameters>
+            <parameter name="productJson" type="Map" required="true"/>
+            <parameter name="deleteProductFeatureAppls" type="List"/>
+        </out-parameters>
+        <actions>
+            <log level="info" message="====prepareProductUpdate============productJson: ${productJson}================"/>
+            <!-- Prepare the product price information -->
+            <if condition="productJson.price != null">
+                <set field="priceMap" from="[:]"/>
+                <set field="priceMap.price" from="productJson.price"/>
+                <script>productJson.remove("price")</script>
+                <if condition="priceMap.price != null">
+                    <set field="productPriceList" from="[]"/>
+                    <entity-find entity-name="org.apache.ofbiz.product.price.ProductPrice" list="productPrices">
+                        <date-filter/>
+                        <econdition field-name="productId" from="productJson.productId"/>
+                        <econdition field-name="productPriceTypeId" value="LIST_PRICE"/>
+                        <econdition field-name="productPricePurposeId" value="PURCHASE"/>
+                    </entity-find>
+                    <set field="productPriceRecord" from="productPrices[0]"/>
+                    <set field="productPriceRecord.price" from="priceMap.price"/>
+                    <entity-update value-field="productPriceRecord"/>
+                    <script>productPriceList.add(productPriceRecord)</script>
+                </if>
+                <script>productJson.put("org.apache.ofbiz.product.price.ProductPrice", productPriceList) </script>
+                <set field="productJson.productPriceList" from="productPriceList"/>
+            </if>
+
+            <!-- Prepare the product features -->
+            <set field="features" from="productJson.features"/>
+            <if condition="features != null">
+                <set field="ProductFeatureApplList" from="[]"/>
+                <iterate list="features" entry="feature">
+                    <!-- Create new productFeatureTypeId if it doesn't exist -->
+                    <if condition="feature.productFeatureTypeId == null">
+                        <service-call name="create#org.apache.ofbiz.product.feature.ProductFeatureType" in-map="[description: feature.productFeatureTypeId]" out-map="createProductFeatureTypeOutput"/>
+                        <set field="feature.productFeatureTypeId" from="createProductFeatureTypeOutput.productFeatureTypeId"/>
+                    </if>
+                    <!-- Create new productFeatureId if it doesn't exist -->
+                    <if condition="feature.productFeatureId == null">
+                        <service-call name="create#org.apache.ofbiz.product.feature.ProductFeature" in-map="feature" out-map="createProductFeatureOutput"/>
+                        <set field="feature.productFeatureId" from="createProductFeatureOutput.productFeatureId"/>
+                    </if>
+                    <set field="productFeatureAppl" from="[:]"/>
+                    <set field="productFeatureAppl.productFeatureId" from="feature.productFeatureId"/>
+                    <set field="productFeatureAppl.productFeatureApplTypeId" from="feature.productFeatureApplTypeId"/>
+                    <set field="productFeatureAppl.sequenceNum" from="feature.position"/>
+                    <set field="productFeatureAppl.fromDate" from="ec.user.nowTimestamp"/>
+                    <script>ProductFeatureApplList.add(productFeatureAppl)</script>
+                </iterate>
+            </if>
+            <!-- Get the current active ProductFeatureAppl list for the product -->
+            <entity-find entity-name="org.apache.ofbiz.product.feature.ProductFeatureAppl" list="currentProductFeatureAppls">
+                <date-filter/>
+                <econdition field-name="productId" from="productJson.productId"/>
+            </entity-find>
+            <set field="deleteProductFeatureAppls" from="[]"/>
+            <iterate list="currentProductFeatureAppls" entry="currentProductFeatureAppl">
+                <set field="toBeDeleted" value="false"/>
+                <iterate list="ProductFeatureApplList" entry="productFeatureAppl">
+                    <if condition="currentProductFeatureAppl.productFeatureId == productFeatureAppl.productFeatureId">
+                        <set field="toBeDeleted" value="true"/>
+                    </if>
+                </iterate>
+                <if condition="toBeDeleted">
+                    <script>deleteProductFeatureAppls.add(currentProductFeatureAppl)</script>
+                </if>
+            </iterate>
+            <if condition="productFeatureApplList != null">
+                <!-- TODO: Discuss this assignment -->
+                <script>productJson.put("org.apache.ofbiz.product.feature.ProductFeatureAppl", productFeatureApplList) </script>
+            </if>
+            <!-- Prepare the good identifications -->
+            <set field="goodIdentifications" from="productJson.goodIdentifications"/>
+            <if condition="goodIdentifications != null">
+                <set field="goodIdentificationList" from="[]"/>
+                <iterate list="goodIdentifications" entry="goodIdentification">
+                    <set field="productGoodIdentification" from="[:]"/>
+                    <set field="productGoodIdentification.goodIdentificationTypeId" from="goodIdentification.goodIdentificationTypeId"/>
+                    <set field="productGoodIdentification.idValue" from="goodIdentification.idValue"/>
+                    <set field="productGoodIdentification.fromDate" from="ec.user.nowTimestamp"/>
+                    <script>goodIdentificationList.add(productGoodIdentification)</script>
+                </iterate>
+            </if>
+            <if condition="goodIdentificationList != null">
+                <!-- TODO: Discuss this assignment -->
+                <script>productJson.put("org.apache.ofbiz.product.product.GoodIdentification", goodIdentificationList) </script>
+            </if>
+        </actions>
+    </service>
+
+    <service verb="update" noun="ProductVariant">
+        <description>This service will update a product variant</description>
+        <in-parameters>
+            <parameter name="productVariantJson" type="Map" required="true"/>
+            <parameter name="parentProductId" required="true"/>
+        </in-parameters>
+        <actions>
+            <log level="info" message="====updateProductVariant============productVariantJson: ${productVariantJson}================"/>
+            <set field="shopifyShopProduct" from="productVariantJson.shopifyShopProduct"/>
+            <script>productVariantJson.remove("shopifyShopProduct")</script>
+            <if condition="productVariantJson.productId == null">
+                <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductCreate" in-map="[productJson:productVariantJson]" out-map="prepareProductCreateOutput"/>
+                <service-call name="create#org.apache.ofbiz.product.product.Product" in-map="prepareProductCreateOutput.productJson" out-map="createProductOutput"/>
+                <service-call name="create#org.apache.ofbiz.product.product.ProductAssoc" in-map="[productIdTo:createProductOutput.productId, productId:parentProductId, productAssocTypeId:'PRODUCT_VARIANT', fromDate:ec.user.nowTimestamp]"/>
+                <service-call name="create#co.hotwax.shopify.ShopifyShopProduct" in-map="[productId:parentProductId, shopId:shopifyShopProduct.shopId, shopifyShopProductId:shopifyShopProduct.shopifyShopProductId]"/>
+                <else>
+                    <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductUpdate" in-map="[productJson:productVariantJson]" out-map="prepareProductUpdateOutput"/>
+                    <service-call name="update#org.apache.ofbiz.product.product.Product" in-map="[productJson:prepareProductUpdateOutput.productJson]" out-map="updateProductOutput"/>
+                    <!-- Identify if parent product and updateProductOutput.productId are already associated in ProductAssoc entity-->
+                    <entity-find-one entity-name="org.apache.ofbiz.product.product.ProductAssoc" value-field="productAssoc">
+                        <field-map field-name="productId" from="parentProductId"/>
+                        <field-map field-name="productIdTo" from="updateProductOutput.productId"/>
+                        <field-map field-name="productAssocTypeId" value="PRODUCT_VARIANT"/>
+                    </entity-find-one>
+                    <if condition="!productAssoc">
+                        <!-- If not then create a new ProductAssoc record -->
+                        <service-call name="create#org.apache.ofbiz.product.product.ProductAssoc" in-map="[productIdTo:productVariantJson.productId, productId:parentProductId, productAssocTypeId:'PRODUCT_VARIANT', fromDate:ec.user.nowTimestamp]"/>
+                    </if>
+                    <service-call name="update#co.hotwax.shopify.ShopifyShopProduct" in-map="[productId:updateProductOutput.productId, shopId:shopifyShopProduct.shopId, shopifyProductId:shopifyShopProduct.shopifyProductId]"/>
+                    <iterate list="updateProductOutput.deleteProductFeatureAppls" entry="productFeatureAppl">
+                        <service-call name="delete#org.apache.ofbiz.product.feature.ProductFeatureAppl" in-map="productFeatureAppl"/>
+                    </iterate>
+                </else>
+            </if>
+        </actions>
+    </service>
+</services>
\ No newline at end of file

From d3b6237d99cf20c890e16e0de5affc9ae2a5c423 Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Tue, 21 Jan 2025 23:49:01 +0530
Subject: [PATCH 2/4] Updated the prepare#ProductUpdate and
 update#ProductAndVariants service to include handling for product keywords

---
 service/co/hotwax/oms/ProductServices.xml | 103 ++++++++++------------
 1 file changed, 48 insertions(+), 55 deletions(-)

diff --git a/service/co/hotwax/oms/ProductServices.xml b/service/co/hotwax/oms/ProductServices.xml
index 867042b..f0b3bfe 100644
--- a/service/co/hotwax/oms/ProductServices.xml
+++ b/service/co/hotwax/oms/ProductServices.xml
@@ -1,7 +1,5 @@
 <?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="update" noun="ProductAndVariants">
         <description>This service will update product and create new variants</description>
         <in-parameters>
@@ -9,13 +7,9 @@
         </in-parameters>
         <actions>
             <log level="info" message="====updateProductAndVariants============productJson: ${productJson}================"/>
-            <set field="productVariants" from="productJson.variants"/>
-            <set field="shopifyShopProduct" from="productJson.shopifyShopProduct"/>
-            <!-- Remove variants from the productJson -->
-            <script>
-                productJson.remove("variants")
-                productJson.remove("shopifyShopProduct")
-            </script>
+            <set field="productVariants" from="productJson.remove('variants')"/>
+            <set field="shopifyShopProduct" from="productJson.remove('shopifyShopProduct')"/>
+
             <!-- If the productId is null, then create a new product and create a new ShopifyShopProduct record-->
             <if condition="productJson.productId == null">
                 <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductCreate" in-map="productJson" out-map="prepareProductCreateOutput"/>
@@ -33,6 +27,9 @@
                     <iterate list="updateProductOutput.deleteProductFeatureAppls" entry="productFeatureAppl">
                         <service-call name="delete#org.apache.ofbiz.product.feature.ProductFeatureAppl" in-map="productFeatureAppl"/>
                     </iterate>
+                    <iterate list="updateProductOutput.deleteProductKeywords" entry="productKeyword">
+                        <service-call name="delete#org.apache.ofbiz.product.product.ProductKeyword" in-map="productKeyword"/>
+                    </iterate>
                 </else>
             </if>
             <iterate list="productVariants" entry="productVariant">
@@ -51,38 +48,21 @@
         <out-parameters>
             <parameter name="productJson" type="Map" required="true"/>
             <parameter name="deleteProductFeatureAppls" type="List"/>
+            <parameter name="deleteProductKeywords" type="List"/>
         </out-parameters>
         <actions>
             <log level="info" message="====prepareProductUpdate============productJson: ${productJson}================"/>
-            <!-- Prepare the product price information -->
-            <if condition="productJson.price != null">
-                <set field="priceMap" from="[:]"/>
-                <set field="priceMap.price" from="productJson.price"/>
-                <script>productJson.remove("price")</script>
-                <if condition="priceMap.price != null">
-                    <set field="productPriceList" from="[]"/>
-                    <entity-find entity-name="org.apache.ofbiz.product.price.ProductPrice" list="productPrices">
-                        <date-filter/>
-                        <econdition field-name="productId" from="productJson.productId"/>
-                        <econdition field-name="productPriceTypeId" value="LIST_PRICE"/>
-                        <econdition field-name="productPricePurposeId" value="PURCHASE"/>
-                    </entity-find>
-                    <set field="productPriceRecord" from="productPrices[0]"/>
-                    <set field="productPriceRecord.price" from="priceMap.price"/>
-                    <entity-update value-field="productPriceRecord"/>
-                    <script>productPriceList.add(productPriceRecord)</script>
-                </if>
-                <script>productJson.put("org.apache.ofbiz.product.price.ProductPrice", productPriceList) </script>
-                <set field="productJson.productPriceList" from="productPriceList"/>
-            </if>
 
             <!-- Prepare the product features -->
             <set field="features" from="productJson.features"/>
             <if condition="features != null">
-                <set field="ProductFeatureApplList" from="[]"/>
+                <set field="featureAppls" from="[]"/>
                 <iterate list="features" entry="feature">
                     <!-- Create new productFeatureTypeId if it doesn't exist -->
-                    <if condition="feature.productFeatureTypeId == null">
+                    <entity-find-one entity-name="org.apache.ofbiz.product.feature.ProductFeatureType" value-field="productFeatureType">
+                        <field-map field-name="productFeatureTypeId" from="feature.productFeatureTypeId"/>
+                    </entity-find-one>
+                    <if condition="!productFeatureType">
                         <service-call name="create#org.apache.ofbiz.product.feature.ProductFeatureType" in-map="[description: feature.productFeatureTypeId]" out-map="createProductFeatureTypeOutput"/>
                         <set field="feature.productFeatureTypeId" from="createProductFeatureTypeOutput.productFeatureTypeId"/>
                     </if>
@@ -96,9 +76,11 @@
                     <set field="productFeatureAppl.productFeatureApplTypeId" from="feature.productFeatureApplTypeId"/>
                     <set field="productFeatureAppl.sequenceNum" from="feature.position"/>
                     <set field="productFeatureAppl.fromDate" from="ec.user.nowTimestamp"/>
-                    <script>ProductFeatureApplList.add(productFeatureAppl)</script>
+                    <script>featureAppls.add(productFeatureAppl)</script>
                 </iterate>
             </if>
+
+            <!-- TODO: Add more comments -->
             <!-- Get the current active ProductFeatureAppl list for the product -->
             <entity-find entity-name="org.apache.ofbiz.product.feature.ProductFeatureAppl" list="currentProductFeatureAppls">
                 <date-filter/>
@@ -106,36 +88,47 @@
             </entity-find>
             <set field="deleteProductFeatureAppls" from="[]"/>
             <iterate list="currentProductFeatureAppls" entry="currentProductFeatureAppl">
-                <set field="toBeDeleted" value="false"/>
-                <iterate list="ProductFeatureApplList" entry="productFeatureAppl">
+                <set field="toBeDeleted" value="true"/>
+                <iterate list="featureAppls" entry="productFeatureAppl">
                     <if condition="currentProductFeatureAppl.productFeatureId == productFeatureAppl.productFeatureId">
-                        <set field="toBeDeleted" value="true"/>
+                        <set field="toBeDeleted" value="false"/>
+                        <script>featureAppls.remove(productFeatureAppl)</script>
                     </if>
                 </iterate>
                 <if condition="toBeDeleted">
-                    <script>deleteProductFeatureAppls.add(currentProductFeatureAppl)</script>
+                    <set field="deleteProductFeatureAppls" from="deleteProductFeatureAppls+currentProductFeatureAppl"/>
                 </if>
             </iterate>
-            <if condition="productFeatureApplList != null">
-                <!-- TODO: Discuss this assignment -->
-                <script>productJson.put("org.apache.ofbiz.product.feature.ProductFeatureAppl", productFeatureApplList) </script>
+
+            <if condition="featureAppls != null">
+                <set field="productJson.featureAppls" from="featureAppls"/>
             </if>
-            <!-- Prepare the good identifications -->
-            <set field="goodIdentifications" from="productJson.goodIdentifications"/>
-            <if condition="goodIdentifications != null">
-                <set field="goodIdentificationList" from="[]"/>
-                <iterate list="goodIdentifications" entry="goodIdentification">
-                    <set field="productGoodIdentification" from="[:]"/>
-                    <set field="productGoodIdentification.goodIdentificationTypeId" from="goodIdentification.goodIdentificationTypeId"/>
-                    <set field="productGoodIdentification.idValue" from="goodIdentification.idValue"/>
-                    <set field="productGoodIdentification.fromDate" from="ec.user.nowTimestamp"/>
-                    <script>goodIdentificationList.add(productGoodIdentification)</script>
+
+            <!-- Fetch the current Product Keywords for the productId -->
+            <entity-find entity-name="org.apache.ofbiz.product.product.ProductKeyword" list="currentProductKeywords">
+                <econdition field-name="productId" from="productJson.productId"/>
+            </entity-find>
+            <!-- Initialize the deleteProductKeywords list -->
+            <set field="deleteProductKeywords" from="[]"/>
+            <!-- Iterate the currentProductKeywords list -->
+            <iterate list="currentProductKeywords" entry="currentProductKeyword">
+                <!-- Initialize toBeDeleted to true -->
+                <set field="toBeDeleted" value="true"/>
+                <!-- Iterate the keywords list in the productJson -->
+                <iterate list="productJson.keywords" entry="newKeyword">
+                    <!-- If current keywords match the incoming keyword then it should not be created as it already exists -->
+                    <if condition="currentProductKeyword.keyword == newKeyword.keyword">
+                        <set field="toBeDeleted" value="false"/>
+                        <script>
+                            productJson.keywords.remove(newKeyword)
+                        </script>
+                    </if>
                 </iterate>
-            </if>
-            <if condition="goodIdentificationList != null">
-                <!-- TODO: Discuss this assignment -->
-                <script>productJson.put("org.apache.ofbiz.product.product.GoodIdentification", goodIdentificationList) </script>
-            </if>
+                <!-- If toBeDeleted is true then add that keyword map to the deleteProductKeywords list -->
+                <if condition="toBeDeleted">
+                    <set field="deleteProductKeywords" from="deleteProductKeywords+currentProductKeyword"/>
+                </if>
+            </iterate>
         </actions>
     </service>
 

From 05d558e2dfa143b9e0e17ef0ac17792f01bbfcbe Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Wed, 22 Jan 2025 00:06:02 +0530
Subject: [PATCH 3/4] used remove method to set the shopifyshopProduct field
 and remove that

---
 service/co/hotwax/oms/ProductServices.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/service/co/hotwax/oms/ProductServices.xml b/service/co/hotwax/oms/ProductServices.xml
index 318aa24..a5f7004 100644
--- a/service/co/hotwax/oms/ProductServices.xml
+++ b/service/co/hotwax/oms/ProductServices.xml
@@ -216,7 +216,7 @@
                     <set field="productFeatureAppl.productFeatureApplTypeId" from="feature.productFeatureApplTypeId"/>
                     <set field="productFeatureAppl.sequenceNum" from="feature.position"/>
                     <set field="productFeatureAppl.fromDate" from="ec.user.nowTimestamp"/>
-                    <script>featureAppls.add(productFeatureAppl)</script>
+                    <set field="featureAppls" from="featureAppls+productFeatureAppl"/>
                 </iterate>
             </if>
 
@@ -280,8 +280,7 @@
         </in-parameters>
         <actions>
             <log level="info" message="====updateProductVariant============productVariantJson: ${productVariantJson}================"/>
-            <set field="shopifyShopProduct" from="productVariantJson.shopifyShopProduct"/>
-            <script>productVariantJson.remove("shopifyShopProduct")</script>
+            <set field="shopifyShopProduct" from="productVariantJson.remove('shopifyShopProduct')"/>
             <if condition="productVariantJson.productId == null">
                 <service-call name="co.hotwax.oms.product.ProductServices.prepare#ProductCreate" in-map="[productJson:productVariantJson]" out-map="prepareProductCreateOutput"/>
                 <service-call name="create#org.apache.ofbiz.product.product.Product" in-map="prepareProductCreateOutput.productJson" out-map="createProductOutput"/>

From 516c71eaa0426b607163a87d18776ccd91ed6558 Mon Sep 17 00:00:00 2001
From: Janvi Talreja <janvi.talreja@hotwax.co>
Date: Wed, 22 Jan 2025 00:18:54 +0530
Subject: [PATCH 4/4] Updated the prepare#ProductCreate and
 prepare#ProductUpdate to handle productFeature creation

---
 service/co/hotwax/oms/ProductServices.xml | 25 ++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/service/co/hotwax/oms/ProductServices.xml b/service/co/hotwax/oms/ProductServices.xml
index a5f7004..a45bae0 100644
--- a/service/co/hotwax/oms/ProductServices.xml
+++ b/service/co/hotwax/oms/ProductServices.xml
@@ -115,13 +115,22 @@
 
                 <!-- Iterate through the features list -->
                 <iterate list="features" entry="feature">
-                    <!-- Check if productFeatureTypeId is null then create one and set the productFeatureTypeId -->
-                    <if condition="feature.productFeatureTypeId == null">
+                    <!-- Fetch productFeatureType record for productFeatureTypeId -->
+                    <entity-find-one entity-name="org.apache.ofbiz.product.feature.ProductFeatureType" value-field="productFeatureType">
+                        <field-map field-name="productFeatureTypeId" from="feature.productFeatureTypeId"/>
+                    </entity-find-one>
+                    <!-- Create new productFeatureTypeId if it doesn't exist -->
+                    <if condition="!productFeatureType">
                         <service-call name="create#org.apache.ofbiz.product.feature.ProductFeatureType" in-map="[description: feature.productFeatureTypeId]" out-map="createProductFeatureTypeOutput"/>
                         <set field="feature.productFeatureTypeId" from="createProductFeatureTypeOutput.productFeatureTypeId"/>
                     </if>
+
+                    <!-- Fetch feature record for the productFeatureId -->
+                    <entity-find-one entity-name="org.apache.ofbiz.product.feature" value-field="productFeature">
+                        <field-map field-name="productFeatureId" from="feature.productFeatureId"/>
+                    </entity-find-one>
                     <!-- Create new productFeatureId if it doesn't exist -->
-                    <if condition="feature.productFeatureId == null">
+                    <if condition="!productFeature">
                         <service-call name="create#org.apache.ofbiz.product.feature.ProductFeature" in-map="feature" out-map="createProductFeatureOutput"/>
                         <set field="feature.productFeatureId" from="createProductFeatureOutput.productFeatureId"/>
                     </if>
@@ -198,16 +207,22 @@
             <if condition="features != null">
                 <set field="featureAppls" from="[]"/>
                 <iterate list="features" entry="feature">
-                    <!-- Create new productFeatureTypeId if it doesn't exist -->
+                    <!-- Fetch productFeatureType record for productFeatureTypeId -->
                     <entity-find-one entity-name="org.apache.ofbiz.product.feature.ProductFeatureType" value-field="productFeatureType">
                         <field-map field-name="productFeatureTypeId" from="feature.productFeatureTypeId"/>
                     </entity-find-one>
+                    <!-- Create new productFeatureTypeId if it doesn't exist -->
                     <if condition="!productFeatureType">
                         <service-call name="create#org.apache.ofbiz.product.feature.ProductFeatureType" in-map="[description: feature.productFeatureTypeId]" out-map="createProductFeatureTypeOutput"/>
                         <set field="feature.productFeatureTypeId" from="createProductFeatureTypeOutput.productFeatureTypeId"/>
                     </if>
+
+                    <!-- Fetch feature record for the productFeatureId -->
+                    <entity-find-one entity-name="org.apache.ofbiz.product.feature" value-field="productFeature">
+                        <field-map field-name="productFeatureId" from="feature.productFeatureId"/>
+                    </entity-find-one>
                     <!-- Create new productFeatureId if it doesn't exist -->
-                    <if condition="feature.productFeatureId == null">
+                    <if condition="!productFeature">
                         <service-call name="create#org.apache.ofbiz.product.feature.ProductFeature" in-map="feature" out-map="createProductFeatureOutput"/>
                         <set field="feature.productFeatureId" from="createProductFeatureOutput.productFeatureId"/>
                     </if>