You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/11/21 10:15:36 UTC
svn commit: r596999 - in /ofbiz/trunk/applications/order:
servicedef/services.xml src/org/ofbiz/order/order/OrderServices.java
src/org/ofbiz/order/test/ src/org/ofbiz/order/test/OrderTestServices.java
Author: jonesde
Date: Wed Nov 21 01:15:34 2007
New Revision: 596999
URL: http://svn.apache.org/viewvc?rev=596999&view=rev
Log:
Moved test service for orders to a new file to trim down the behemoth a little; refactored to use a separate service to test the natuctored to create the orders in a separate service to test the lock wait timeout issue, and it turns out it IS related to the one huge transaction, so we have a solution to the problem in a way, but still need to find more about the nature of it and such
Added:
ofbiz/trunk/applications/order/src/org/ofbiz/order/test/
ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java (with props)
Modified:
ofbiz/trunk/applications/order/servicedef/services.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
Modified: ofbiz/trunk/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/servicedef/services.xml?rev=596999&r1=596998&r2=596999&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/order/servicedef/services.xml Wed Nov 21 01:15:34 2007
@@ -842,13 +842,24 @@
</service>
<service name="createTestSalesOrders" engine="java" auth="true" transaction-timeout="300"
- location="org.ofbiz.order.order.OrderServices" invoke="createTestSalesOrders">
+ location="org.ofbiz.order.test.OrderTestServices" invoke="createTestSalesOrders">
<description>Bulk create test sales orders. Note that default-values depend on demo data in ecommerce/data.</description>
<attribute name="productCategoryId" type="String" mode="IN" optional="true" default-value="100"/>
<attribute name="productStoreId" type="String" mode="IN" optional="true" default-value="9000"/>
<attribute name="currencyUomId" type="String" mode="IN" optional="true" default-value="USD"/>
<attribute name="partyId" type="String" mode="IN" optional="true" default-value="DemoCustomer"/>
<attribute name="numberOfOrders" type="Integer" mode="IN" optional="true" default-value="10"/>
+ <attribute name="numberOfProductsPerOrder" type="Integer" mode="IN" optional="true" default-value="5"/>
+ <attribute name="salesChannel" type="String" mode="IN" optional="true"/>
+ </service>
+ <!-- add require-new-transaction="true" to the following service to fix the lock wait timeout problem, or leave it off to cause that problem -->
+ <service name="createTestSalesOrderSingle" engine="java" auth="true" transaction-timeout="300"
+ location="org.ofbiz.order.test.OrderTestServices" invoke="createTestSalesOrderSingle">
+ <description>Bulk create test sales orders. Note that default-values depend on demo data in ecommerce/data.</description>
+ <attribute name="productCategoryId" type="String" mode="IN" optional="true" default-value="100"/>
+ <attribute name="productStoreId" type="String" mode="IN" optional="true" default-value="9000"/>
+ <attribute name="currencyUomId" type="String" mode="IN" optional="true" default-value="USD"/>
+ <attribute name="partyId" type="String" mode="IN" optional="true" default-value="DemoCustomer"/>
<attribute name="numberOfProductsPerOrder" type="Integer" mode="IN" optional="true" default-value="5"/>
<attribute name="salesChannel" type="String" mode="IN" optional="true"/>
</service>
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=596999&r1=596998&r2=596999&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Nov 21 01:15:34 2007
@@ -4515,88 +4515,4 @@
result.put("invoicedQuantity", invoicedQuantity.setScale(orderDecimals, orderRounding));
return result;
}
-
- public static Map createTestSalesOrders(DispatchContext dctx, Map context) {
- LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
- Locale locale = (Locale) context.get("locale");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
-
- String productCategoryId = (String) context.get("productCategoryId");
- String productStoreId = (String) context.get("productStoreId");
- String currencyUomId = (String) context.get("currencyUomId");
- String partyId = (String) context.get("partyId");
- Integer numberOfOrders = (Integer) context.get("numberOfOrders");
- Integer numberOfProductsPerOrder = (Integer) context.get("numberOfProductsPerOrder");
- String salesChannel = (String) context.get("salesChannel");
- if (UtilValidate.isEmpty(salesChannel)) {
- salesChannel = "WEB_SALES_CHANNEL";
- }
-
- List productsList = FastList.newInstance();
- try {
- Map result = dispatcher.runSync("getProductCategoryMembers", UtilMisc.toMap("categoryId", productCategoryId));
- if (result.get("categoryMembers") != null) {
- List productCategoryMembers = (List)result.get("categoryMembers");
- if (productCategoryMembers != null) {
- Iterator i = productCategoryMembers.iterator();
- while (i.hasNext()) {
- GenericValue prodCatMemb = (GenericValue) i.next();
- if (prodCatMemb != null) {
- productsList.add(prodCatMemb.getString("productId"));
- }
- }
- }
- }
- } catch (Exception e) {
- return ServiceUtil.returnError("The following error occurred: " + e.getMessage());
- }
- if (productsList.size() == 0) {
- return ServiceUtil.returnError("No products found in category [" + productCategoryId + "]; no orders will be created");
- }
-
-
- Random r = new Random();
- int numberOfOrdersInt = numberOfOrders.intValue();
- int numberOfProductsPerOrderInt = numberOfProductsPerOrder.intValue();
- for (int i = 1; i <= numberOfOrdersInt; i++) {
- ShoppingCart cart = new ShoppingCart(delegator, productStoreId, locale, currencyUomId);
- cart.setOrderType("SALES_ORDER");
- cart.setChannelType(salesChannel);
- cart.setProductStoreId(productStoreId);
-
- cart.setBillToCustomerPartyId(partyId);
- cart.setPlacingCustomerPartyId(partyId);
- cart.setShipToCustomerPartyId(partyId);
- cart.setEndUserCustomerPartyId(partyId);
- try {
- cart.setUserLogin(userLogin, dispatcher);
- } catch (Exception exc) {
- Debug.logWarning("Error setting userLogin in the cart: " + exc.getMessage(), module);
- }
- for (int j = 1; j <= numberOfProductsPerOrderInt; j++) {
- // get a product
- int k = r.nextInt(productsList.size());
- try {
- cart.addOrIncreaseItem((String)productsList.get(k), null, 1, null, null, null,
- null, null, null, null,
- null /*catalogId*/, null, null/*itemType*/, null/*itemGroupNumber*/, null, dispatcher);
- } catch (Exception exc) {
- Debug.logWarning("Error adding product with id " + (String)productsList.get(k) + " to the cart: " + exc.getMessage(), module);
- }
- }
- cart.setDefaultCheckoutOptions(dispatcher);
- CheckOutHelper checkout = new CheckOutHelper(dispatcher, delegator, cart);
- Map orderCreate = checkout.createOrder(userLogin);
- String orderId = (String)orderCreate.get("orderId");
-
- // approve the order
- if (UtilValidate.isNotEmpty(orderId)) {
- Debug.logInfo("Created test order with id: " + orderId, module);
- boolean approved = OrderChangeHelper.approveOrder(dispatcher, userLogin, orderId);
- Debug.logInfo("Test order with id: " + orderId + " has been approved: " + approved, module);
- }
- }
- return ServiceUtil.returnSuccess();
- }
}
Added: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java?rev=596999&view=auto
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java (added)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java Wed Nov 21 01:15:34 2007
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+package org.ofbiz.order.test;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.*;
+
+import javolution.util.FastList;
+import javolution.util.FastMap;
+
+import org.ofbiz.base.util.*;
+import org.ofbiz.base.util.collections.ResourceBundleMapWrapper;
+import org.ofbiz.common.DataModelConstants;
+import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.GenericEntity;
+import org.ofbiz.entity.GenericEntityException;
+import org.ofbiz.entity.GenericValue;
+import org.ofbiz.entity.transaction.TransactionUtil;
+import org.ofbiz.entity.transaction.GenericTransactionException;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.condition.EntityConditionList;
+import org.ofbiz.entity.condition.EntityExpr;
+import org.ofbiz.entity.condition.EntityOperator;
+import org.ofbiz.entity.util.EntityListIterator;
+import org.ofbiz.entity.util.EntityUtil;
+import org.ofbiz.order.order.OrderChangeHelper;
+import org.ofbiz.order.shoppingcart.CartItemModifyException;
+import org.ofbiz.order.shoppingcart.CheckOutHelper;
+import org.ofbiz.order.shoppingcart.ItemNotFoundException;
+import org.ofbiz.order.shoppingcart.ShoppingCart;
+import org.ofbiz.order.shoppingcart.ShoppingCartItem;
+import org.ofbiz.order.shoppingcart.shipping.ShippingEvents;
+import org.ofbiz.party.contact.ContactHelper;
+import org.ofbiz.party.party.PartyWorker;
+import org.ofbiz.product.product.ProductWorker;
+import org.ofbiz.product.store.ProductStoreWorker;
+import org.ofbiz.security.Security;
+import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
+import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ModelService;
+import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.workflow.WfUtil;
+
+import javax.transaction.Transaction;
+
+/**
+ * Order Processing Services
+ */
+
+public class OrderTestServices {
+
+ public static final String module = OrderTestServices.class.getName();
+
+ public static Map createTestSalesOrders(DispatchContext dctx, Map context) {
+ LocalDispatcher dispatcher = dctx.getDispatcher();
+ Integer numberOfOrders = (Integer) context.get("numberOfOrders");
+
+ int numberOfOrdersInt = numberOfOrders.intValue();
+ for (int i = 1; i <= numberOfOrdersInt; i++) {
+ try {
+ ModelService modelService = dctx.getModelService("createTestSalesOrderSingle");
+ dispatcher.runSync("createTestSalesOrderSingle", modelService.makeValid(context, ModelService.IN_PARAM));
+ } catch (GenericServiceException e) {
+ String errMsg = "Error calling createTestSalesOrderSingle: " + e.toString();
+ Debug.logError(e, errMsg, module);
+ }
+ }
+ return ServiceUtil.returnSuccess();
+ }
+
+ public static Map createTestSalesOrderSingle(DispatchContext dctx, Map context) {
+ LocalDispatcher dispatcher = dctx.getDispatcher();
+ GenericDelegator delegator = dctx.getDelegator();
+ Locale locale = (Locale) context.get("locale");
+ GenericValue userLogin = (GenericValue) context.get("userLogin");
+
+ String productCategoryId = (String) context.get("productCategoryId");
+ String productStoreId = (String) context.get("productStoreId");
+ String currencyUomId = (String) context.get("currencyUomId");
+ String partyId = (String) context.get("partyId");
+ Integer numberOfOrders = (Integer) context.get("numberOfOrders");
+ Integer numberOfProductsPerOrder = (Integer) context.get("numberOfProductsPerOrder");
+ String salesChannel = (String) context.get("salesChannel");
+ if (UtilValidate.isEmpty(salesChannel)) {
+ salesChannel = "WEB_SALES_CHANNEL";
+ }
+
+ int numberOfProductsPerOrderInt = numberOfProductsPerOrder.intValue();
+
+ List productsList = FastList.newInstance();
+ try {
+ Map result = dispatcher.runSync("getProductCategoryMembers", UtilMisc.toMap("categoryId", productCategoryId));
+ if (result.get("categoryMembers") != null) {
+ List productCategoryMembers = (List)result.get("categoryMembers");
+ if (productCategoryMembers != null) {
+ Iterator i = productCategoryMembers.iterator();
+ while (i.hasNext()) {
+ GenericValue prodCatMemb = (GenericValue) i.next();
+ if (prodCatMemb != null) {
+ productsList.add(prodCatMemb.getString("productId"));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ return ServiceUtil.returnError("The following error occurred: " + e.getMessage());
+ }
+ if (productsList.size() == 0) {
+ return ServiceUtil.returnError("No products found in category [" + productCategoryId + "]; no orders will be created");
+ }
+
+ Random r = new Random();
+
+ ShoppingCart cart = new ShoppingCart(delegator, productStoreId, locale, currencyUomId);
+ cart.setOrderType("SALES_ORDER");
+ cart.setChannelType(salesChannel);
+ cart.setProductStoreId(productStoreId);
+
+ cart.setBillToCustomerPartyId(partyId);
+ cart.setPlacingCustomerPartyId(partyId);
+ cart.setShipToCustomerPartyId(partyId);
+ cart.setEndUserCustomerPartyId(partyId);
+ try {
+ cart.setUserLogin(userLogin, dispatcher);
+ } catch (Exception exc) {
+ Debug.logWarning("Error setting userLogin in the cart: " + exc.getMessage(), module);
+ }
+ for (int j = 1; j <= numberOfProductsPerOrderInt; j++) {
+ // get a product
+ int k = r.nextInt(productsList.size());
+ try {
+ cart.addOrIncreaseItem((String) productsList.get(k), null, 1, null, null, null,
+ null, null, null, null,
+ null /*catalogId*/, null, null/*itemType*/, null/*itemGroupNumber*/, null, dispatcher);
+ } catch (Exception exc) {
+ Debug.logWarning("Error adding product with id " + (String) productsList.get(k) + " to the cart: " + exc.getMessage(), module);
+ }
+ }
+ cart.setDefaultCheckoutOptions(dispatcher);
+ CheckOutHelper checkout = new CheckOutHelper(dispatcher, delegator, cart);
+ Map orderCreateResult = checkout.createOrder(userLogin);
+ String orderId = (String) orderCreateResult.get("orderId");
+
+ // approve the order
+ if (UtilValidate.isNotEmpty(orderId)) {
+ Debug.logInfo("Created test order with id: " + orderId, module);
+ boolean approved = OrderChangeHelper.approveOrder(dispatcher, userLogin, orderId);
+ Debug.logInfo("Test order with id: " + orderId + " has been approved: " + approved, module);
+ }
+
+ return ServiceUtil.returnSuccess();
+ }
+}
Propchange: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java
------------------------------------------------------------------------------
svn:mime-type = text/plain