Author: jleroux
Date: Wed Sep 3 03:55:32 2014
New Revision: 1622161
URL: http://svn.apache.org/r1622161
Log:
A patch from Nicolas Malin for "Convert Party entites CRUD service from simple
to entity-auto" https://issues.apache.org/jira/browse/OFBIZ-5750
I converted CRUD service to entity-auto for :
PartyRole
PostalAddressBoundary
PartyClassification
PartyClassificationGroup
PartyAttribute
Vendor
PartyCarrierAccount
Only entity with their services present on PartyServices.xml
I change the PartyRole attributes service like that
{code}
- <attribute name="partyId" type="String" mode="IN" optional="true"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
{code}
The currently simple method haven't a specific resolution if the partyId isn't
pass, so the service failed with database constraint error.
I run manual test from Party Profile screen with success (except for
PostalAddressBoundary that haven't standard screen, so call by runService) and
I run ./ant clean-all load-demo run-tests without error
jleroux: after looking at
https://issues.apache.org/jira/browse/OFBIZ-585
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRoleServices.java?view=markup&pathrev=522473
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?r1=524899&r2=524898&pathrev=524899
and content of ServiceUtil.getPartyIdCheckSecurity()
I agree with Nicolas about createPartyRole and deletePartyRole, we can neglect
having PARTYMGR_CREATE for creating/deleting a party role
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/party/servicedef/services.xml
Modified:
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=1622161&r1=1622160&r2=1622161&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
(original)
+++
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
Wed Sep 3 03:55:32 2014
@@ -21,20 +21,6 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";>
- <simple-method method-name="createPartyRole" short-description="Create
Party Role">
- <entity-one entity-name="PartyRole" value-field="partyRole"/>
- <if-empty field="partyRole">
- <make-value entity-name="PartyRole" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </if-empty>
- </simple-method>
- <simple-method method-name="deletePartyRole" short-description="Delete a
PartyRole">
- <entity-one entity-name="PartyRole" value-field="partyRole"/>
- <remove-value value-field="partyRole"/>
- </simple-method>
-
-
<simple-method method-name="savePartyNameChange" short-description="Save
Party Name Change">
<!-- for special case in ecommerce, if no partyId is passed in use
userLogin.partyId -->
<if-empty field="parameters.partyId">
@@ -88,8 +74,8 @@ under the License.
</else-if>
</if>
</simple-method>
- <simple-method method-name="getPartyNameForDate" short-description="Get
Party Name For Date">
+ <simple-method method-name="getPartyNameForDate" short-description="Get
Party Name For Date">
<entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-changeDate"/>
@@ -179,15 +165,6 @@ under the License.
</simple-method>
<!-- PostalAddressBoundary methods -->
- <simple-method method-name="createPostalAddressBoundary"
short-description="Create Postal Address Boundary">
- <make-value entity-name="PostalAddressBoundary"
value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="deletePostalAddressBoundary"
short-description="Delete a Postal Address Boundary">
- <entity-one entity-name="PostalAddressBoundary"
value-field="postalAddressBoundary"/>
- <remove-value value-field="postalAddressBoundary"/>
- </simple-method>
<simple-method method-name="getPostalAddressBoundary"
short-description="Get Postal Address Boundary">
<make-value entity-name="PostalAddressBoundary"
value-field="postalAddressBoundaryLookupMap"/>
<set field="postalAddressBoundaryLookupMap.geoId"
from-field="parameters.geoId"/>
@@ -200,14 +177,14 @@ under the License.
</simple-method>
<!-- PartyIdentification methods -->
- <simple-method method-name="createPartyIdentifications"
short-description="create mass party identification with association between
vale and type">
+ <simple-method method-name="createPartyIdentifications"
short-description="create mass party identification with association between
value and type">
<set field="partyIdentCtx.partyId" from-field="parameters.partyId"/>
<iterate-map key="key" value="value" map="parameters.identifications">
<entity-one value-field="identificationType"
entity-name="PartyIdentificationType" use-cache="true">
- <field-map field-name="partyIdentificationTypeId"
from-field="value"/>
- </entity-one>
- <if-not-empty field="identificationType">
- <set field="idValue"
value="${parameters.identifications.${identificationType.partyIdentificationTypeId}}"/>
+ <field-map field-name="partyIdentificationTypeId"
from-field="value"/>
+ </entity-one>
+ <if-not-empty field="identificationType">
+ <set field="idValue"
value="${parameters.identifications.${identificationType.partyIdentificationTypeId}}"/>
<if-not-empty field="idValue">
<set field="partyIdentCtx.partyIdentificationTypeId"
from-field="identificationType.partyIdentificationTypeId"/>
<set field="partyIdentCtx.idValue" from-field="idValue"/>
@@ -217,77 +194,6 @@ under the License.
</iterate-map>
</simple-method>
- <!-- PartyClassification methods -->
- <simple-method method-name="createPartyClassification"
short-description="create a PartyClassification">
- <make-value entity-name="PartyClassification" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate"><now-timestamp
field="newEntity.fromDate"/></if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updatePartyClassification"
short-description="update a PartyClassification">
- <entity-one entity-name="PartyClassification"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deletePartyClassification"
short-description="delete a PartyClassification">
- <entity-one entity-name="PartyClassification"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
- <!-- PartyClassificationGroup methods -->
- <simple-method method-name="createPartyClassificationGroup"
short-description="create a PartyClassificationGroup">
- <log level="verbose" message="in newEntity"/>
- <make-value entity-name="PartyClassificationGroup"
value-field="newEntity"/>
- <sequenced-id sequence-name="PartyClassificationGroup"
field="newEntity.partyClassificationGroupId"/>
- <field-to-result field="newEntity.partyClassificationGroupId"
result-name="partyClassificationGroupId"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <log level="verbose" message="newEntity:${newEntity}"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updatePartyClassificationGroup"
short-description="update a PartyClassificationGroup">
- <entity-one entity-name="PartyClassificationGroup"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deletePartyClassificationGroup"
short-description="delete a PartyClassificationGroup">
- <entity-one entity-name="PartyClassificationGroup"
value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- Vendor Party services -->
- <simple-method method-name="createVendor" short-description="createVendor">
- <make-value value-field="newEntity" entity-name="Vendor"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateVendor" short-description="updateVendor">
- <entity-one entity-name="Vendor" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteVendor" short-description="deleteVendor">
- <entity-one entity-name="Vendor" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- party attribute services -->
- <simple-method method-name="createPartyAttribute"
short-description="createPartyAttribute">
- <make-value value-field="newEntity" entity-name="PartyAttribute"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updatePartyAttribute"
short-description="updatePartyAttribute">
- <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removePartyAttribute"
short-description="removePartyAttribute">
- <entity-one entity-name="PartyAttribute" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- party profile default -->
<simple-method method-name="setPartyProfileDefaults"
short-description="Sets Party Profile Defaults">
<if-empty field="parameters.partyId">
@@ -947,23 +853,6 @@ under the License.
<set field="relMap.comments" from-field="parameters.comments"/>
<call-service service-name="createPartyRelationship"
in-map-name="relMap"/>
</simple-method>
-
- <simple-method method-name="createPartyCarrierAccount"
short-description="Create PartyCarrierAccount">
- <make-value entity-name="PartyCarrierAccount" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="nowTimeStamp"/>
- <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="updatePartyCarrierAccount"
short-description="Update a PartyCarrierAccount">
- <entity-one entity-name="PartyCarrierAccount"
value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
<!-- send party creation email notification -->
<simple-method method-name="sendCreatePartyEmailNotification"
short-description="Notification email on party creation" login-required="false">
Modified: ofbiz/trunk/applications/party/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/servicedef/services.xml?rev=1622161&r1=1622160&r2=1622161&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/party/servicedef/services.xml Wed Sep 3 03:55:32
2014
@@ -214,22 +214,19 @@ under the License.
<override name="productStoreId" optional="false"/>
</service>
- <service name="createPartyAttribute" engine="simple"
default-entity-name="PartyAttribute"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPartyAttribute" auth="true">
+ <service name="createPartyAttribute" default-entity-name="PartyAttribute"
engine="entity-auto" invoke="create" auth="true">
<description>create a party attribute record</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updatePartyAttribute" engine="simple"
default-entity-name="PartyAttribute"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="updatePartyAttribute" auth="true">
+ <service name="updatePartyAttribute" default-entity-name="PartyAttribute"
engine="entity-auto" invoke="update" auth="true">
<description>updates a party attribute record</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removePartyAttribute" engine="simple"
default-entity-name="PartyAttribute"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="removePartyAttribute" auth="true">
+ <service name="removePartyAttribute" default-entity-name="PartyAttribute"
engine="entity-auto" invoke="delete" auth="true">
<description>removes a party attribute record</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -262,21 +259,17 @@ under the License.
</service>
<!-- Party Role services -->
- <service name="createPartyRole" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPartyRole" auth="true">
+ <service name="createPartyRole" default-entity-name="PartyRole"
engine="entity-auto" invoke="create" auth="true">
<description>Create a Party Role (add a Role to a Party). The logged
in user must have PARTYMGR_CREATE or have
permission to change the role of this partyId</description>
<permission-service service-name="partyRolePermissionCheck"
main-action="CREATE"/>
- <attribute name="partyId" type="String" mode="IN" optional="true"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="deletePartyRole" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="deletePartyRole" auth="true">
+ <service name="deletePartyRole" default-entity-name="PartyRole"
engine="entity-auto" invoke="delete" auth="true">
<description>Delete a Party Role (remove a Role from a Party). The
logged in user must have PARTYMGR_DELETE or have
permission to change the role of this partyId</description>
<permission-service service-name="partyRolePermissionCheck"
main-action="DELETE"/>
- <attribute name="partyId" type="String" mode="IN" optional="true"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<service name="ensurePartyRole" engine="simple"
location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml"
invoke="ensureNaPartyRole" auth="false">
@@ -625,57 +618,49 @@ under the License.
</service>
<!-- PostalAddressBoundary -->
- <service name="createPostalAddressBoundary" engine="simple"
default-entity-name="PostalAddressBoundary"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPostalAddressBoundary">
+ <service name="createPostalAddressBoundary"
default-entity-name="PostalAddressBoundary" engine="entity-auto"
invoke="create">
<description>Create a Postal Address Boundary</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="CREATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
- <service name="deletePostalAddressBoundary" engine="simple"
default-entity-name="PostalAddressBoundary"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="deletePostalAddressBoundary">
+ <service name="deletePostalAddressBoundary"
default-entity-name="PostalAddressBoundary" engine="entity-auto"
invoke="delete">
<description>Delete a Postal Address Boundary</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
<!-- PartyClassification -->
- <service name="createPartyClassification" engine="simple"
default-entity-name="PartyClassification"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPartyClassification">
+ <service name="createPartyClassification"
default-entity-name="PartyClassification" engine="entity-auto" invoke="create">
<description>create PartyClassification</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="CREATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updatePartyClassification" engine="simple"
default-entity-name="PartyClassification"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="updatePartyClassification">
+ <service name="updatePartyClassification"
default-entity-name="PartyClassification" engine="entity-auto" invoke="update">
<description>update PartyClassification</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deletePartyClassification" engine="simple"
default-entity-name="PartyClassification"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="deletePartyClassification">
+ <service name="deletePartyClassification"
default-entity-name="PartyClassification" engine="entity-auto" invoke="delete">
<description>delete PartyClassification</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
</service>
- <service name="createPartyClassificationGroup" engine="simple"
default-entity-name="PartyClassificationGroup"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPartyClassificationGroup">
+ <service name="createPartyClassificationGroup"
default-entity-name="PartyClassificationGroup" engine="entity-auto"
invoke="create">
<description>create PartyClassificationGroup</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="CREATE"/>
<auto-attributes mode="OUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="updatePartyClassificationGroup" engine="simple"
default-entity-name="PartyClassificationGroup"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="updatePartyClassificationGroup">
+ <service name="updatePartyClassificationGroup"
default-entity-name="PartyClassificationGroup" engine="entity-auto"
invoke="update">
<description>update PartyClassificationGroup</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="UPDATE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
- <service name="deletePartyClassificationGroup" engine="simple"
default-entity-name="PartyClassificationGroup"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="deletePartyClassificationGroup">
+ <service name="deletePartyClassificationGroup"
default-entity-name="PartyClassificationGroup" engine="entity-auto"
invoke="delete">
<description>delete PartyClassificationGroup</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="DELETE"/>
<auto-attributes mode="IN" include="pk" optional="false"/>
@@ -709,22 +694,19 @@ under the License.
<!-- Vendor -->
- <service name="createVendor" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createVendor" auth="true">
+ <service name="createVendor" default-entity-name="Vendor"
engine="entity-auto" invoke="create" auth="true">
<description>Create Vendor Information</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="CREATE"/>
<auto-attributes entity-name="Vendor" include="pk" mode="IN"
optional="false"/>
<auto-attributes entity-name="Vendor" include="nonpk" mode="IN"
optional="true"/>
</service>
- <service name="updateVendor" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="updateVendor" auth="true">
+ <service name="updateVendor" default-entity-name="Vendor"
engine="entity-auto" invoke="update" auth="true">
<description>Update Vendor Information</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="UPDATE"/>
<auto-attributes entity-name="Vendor" include="pk" mode="IN"
optional="false"/>
<auto-attributes entity-name="Vendor" include="nonpk" mode="IN"
optional="true"/>
</service>
- <service name="deleteVendor" engine="simple"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="deleteVendor" auth="true">
+ <service name="deleteVendor" default-entity-name="Vendor"
engine="entity-auto" invoke="delete" auth="true">
<description>Remove Vendor Information</description>
<permission-service service-name="partyBasePermissionCheck"
main-action="DELETE"/>
<auto-attributes entity-name="Vendor" include="pk" mode="IN"
optional="false"/>
@@ -1046,8 +1028,7 @@ under the License.
<attribute name="countryGeoId" type="String" mode="OUT"
optional="true"/>
</service>
- <service name="createPartyCarrierAccount" engine="simple"
default-entity-name="PartyCarrierAccount"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="createPartyCarrierAccount" auth="true">
+ <service name="createPartyCarrierAccount"
default-entity-name="PartyCarrierAccount" engine="entity-auto" invoke="create"
auth="true">
<description>Create a PartyCarrierAccount record</description>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -1055,8 +1036,7 @@ under the License.
<override type="String" mode="IN" name="accountNumber"
optional="false"/>
</service>
- <service name="updatePartyCarrierAccount" engine="simple"
default-entity-name="PartyCarrierAccount"
-
location="component://party/script/org/ofbiz/party/party/PartyServices.xml"
invoke="updatePartyCarrierAccount" auth="true">
+ <service name="updatePartyCarrierAccount"
default-entity-name="PartyCarrierAccount" engine="entity-auto" invoke="update"
auth="true">
<description>Update a PartyCarrierAccount record</description>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
