From 5d9177b4fd7be974687330511abc6710fca4c8b0 Mon Sep 17 00:00:00 2001
From: AyanF <ayanfarooqui111@gmail.com>
Date: Tue, 19 Nov 2024 16:24:55 +0530
Subject: [PATCH 1/3] Added view entity OrderShipmentAndRouteSegment

---
 entity/OmsOrderViewEntities.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index b6b97a8..723710a 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -1626,4 +1626,37 @@ under the License.
         <alias entity-alias="OI" name="statusId"/>
     </view-entity>
 
+    <view-entity entity-name="OrderShipmentAndRouteSegment" package="co.hotwax.customerservice.order" group="ofbiz_transactional">
+        <member-entity entity-alias="OH" entity-name="OrderHeader"/>
+        <member-entity entity-alias="OISG" entity-name="OrderItemShipGroup" join-from-alias="OH">
+            <key-map field-name="orderId"/>
+        </member-entity>
+        <member-entity entity-alias="S" entity-name="Shipment" join-from-alias="OISG">
+            <key-map field-name="orderId"  related="primaryOrderId"/>
+            <key-map field-name="shipGroupSeqId" related="primaryShipGroupSeqId"/>
+        </member-entity>
+        <member-entity entity-alias="SRS" entity-name="ShipmentRouteSegment" join-from-alias="S">
+            <key-map field-name="shipmentId" related="shipmentId"/>
+        </member-entity>
+        <alias entity-alias="OH" name="orderId" />
+        <alias entity-alias="OH" name="orderDate"/>
+        <alias entity-alias="OH" name="orderTypeId"/>
+        <alias entity-alias="OH" name="webSiteId"/>
+        <alias entity-alias="OH" name="externalId"/>
+        <alias entity-alias="OH" name="orderName"/>
+        <alias entity-alias="OH" name="statusId"/>
+        <alias entity-alias="OH" field="originFacilityId" name="originFacilityId" />
+        <alias entity-alias="OISG" name="shipGroupSeqId" />
+        <alias entity-alias="OISG" name="orderFacilityId"/>
+        <alias entity-alias="OISG" name="facilityId"/>
+        <alias entity-alias="OISG" name="carrierPartyId"/>
+        <alias entity-alias="OISG" name="shipmentMethodTypeId"/>
+        <alias entity-alias="S" name="shipmentId" />
+        <alias entity-alias="S" name="shipmentTypeId"/>
+        <alias entity-alias="S" field="statusId" name="shipmentStatusId"/>
+        <alias entity-alias="S" field="createdDate" name="shipmentCreatedDate"/>
+        <alias entity-alias="S" field="estimatedShipDate" name="shipmentShippedDate"/>
+        <alias entity-alias="SRS" name="trackingIdNumber"/>
+    </view-entity>
+    
 </entities>

From 68ff1b247174a1cfe2628ea34d97475cf8a70ca0 Mon Sep 17 00:00:00 2001
From: AyanF <ayanfarooqui111@gmail.com>
Date: Tue, 10 Dec 2024 11:21:57 +0530
Subject: [PATCH 2/3] Added UserLoginSecurityGroupAndPermission view entity

---
 entity/OmsCommonViewEntities.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/entity/OmsCommonViewEntities.xml b/entity/OmsCommonViewEntities.xml
index 49d4cf0..68b5a19 100644
--- a/entity/OmsCommonViewEntities.xml
+++ b/entity/OmsCommonViewEntities.xml
@@ -31,4 +31,23 @@ under the License.
         </alias-all>
         <alias name="typeDescription" field="description" entity-alias="TYPE"/>
     </view-entity>
