Merge pull request #173 from gurveenbagga/merge-develop-into-main-for…

…-v1-4-0

Merge develop into main for v1.4.0 release

README.md

@@ -5,3 +5,15 @@ it provides an alternative approach for defining and managing hotwax oms entitie
 
 HotWax is leveraging "ofbiz-oms-udm" as a component to enhance entity and data model definition within its implementation of the Moqui framework. 
 This approach allows for more flexible and tailored data modeling in the context of Hotwax OMS specific requirements.
+
+## HC OMS release compatibility
+
+This section contains the information for the minimum compatible version of HC OMS release for the ofbiz-oms-udm release.
+
+TODO identify and update for earlier versions.
+NOTE Before using this component, identify the minimum compatible HC OMS release version esp. database changes.
+
+| ofbiz-oms-udm release | HC OMS release | Comments |
+|-----------------------|----------------|----------|
+| v1.4.0                | v5.10.0        |          |
+| v1.3.13               | v5.10.2        |          |

component.xml

@@ -19,6 +19,6 @@ under the License.
 -->
 
 <component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
-        name="ofbiz-oms-udm" version="1.3.6">
+        name="ofbiz-oms-udm" version="1.4.0">
     <!-- no dependencies -->
 </component>

entity/CommonEntitymodel.xml

@@ -53,6 +53,7 @@ under the License.
         <field name="enumTypeId" type="id"></field>
         <field name="enumCode" type="text-medium"></field>
         <field name="sequenceId" type="id"></field>
+        <field name="enumName" type="text-medium"></field>
         <field name="description" type="text-long"></field>
         <relationship type="one" fk-name="ENUM_TO_TYPE" related="org.apache.ofbiz.common.enum.EnumerationType">
             <key-map field-name="enumTypeId"/>

entity/DatamodelOrderEntitymodel.xml

@@ -918,7 +918,7 @@ under the License.
     </entity>
     <entity entity-name="OrderProductPromoCode" package="org.apache.ofbiz.order.order" group="ofbiz_transactional">
         <field name="orderId" type="id" is-pk="true"></field>
-        <field name="productPromoCodeId" type="id" is-pk="true"></field>
+        <field name="productPromoCodeId" type="id-long" is-pk="true"></field>
         <relationship type="one" fk-name="ORDER_PPCD_ORD" related="org.apache.ofbiz.order.order.OrderHeader">
             <key-map field-name="orderId"/>
         </relationship>
@@ -1998,6 +1998,9 @@ under the License.
         <index name="RTN_CHNL_INDX">
             <index-field name="returnChannelEnumId"/>
         </index>
+        <index name="EXT_RTN_ID_INDX">
+            <index-field name="externalId"/>
+        </index>
     </entity>
     <entity entity-name="ReturnHeaderType" package="org.apache.ofbiz.order.return" group="ofbiz_transactional">
         <field name="returnHeaderTypeId" type="id" is-pk="true"></field>
@@ -2255,7 +2258,7 @@ under the License.
         <field name="recurrenceInfoId" type="id"></field>
         <field name="lastOrderedDate" type="date-time"></field>
         <field name="lastAdminModified" type="date-time"></field>
-        <field name="productPromoCodeId" type="id"></field>
+        <field name="productPromoCodeId" type="id-long"></field>
         <relationship type="one" fk-name="SHLIST_PARENT" title="Parent" related="org.apache.ofbiz.order.shoppinglist.ShoppingList">
             <key-map field-name="parentShoppingListId" related="shoppingListId"/>
         </relationship>

entity/DatamodelPartyEntitymodel.xml

@@ -518,6 +518,9 @@ under the License.
         <index name="COMMEVT_MSG_ID" unique="true">
             <index-field name="messageId"/>
         </index>
+        <index name="EXT_COMEVNT_ID_INDX">
+            <index-field name="externalId"/>
+        </index>
     </entity>
     <!-- TODO: skipped element view-entity -->
     <!-- TODO: skipped element view-entity -->
@@ -608,6 +611,9 @@ under the License.
         <index name="INFO_STRING_IDX">
             <index-field name="infoString"/>
         </index>
+        <index name="EXT_CNTMECH_ID_INDX">
+            <index-field name="externalId"/>
+        </index>
     </entity>
     <entity entity-name="ContactMechAttribute" package="org.apache.ofbiz.party.contact" group="ofbiz_transactional">
         <field name="contactMechId" type="id" is-pk="true"></field>

entity/DatamodelProductEntitymodel.xml

@@ -651,6 +651,9 @@ under the License.
         <relationship type="one" fk-name="FACILITY_SUOM" title="FacilitySize" related="org.apache.ofbiz.common.uom.Uom">
             <key-map field-name="facilitySizeUomId" related="uomId"/>
         </relationship>
+        <index name="EXT_FAC_ID_INDX">
+            <index-field name="externalId"/>
+        </index>
     </entity>
     <!-- TODO: skipped element view-entity -->
     <entity entity-name="FacilityAttribute" package="org.apache.ofbiz.product.facility" group="ofbiz_transactional">
@@ -2242,15 +2245,15 @@ under the License.
         </relationship>
     </entity>
     <entity entity-name="ProductPromoCodeEmail" package="org.apache.ofbiz.product.promo" group="ofbiz_transactional">
-        <field name="productPromoCodeId" type="id" is-pk="true"></field>
+        <field name="productPromoCodeId" type="id-long" is-pk="true"></field>
         <field name="emailAddress" type="text-long" is-pk="true"></field>
         <relationship type="one" fk-name="PROD_PRCDE_PCD" related="org.apache.ofbiz.product.promo.ProductPromoCode">
             <key-map field-name="productPromoCodeId"/>
         </relationship>
     </entity>
     <!-- TODO: skipped element view-entity -->
     <entity entity-name="ProductPromoCodeParty" package="org.apache.ofbiz.product.promo" group="ofbiz_transactional">
-        <field name="productPromoCodeId" type="id" is-pk="true"></field>
+        <field name="productPromoCodeId" type="id-long" is-pk="true"></field>
         <field name="partyId" type="id" is-pk="true"></field>
         <relationship type="one" fk-name="PROD_PRCDP_PCD" related="org.apache.ofbiz.product.promo.ProductPromoCode">
             <key-map field-name="productPromoCodeId"/>
@@ -2324,7 +2327,7 @@ under the License.
         <field name="orderId" type="id" is-pk="true"></field>
         <field name="promoSequenceId" type="id" is-pk="true"></field>
         <field name="productPromoId" type="id"></field>
-        <field name="productPromoCodeId" type="id"></field>
+        <field name="productPromoCodeId" type="id-long"></field>
         <field name="partyId" type="id"></field>
         <field name="totalDiscountAmount" type="currency-amount"></field>
         <field name="quantityLeftInActions" type="number-decimal"></field>

entity/DatamodelShipmentEntitymodel.xml

@@ -441,6 +441,9 @@ under the License.
         <relationship type="one-nofk" title="From" related="org.apache.ofbiz.party.party.PartyGroup">
             <key-map field-name="partyIdFrom" related="partyId"/>
         </relationship>
+        <index name="EXT_SHIP_ID_INDX">
+            <index-field name="externalId"/>
+        </index>
     </entity>
     <!-- TODO: skipped element view-entity -->
     <entity entity-name="ShipmentAttribute" package="org.apache.ofbiz.shipment.shipment" group="ofbiz_transactional">