svn commit: r1830429 - in /ofbiz/ofbiz-framework/trunk/applications/product: minilang/product/storage/StorageServices.xml servicedef/services_facility.xml

[rishi]

Author: rishi
Date: Sat Apr 28 11:15:05 2018
New Revision: 1830429

URL: http://svn.apache.org/viewvc?rev=1830429&view=rev
Log:
Improved: Convert facility party related services from simple to entity-auto. Remove the service implementation for removePartyFromFacility, removePartyFromFacilityGroup and deleteFacilityContent. Service removePartyFromFacilityGroup already converted into entity auto, simply removing it.
(OFBIZ-10380)
Thanks Suraj Khurana for reporting the issue and provided fix for the same.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml
    ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_facility.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml?rev=1830429&r1=1830428&r2=1830429&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/minilang/product/storage/StorageServices.xml Sat Apr 28 11:15:05 2018
@@ -53,27 +53,4 @@ under the License.
 
         <create-value value-field="newEntity"/>
     </simple-method>
-
-    <!-- Facility Role Services -->
-    <simple-method method-name="removePartyFromFacility" short-description="Remove Party From Facility">
-        <entity-one entity-name="FacilityParty" value-field="lookedUpValue"/>
-        <now-timestamp field="thruDate"/>
-        <set field="lookedUpValue.thruDate" from-field="thruDate"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <simple-method method-name="removePartyFromFacilityGroup" short-description="Remove Party From FacilityGroup">
-        <make-value entity-name="FacilityGroupRole" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityGroupRole" map="lookupPKMap" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
-    <simple-method method-name="deleteFacilityContent" short-description="Delete Content From Facility">
-        <make-value entity-name="FacilityContent" value-field="lookupPKMap"/>
-        <set-pk-fields map="parameters" value-field="lookupPKMap"/>
-        <find-by-primary-key entity-name="FacilityContent" map="lookupPKMap" value-field="lookedUpValue"/>
-        <now-timestamp field="lookedUpValue.thruDate"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
 </simple-methods>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_facility.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_facility.xml?rev=1830429&r1=1830428&r2=1830429&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_facility.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_facility.xml Sat Apr 28 11:15:05 2018
@@ -1128,8 +1128,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="removePartyFromFacility" default-entity-name="FacilityParty" engine="simple"
-                location="component://product/minilang/product/storage/StorageServices.xml" invoke="removePartyFromFacility" auth="true">
+    <service name="removePartyFromFacility" default-entity-name="FacilityParty" engine="entity-auto" invoke="expire" auth="true">
         <description>Remove Party From Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
@@ -1152,8 +1151,7 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="fromDate" optional="true"/>
     </service>
-    <service name="deleteFacilityContent" default-entity-name="FacilityContent" engine="simple"
-                location="component://product/minilang/product/storage/StorageServices.xml" invoke="deleteFacilityContent" auth="true">
+    <service name="deleteFacilityContent" default-entity-name="FacilityContent" engine="entity-auto" invoke="expire" auth="true">
         <description>Delete Content From Facility</description>
         <permission-service service-name="facilityGenericPermission" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>