Move placelocking from billing to accountevent.

When accountevent is bougt to user placegroup, etc should also be created, so move
placelocking code from bill paid marking to accounteventcreation.

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BillBean.java

@@ -72,7 +72,7 @@ public class BillBean implements BillBeanLocal {
 	private EventUserFacade eventUserFacade;
 	private EventUserFacade eventUserFacade;
 	@EJB
 	@EJB
 	private ProductPBean productPBean;
 	private ProductPBean productPBean;
-	
+
 	@EJB
 	@EJB
 	private DiscountBean discountBean;
 	private DiscountBean discountBean;
 
 
@@ -232,7 +232,7 @@ public class BillBean implements BillBeanLocal {
 		ac.setEventTime(when);
 		ac.setEventTime(when);
 		ac.setBill(bill);
 		ac.setBill(bill);
 		ac.setSeller(permbean.getCurrentUser());
 		ac.setSeller(permbean.getCurrentUser());
-		
+
 		bill.setAccountEvent(ac);
 		bill.setAccountEvent(ac);
 		bill.setPaidDate(when.getTime());
 		bill.setPaidDate(when.getTime());
 
 
@@ -244,10 +244,6 @@ public class BillBean implements BillBeanLocal {
 			if (prod != null && prod.getProductFlags().contains(ProductFlag.PREPAID_INSTANT_CREATE)) {
 			if (prod != null && prod.getProductFlags().contains(ProductFlag.PREPAID_INSTANT_CREATE)) {
 
 
 				logger.debug("Creating Bill prepaidInstant product {}, {}", prod.getName(), bl.getQuantity());
 				logger.debug("Creating Bill prepaidInstant product {}, {}", prod.getName(), bl.getQuantity());
-				if (prod.getProductFlags().contains(ProductFlag.RESERVE_PLACE_WHEN_BOUGHT)
-						|| prod.getProductFlags().contains(ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT)) {
-					placebean.lockPlaceProduct(bill.getUser(), prod, bl.getQuantity());
-				}
 
 
 				AccountEvent ac2 = productPBean.createAccountEvent(prod, bl.getQuantity(), user, bill.getSentDate(), bl.getFoodwave());
 				AccountEvent ac2 = productPBean.createAccountEvent(prod, bl.getQuantity(), user, bill.getSentDate(), bl.getFoodwave());
 				logger.info("Created ac from product. {}, userproducts {}", ac2, user.getAccountEvents().size());
 				logger.info("Created ac from product. {}, userproducts {}", ac2, user.getAccountEvents().size());
@@ -311,7 +307,7 @@ public class BillBean implements BillBeanLocal {
 		bill.markExpired();
 		bill.markExpired();
 		return bill;
 		return bill;
 	}
 	}
-	
+
 	@Override
 	@Override
 	public Bill addProductToBill(Bill bill, Product product, BigDecimal count) {
 	public Bill addProductToBill(Bill bill, Product product, BigDecimal count) {
 		return this.addProductToBill(bill, product, count, null);
 		return this.addProductToBill(bill, product, count, null);
@@ -319,30 +315,25 @@ public class BillBean implements BillBeanLocal {
 
 
 	@Override
 	@Override
 	public Bill addProductToBill(Bill bill, Product product, BigDecimal count, FoodWave foodwave) {
 	public Bill addProductToBill(Bill bill, Product product, BigDecimal count, FoodWave foodwave) {
-		
-		
-		
+
 		// If bill number > 0 bill has been sent and extra privileges are needed
 		// If bill number > 0 bill has been sent and extra privileges are needed
-        // to modify.
-        // if (!iscurrent || billnr != null) {
-        // permbean.fatalPermission(BillPermission.WRITE_ALL,
-        // "User tried to modify bill ", bill,
-        // "without sufficient permissions");
-        // }
-        if (bill.getBillLines() == null) {
-        	bill.setBillLines(new ArrayList<BillLine>());
-        }
-        
-        bill.getBillLines().add(new BillLine(bill, product, count, foodwave));
-
-        for (Discount disc : discountBean.getActiveDiscountsByProduct(product, count, bill.getSentDate(), bill.getUser())) {
-        	bill.getBillLines().add(new BillLine(bill, product, disc, count));
-        }
-        
-        return bill;
+		// to modify.
+		// if (!iscurrent || billnr != null) {
+		// permbean.fatalPermission(BillPermission.WRITE_ALL,
+		// "User tried to modify bill ", bill,
+		// "without sufficient permissions");
+		// }
+		if (bill.getBillLines() == null) {
+			bill.setBillLines(new ArrayList<BillLine>());
+		}
+
+		bill.getBillLines().add(new BillLine(bill, product, count, foodwave));
+
+		for (Discount disc : discountBean.getActiveDiscountsByProduct(product, count, bill.getSentDate(), bill.getUser())) {
+			bill.getBillLines().add(new BillLine(bill, product, disc, count));
+		}
+
+		return bill;
 	}
 	}
-	
-	
-	
 
 
 }
 }

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ProductPBean.java

@@ -20,6 +20,7 @@ import fi.codecrew.moya.model.DiscountInstance;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.Product;
 import fi.codecrew.moya.model.Product;
+import fi.codecrew.moya.model.ProductFlag;
 
 
 /**
 /**
  * Session Bean implementation class ProductPBean
  * Session Bean implementation class ProductPBean
@@ -35,6 +36,10 @@ public class ProductPBean {
 	private DiscountBean discountBean;
 	private DiscountBean discountBean;
 	@EJB
 	@EJB
 	private AccountEventFacade accounteventfacade;
 	private AccountEventFacade accounteventfacade;
+
+	@EJB
+	private PlaceBean placebean;
+
 	private static final Logger logger = LoggerFactory
 	private static final Logger logger = LoggerFactory
 			.getLogger(ProductPBean.class);
 			.getLogger(ProductPBean.class);
 
 
@@ -94,6 +99,11 @@ public class ProductPBean {
 			foodwave.getAccountEvents().add(ret);
 			foodwave.getAccountEvents().add(ret);
 		}
 		}
 
 
+		if (product.getProductFlags().contains(ProductFlag.RESERVE_PLACE_WHEN_BOUGHT)
+				|| product.getProductFlags().contains(ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT)) {
+			placebean.lockPlaceProduct(user, product, quantity);
+		}
+
 		List<DiscountInstance> accEventdiscounts = ret.getDiscountInstances();
 		List<DiscountInstance> accEventdiscounts = ret.getDiscountInstances();
 		for (Discount d : discounts) {
 		for (Discount d : discounts) {
 			// discountsArray.add(discInst);
 			// discountsArray.add(discInst);