Re: svn commit: r1726542 - in /ofbiz/trunk/applications/order: script/org/ofbiz/order/communication/ script/org/ofbiz/order/order/ servicedef/ src/org/ofbiz/order/order/

Nicolas Malin Thu, 11 Feb 2016 23:25:08 -0800


Hi Jacques


Le 11/02/2016 23:10, Jacques Le Roux a écrit :

Le 11/02/2016 22:27, Jacques Le Roux a écrit :
Hi Nicolas, All,

I globally like the changes, I just have a question.
With these changes the OrderSecurityError* properties which were usedhere are now useless, should we not remove them?Despite the lost, I think it's reasonable because these errors havevery few chances to appear, and if they appear it's not so hard tofind your way through the log.

Yes I planned to remove all unused label before declare the conversion end.

Oops, I did not see the elephant in the room: they are permissionissues. So I guess the message to the user will be less clear. Notsure it's a real issue but we might consider it...

By default I return to more generic label(http://ofbiz.135035.n4.nabble.com/entity-auto-improvement-Act-2-td4655973.html)but if you think that it's big lost, I can try to improve the genericorder permission service to resolve them


Nicolas

Jacques
Jacques


Le 24/01/2016 20:06, [email protected] a écrit :
Author: nmalin
Date: Sun Jan 24 19:06:32 2016
New Revision: 1726542

URL: http://svn.apache.org/viewvc?rev=1726542&view=rev
Log:


I converted following services from simple to entity-auto :

     createOrderNotificationLog
     createOrderItemBilling
     createOrderAdjustment
     updateOrderAdjustment
     createOrderAdjustmentBilling
     createOrderShipment
     updateOrderShipment
     deleteOrderShipment
     createCommunicationEventOrder
     removeCommunicationEventOrder
     createOrderItemShipGroup
     createOrderContactMech
     removeOrderContactMech
     createOrderTerm
     removeOrderTerm
     createOrderRequirementCommitment

And from java to entity-auto for createOrderPaymentPreference
Related issue OFBIZ-6854.

Removed:
ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xmlofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderSimpleMethods.xml
     ofbiz/trunk/applications/order/servicedef/services.xml
ofbiz/trunk/applications/order/servicedef/services_requirement.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified:ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xmlURL:http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1726542&r1=1726541&r2=1726542&view=diff==============================================================================---ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml(original)+++ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xmlSun Jan 24 19:06:32 2016
@@ -88,56 +88,8 @@ under the License.
<field-to-result field="orderInfo.totalOrders"result-name="totalOrders"/>
          </if-not-empty>
      </simple-method>
- <simple-method method-name="createOrderShipment"short-description="Create OrderShipment">
-        <set value="Create OrderShipment" field="operationName"/>
-        <check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunCreateOrderShipment"/>
-        </check-permission>
-        <check-errors/>
-
- <make-value value-field="newEntity"entity-name="OrderShipment"/>
-        <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="updateOrderShipment"short-description="Update OrderShipment">
-        <set value="Update OrderShipment" field="operationName"/>
-        <check-permission permission="ORDERMGR" action="_UPDATE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunDeleteOrderShipment"/>
-        </check-permission>
-        <check-errors/>
-
- <entity-one entity-name="OrderShipment"value-field="lookedUpValue"/>- <set-nonpk-fields map="parameters"value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
- <simple-method method-name="deleteOrderShipment"short-description="Delete OrderShipment">
-        <set value="Delete OrderShipment" field="operationName"/>
-        <check-permission permission="ORDERMGR" action="_DELETE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunDeleteOrderShipment"/>
-        </check-permission>
-        <check-errors/>
-
- <entity-one entity-name="OrderShipment"value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
        
- <simple-method method-name="createOrderRequirementCommitment"short-description="Create OrderRequirementCommitment">- 
-        
- <make-value value-field="newEntity"entity-name="OrderRequirementCommitment"/>
-        <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="createRequirementAndCommitment"short-description="create a requirement and commitment for it"><set value="PRODUCT_REQUIREMENT"field="inputMap.requirementTypeId"/>
  @@ -759,20 +711,6 @@ under the License.
       </simple-method>
        
- <simple-method method-name="createOrderItemShipGroup"short-description="Create OrderItemShipGroup">
-        <check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunCreateOrderItemShipGroup"/>
-        </check-permission>
-        <check-errors/>
- <make-value value-field="newEntity"entity-name="OrderItemShipGroup"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-        <if-empty field="newEntity.shipGroupSeqId">
- <make-next-seq-id value-field="newEntity"seq-field-name="shipGroupSeqId"/> - <field-to-result field="newEntity.shipGroupSeqId"result-name="shipGroupSeqId"/>
-        </if-empty>
-        <create-value value-field="newEntity"/>
-    </simple-method>
<simple-method method-name="updateOrderItemShipGroup"short-description="Update OrderItemShipGroup">
          <check-permission permission="ORDERMGR" action="_UPDATE">
<fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunUpdateOrderItemShipGroup"/>
@@ -832,16 +770,6 @@ under the License.
<field-to-resultfield="orderItemShipGroupInvRes.promisedDatetime"result-name="estimatedShipDate"/>
      </simple-method>
- <simple-method method-name="createOrderContactMech"short-description="Create OrderContactMech">
-        <check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunCreateOrderContactMech"/>
-        </check-permission>
-        <check-errors/>
- <make-value value-field="newEntity"entity-name="OrderContactMech"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
-        <create-value value-field="newEntity"/>
-    </simple-method>
-
<simple-method method-name="removeOrderContactMech"short-description="Remove OrderContactMech">
          <check-permission permission="ORDERMGR" action="_DELETE">
<fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunRemoveOrderContactMech"/>
@@ -861,39 +789,6 @@ under the License.
          <store-value value-field="orderHeaderNote"/>
      </simple-method>
- <simple-method method-name="createOrderTerm"short-description="Create an OrderTerm">
-        <check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunCreateOrderTerm"/>
-        </check-permission>
-        <check-errors/>
-
-        <make-value value-field="newEntity" entity-name="OrderTerm"/>
-        <set-pk-fields map="parameters" value-field="newEntity"/>
- <set value="_NA_" set-if-empty="true"field="newEntity.orderItemSeqId"/>
-        <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
-        <create-value value-field="newEntity"/>
-    </simple-method>
- <simple-method method-name="updateOrderTerm"short-description="Update OrderTerm">
-        <check-permission permission="ORDERMGR" action="_DELETE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunUpdateOrderTerm"/>
-        </check-permission>
-        <check-errors/>
-
- <entity-one entity-name="OrderTerm"value-field="lookedUpValue"/>- <set-nonpk-fields map="parameters"value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-    </simple-method>
- <simple-method method-name="removeOrderTerm"short-description="Remove OrderTerm">
-        <check-permission permission="ORDERMGR" action="_DELETE">
- <fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunRemoveOrderTerm"/>
-        </check-permission>
-        <check-errors/>
-
- <entity-one entity-name="OrderTerm"value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-    </simple-method>
-
<simple-method method-name="addPaymentMethodToOrder"short-description="Create an PaymentMethodToOrder">
          <check-permission permission="ORDERMGR" action="_CREATE">
<fail-property resource="OrderErrorUiLabels"property="OrderSecurityErrorToRunAddPaymentMethodToOrder"/>
@@ -1373,7 +1268,7 @@ under the License.
              </iterate>
          </iterate>
      </simple-method>
-
+
<simple-method method-name="updateShippingMethodAndCharges"short-description="Updates shipping method and shipping charges fromOrder View page when Shipment is in picked status and items of Orderare packed">
- <service name="createOrderShipment"default-entity-name="OrderShipment" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="createOrderShipment" auth="true">+ <service name="createOrderShipment" engine="entity-auto"default-entity-name="OrderShipment" invoke="create" auth="true">
          <description>Create OrderShipment</description>
          <auto-attributes include="pk" mode="IN" optional="false"/>
          <auto-attributes include="nonpk" mode="IN" optional="true"/>
      </service>
- <service name="updateOrderShipment"default-entity-name="OrderShipment" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="updateOrderShipment" auth="true">+ <service name="updateOrderShipment" engine="entity-auto"default-entity-name="OrderShipment" invoke="update" auth="true">
          <description>Update OrderShipment</description>
          <auto-attributes include="pk" mode="IN" optional="false"/>
          <auto-attributes include="nonpk" mode="IN" optional="true"/>
      </service>
- <service name="deleteOrderShipment"default-entity-name="OrderShipment" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="deleteOrderShipment" auth="true">+ <service name="deleteOrderShipment" engine="entity-auto"default-entity-name="OrderShipment" invoke="delete" auth="true">
          <description>Delete OrderShipment</description>
          <auto-attributes include="pk" mode="IN" optional="false"/>
      </service>
@@ -667,21 +647,27 @@ under the License.
      </service>
        
-    <service name="createCommunicationEventOrder" engine="simple"
-location="component://order/script/org/ofbiz/order/communication/CommunicationEventServices.xml"invoke="createCommunicationEventOrder" auth="true">+ <service name="createCommunicationEventOrder"default-entity-name="CommunicationEventOrder" engine="entity-auto"invoke="create" auth="true">
          <description>Create a Communication Event Order</description>
- <auto-attributes entity-name="CommunicationEventOrder"include="pk" mode="IN" optional="false"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="CREATE"/>
+        </required-permissions>
+ <auto-attributes entity-name="CommunicationEventOrder"include="pk" mode="IN"/>
      </service>
-    <service name="removeCommunicationEventOrder" engine="simple"
-location="component://order/script/org/ofbiz/order/communication/CommunicationEventServices.xml"invoke="removeCommunicationEventOrder" auth="true">+ <service name="removeCommunicationEventOrder"default-entity-name="CommunicationEventOrder" engine="entity-auto"invoke="delete" auth="true">
          <description>Remove a Communication Event Order</description>
- <auto-attributes entity-name="CommunicationEventOrder"include="pk" mode="IN" optional="false"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="DELETE"/>
+        </required-permissions>
+ <auto-attributes entity-name="CommunicationEventOrder"include="pk" mode="IN"/>
      </service>
        
- <service name="createOrderItemShipGroup"default-entity-name="OrderItemShipGroup" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="createOrderItemShipGroup" auth="true">+ <service name="createOrderItemShipGroup"default-entity-name="OrderItemShipGroup" engine="entity-auto"invoke="create" auth="true">
          <description>Creates a new OrderItemShipGroup.</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="CREATE"/>
+        </required-permissions>
          <auto-attributes mode="IN" include="nonpk" optional="true"/>
<attribute name="orderId" type="String" mode="IN"optional="false"/><attribute name="shipGroupSeqId" type="String"mode="INOUT" optional="true"/>
@@ -696,42 +682,52 @@ under the License.
<attribute name="contactMechPurposeTypeId" type="String"mode="IN" optional="true"/>
      </service>
- <service name="createOrderContactMech"default-entity-name="OrderContactMech" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="createOrderContactMech" auth="true">+ <service name="createOrderContactMech"default-entity-name="OrderContactMech" engine="entity-auto"invoke="create" auth="true">
          <description>Create Order Contact Mech</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="CREATE"/>
+        </required-permissions>
          <auto-attributes include="pk" mode="IN" optional="false"/>
      </service>
  -    <service name="updateOrderContactMech" engine="simple"
-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="updateOrderContactMech" auth="true"default-entity-name="OrderContactMech">+ <service name="updateOrderContactMech"default-entity-name="OrderContactMech" engine="simple"+location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="updateOrderContactMech" auth="true">
          <description>Update Order Contact Mech</description>
          <auto-attributes include="pk" mode="IN" optional="false"/>
<attribute name="oldContactMechId" type="String" mode="IN"optional="true"/>
      </service>
- <service name="removeOrderContactMech"default-entity-name="OrderContactMech" engine="simple"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="removeOrderContactMech" auth="true">+ <service name="removeOrderContactMech"default-entity-name="OrderContactMech" engine="entity-auto"invoke="delete" auth="true">
          <description>Remove Order Contact Mech</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="DELETE"/>
+        </required-permissions>
          <auto-attributes include="pk" mode="IN" optional="false"/>
      </service>
        
-    <service name="createOrderTerm" engine="simple"
-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="createOrderTerm" auth="true">+ <service name="createOrderTerm" default-entity-name="OrderTerm"engine="entity-auto" invoke="create" auth="true">
          <description>Create an Order Term</description>
- <auto-attributes entity-name="OrderTerm" include="pk"mode="IN" optional="false"/>- <auto-attributes entity-name="OrderTerm" include="nonpk"mode="IN" optional="true"/>
-        <override name="orderItemSeqId" optional="true"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="CREATE"/>
+        </required-permissions>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="orderItemSeqId" optional="true"default-value="_NA_"/>
      </service>
-    <service name="updateOrderTerm" engine="simple"
-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="updateOrderTerm" auth="true">+ <service name="updateOrderTerm" default-entity-name="OrderTerm"engine="entity-auto" invoke="update" auth="true">
          <description>Update an Order Term</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="UPDATE"/>
+        </required-permissions>
<auto-attributes entity-name="OrderTerm" include="pk"mode="IN" optional="false"/><auto-attributes entity-name="OrderTerm" include="nonpk"mode="IN" optional="true"/>
      </service>
-    <service name="removeOrderTerm" engine="simple"
-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="removeOrderTerm" auth="true">+ <service name="removeOrderTerm" default-entity-name="OrderTerm"engine="entity-auto" invoke="delete" auth="true">
          <description>Remove an Order Term</description>
+        <required-permissions join-type="AND">
+            <check-permission permission="ORDERMGR" action="DELETE"/>
+        </required-permissions>
<auto-attributes entity-name="OrderTerm" include="pk"mode="IN" optional="false"/>
      </service>
Modified:ofbiz/trunk/applications/order/servicedef/services_requirement.xmlURL:http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services_requirement.xml?rev=1726542&r1=1726541&r2=1726542&view=diff==============================================================================---ofbiz/trunk/applications/order/servicedef/services_requirement.xml(original)+++ofbiz/trunk/applications/order/servicedef/services_requirement.xmlSun Jan 24 19:06:32 2016
@@ -105,8 +105,7 @@ under the License.
<attribute mode="OUT" name="quantityTotal"type="BigDecimal" optional="true"/><attribute mode="OUT" name="amountTotal" type="BigDecimal"optional="true"/>
      </service>
- <service name="createOrderRequirementCommitment"engine="simple" auth="true"-location="component://order/script/org/ofbiz/order/order/OrderServices.xml"invoke="createOrderRequirementCommitment">+ <service name="createOrderRequirementCommitment"engine="entity-auto" auth="true"default-entity-name="OrderRequirementCommitment" invoke="create"><auto-attributes entity-name="OrderRequirementCommitment"include="pk" mode="IN" optional="false"/><auto-attributes entity-name="OrderRequirementCommitment"include="nonpk" mode="IN" optional="true"/>
      </service>
Modified:ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.javaURL:http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1726542&r1=1726541&r2=1726542&view=diff==============================================================================---ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java(original)+++ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.javaSun Jan 24 19:06:32 2016
@@ -2824,52 +2824,6 @@ public class OrderServices {
          return ServiceUtil.returnSuccess();
      }
  -    /** Service to create an order payment preference */
- public static Map<String, Object>createPaymentPreference(DispatchContext ctx, Map<String, ? extendsObject> context) {
-        Map<String, Object> result = new HashMap<String, Object>();
-        Delegator delegator = ctx.getDelegator();
-        String orderId = (String) context.get("orderId");
-        String statusId = (String) context.get("statusId");
- String paymentMethodTypeId = (String)context.get("paymentMethodTypeId");- String paymentMethodId = (String)context.get("paymentMethodId");
-        BigDecimal maxAmount = (BigDecimal) context.get("maxAmount");
- GenericValue userLogin = (GenericValue)context.get("userLogin");
-        Locale locale = (Locale) context.get("locale");
-
-        String prefId = null;
-
-        try {
-            prefId = delegator.getNextSeqId("OrderPaymentPreference");
-        } catch (IllegalArgumentException e) {
- returnServiceUtil.returnError(UtilProperties.getMessage(resource_error,-"OrderErrorCouldNotCreateOrderPaymentPreferenceIdGenerationFailure",locale));
-        }
-
- Map<String, Object> fields = UtilMisc.<String,Object>toMap("orderPaymentPreferenceId", prefId, "orderId", orderId,"paymentMethodTypeId",- paymentMethodTypeId, "paymentMethodId",paymentMethodId, "maxAmount", maxAmount);
-
-        if (statusId != null) {
-            fields.put("statusId", statusId);
-        }
-
-        try {
- GenericValue v =delegator.makeValue("OrderPaymentPreference", fields);
-            v.set("createdDate", UtilDateTime.nowTimestamp());
-            if (userLogin != null) {
- v.set("createdByUserLogin",userLogin.getString("userLoginId"));
-            }
-            delegator.create(v);
-        } catch (GenericEntityException e) {
- result.put(ModelService.RESPONSE_MESSAGE,ModelService.RESPOND_ERROR);- result.put(ModelService.ERROR_MESSAGE,UtilProperties.getMessage(resource,- "OrderOrderPaymentPreferencesCannotBeCreated",UtilMisc.toMap("errorString", e.getMessage()), locale));
-            return ServiceUtil.returnFailure();
-        }
-        result.put("orderPaymentPreferenceId", prefId);
- result.put(ModelService.RESPONSE_MESSAGE,ModelService.RESPOND_SUCCESS);
-        return result;
-    }
-
/** Service to get order header information as standardresults. */public static Map<String, Object>getOrderHeaderInformation(DispatchContext dctx, Map<String, ?extends Object> context) {
          Delegator delegator = dctx.getDelegator();

Re: svn commit: r1726542 - in /ofbiz/trunk/applications/order: script/org/ofbiz/order/communication/ script/org/ofbiz/order/order/ servicedef/ src/org/ofbiz/order/order/

Reply via email to