+
+    <view-entity entity-name="UserLoginSecurityGroupAndPermission"
+                 package="co.hotwax.security" >
+        <member-entity entity-alias="SP" entity-name="SecurityPermission"/>
+        <member-entity entity-alias="SGP" entity-name="SecurityGroupPermission" join-from-alias="SP">
+            <key-map field-name="permissionId"/>
+        </member-entity>
+        <member-entity entity-alias="ULSG" entity-name="UserLoginSecurityGroup" join-from-alias="SGP">
+            <key-map field-name="groupId"/>
+        </member-entity>
+        <alias entity-alias="ULSG" name="userLoginId"/>
+        <alias entity-alias="ULSG" name="groupId"/>
+        <alias entity-alias="ULSG" name="fromDate"/>
+        <alias entity-alias="ULSG" name="thruDate"/>
+        <alias entity-alias="SP" name="permissionId"/>
+        <alias entity-alias="SP" name="description"/>
+        <alias entity-alias="SGP" name="sGPFromDate" field="fromDate"/>
+        <alias entity-alias="SGP" name="sGPThruDate" field="thruDate"/>
+    </view-entity>
 </entities>
\ No newline at end of file

From 3965b131ff7fd3a26223e7e9e3c84684e01bda75 Mon Sep 17 00:00:00 2001
From: AyanF <ayanfarooqui111@gmail.com>
Date: Tue, 10 Dec 2024 12:16:24 +0530
Subject: [PATCH 3/3] moved view entity OrderShipmentAndRouteSegment to
 specific component

---
 entity/OmsOrderViewEntities.xml | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/entity/OmsOrderViewEntities.xml b/entity/OmsOrderViewEntities.xml
index 723710a..edefe5e 100644
--- a/entity/OmsOrderViewEntities.xml
+++ b/entity/OmsOrderViewEntities.xml
@@ -1625,38 +1625,5 @@ under the License.
         <alias entity-alias="OI" name="cancelQuantity"/>
         <alias entity-alias="OI" name="statusId"/>
     </view-entity>
-
-    <view-entity entity-name="OrderShipmentAndRouteSegment" package="co.hotwax.customerservice.order" group="ofbiz_transactional">
-        <member-entity entity-alias="OH" entity-name="OrderHeader"/>
-        <member-entity entity-alias="OISG" entity-name="OrderItemShipGroup" join-from-alias="OH">
-            <key-map field-name="orderId"/>
-        </member-entity>
-        <member-entity entity-alias="S" entity-name="Shipment" join-from-alias="OISG">
-            <key-map field-name="orderId"  related="primaryOrderId"/>
-            <key-map field-name="shipGroupSeqId" related="primaryShipGroupSeqId"/>
-        </member-entity>
-        <member-entity entity-alias="SRS" entity-name="ShipmentRouteSegment" join-from-alias="S">
-            <key-map field-name="shipmentId" related="shipmentId"/>
-        </member-entity>
-        <alias entity-alias="OH" name="orderId" />
-        <alias entity-alias="OH" name="orderDate"/>
-        <alias entity-alias="OH" name="orderTypeId"/>
-        <alias entity-alias="OH" name="webSiteId"/>
-        <alias entity-alias="OH" name="externalId"/>
-        <alias entity-alias="OH" name="orderName"/>
-        <alias entity-alias="OH" name="statusId"/>
-        <alias entity-alias="OH" field="originFacilityId" name="originFacilityId" />
-        <alias entity-alias="OISG" name="shipGroupSeqId" />
-        <alias entity-alias="OISG" name="orderFacilityId"/>
-        <alias entity-alias="OISG" name="facilityId"/>
-        <alias entity-alias="OISG" name="carrierPartyId"/>
-        <alias entity-alias="OISG" name="shipmentMethodTypeId"/>
-        <alias entity-alias="S" name="shipmentId" />
-        <alias entity-alias="S" name="shipmentTypeId"/>
-        <alias entity-alias="S" field="statusId" name="shipmentStatusId"/>
-        <alias entity-alias="S" field="createdDate" name="shipmentCreatedDate"/>
-        <alias entity-alias="S" field="estimatedShipDate" name="shipmentShippedDate"/>
-        <alias entity-alias="SRS" name="trackingIdNumber"/>
-    </view-entity>
     
 </entities>