Place slot facade implementations

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/PlaceBeanLocal.java

@@ -65,8 +65,10 @@ public interface PlaceBeanLocal {
 
 
 	Place unbuyPlace(Place place);
 	Place unbuyPlace(Place place);
 
 
+	@Deprecated
 	BigDecimal getTotalReservationPrice(EventUser user, Place newPlace);
 	BigDecimal getTotalReservationPrice(EventUser user, Place newPlace);
 
 
+	@Deprecated
 	BigDecimal getTotalReservationPrice(Place newPlace);
 	BigDecimal getTotalReservationPrice(Place newPlace);
 
 
 	/**
 	/**

code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceBean.java

@@ -706,7 +706,7 @@ public class PlaceBean implements PlaceBeanLocal {
 		if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS))
 		if (!permbean.isCurrentUser(user) && !permbean.hasPermission(MapPermission.MANAGE_OTHERS))
 			throw new EJBAccessException("User " + permbean.getCurrentUser() + "tried to fetch free places for user " + user);
 			throw new EJBAccessException("User " + permbean.getCurrentUser() + "tried to fetch free places for user " + user);
 
 
-		return placeSlotFacade.findFreePlaces(user);
+		return placeSlotFacade.findFreePlaceSlots(user);
 	}
 	}
 
 
 	@Override
 	@Override

code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventMapFacade.java

@@ -19,7 +19,7 @@
 package fi.codecrew.moya.facade;
 package fi.codecrew.moya.facade;
 
 
 import java.util.List;
 import java.util.List;
-
+import javax.ejb.EJBAccessException;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
@@ -50,5 +50,19 @@ public class EventMapFacade extends IntegerPkGenericFacade<EventMap> {
 		cq.where(cb.equal(root.get(EventMap_.event), eventbean.getCurrentEvent()),
 		cq.where(cb.equal(root.get(EventMap_.event), eventbean.getCurrentEvent()),
 				cb.isTrue(root.get(EventMap_.active)));
 				cb.isTrue(root.get(EventMap_.active)));
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
+		}
+		return ret;
+
+	}
+
+	@Override
+	public EventMap find(Integer id) {
+		EventMap ret = super.find(id);
+		if (ret != null && !ret.getEvent().equals(eventbean.getCurrentEvent())) {
+			throw new EJBAccessException("Trying to find map from wrong event!");
+		}
+		return ret;
+
 	}
 	}
+
 }
 }

code/moya-beans/ejbModule/fi/codecrew/moya/facade/PlaceSlotFacade.java

@@ -64,8 +64,11 @@ public class PlaceSlotFacade extends IntegerPkGenericFacade<Place> {
 		CriteriaQuery<PlaceSlot> q = cb.createQuery(PlaceSlot.class);
 		CriteriaQuery<PlaceSlot> q = cb.createQuery(PlaceSlot.class);
 		Root<PlaceSlot> root = q.from(PlaceSlot.class);
 		Root<PlaceSlot> root = q.from(PlaceSlot.class);
 		Path<Bill> bill = root.get(PlaceSlot_.bill);
 		Path<Bill> bill = root.get(PlaceSlot_.bill);
-		q.where(cb.(bill.get(Bill_.accountEvent))
-		
+		q.where(cb.equal(bill.get(Bill_.user), user),
+				cb.isNotNull(bill.get(Bill_.paidDate)),
+				cb.isNull(root.get(PlaceSlot_.used))
+				);
+		return getEm().createQuery(q).getResultList();
 	}
 	}
 	//	private List<PlaceSlot> getSlotsForUser(EventUser u) {
 	//	private List<PlaceSlot> getSlotsForUser(EventUser u) {
 	//
 	//