Refactory EventOrganizer entity to not hold all events

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

@@ -71,4 +71,6 @@ public interface EventBeanLocal {
 	List<LanEvent> findFutureAndRunningEventsForCurrentUser();
 	List<LanEvent> findFutureAndRunningEventsForCurrentUser();
 
 
 	List<LanEvent> findFutureEvents();
 	List<LanEvent> findFutureEvents();
+
+	List<LanEvent> findAllEventsForOrganizer(EventOrganiser organiser);
 }
 }

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

@@ -373,4 +373,10 @@ public class EventBean implements EventBeanLocal {
 		return eventFacade.findFutureEvents();
 		return eventFacade.findFutureEvents();
 	}
 	}
 
 
+	@Override
+	@RolesAllowed(EventPermission.S_MANAGE_EVENT)
+	public List<LanEvent> findAllEventsForOrganizer(EventOrganiser organiser) {
+		return eventFacade.findForOrganizer(organiser);
+	}
+
 }
 }

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

@@ -128,4 +128,13 @@ public class EventFacade extends IntegerPkGenericFacade<LanEvent> {
 
 
 		return getEm().createQuery(cq).getResultList();
 		return getEm().createQuery(cq).getResultList();
 	}
 	}
+
+	public List<LanEvent> findForOrganizer(EventOrganiser organizer) {
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<LanEvent> cq = cb.createQuery(LanEvent.class);
+		Root<LanEvent> root = cq.from(LanEvent.class);
+
+		cq.where(cb.equal(root.get(LanEvent_.organiser), organizer));
+		return getEm().createQuery(cq).getResultList();
+	}
 }
 }

code/moya-database/src/main/java/fi/codecrew/moya/model/EventOrganiser.java

@@ -42,10 +42,6 @@ public class EventOrganiser extends GenericEntity {
     @Column(name = "bundle_country")
     @Column(name = "bundle_country")
     private String bundleCountry;
     private String bundleCountry;
 
 
-    @OrderBy
-    @OneToMany(cascade = CascadeType.ALL, mappedBy = "organiser")
-    private List<LanEvent> events;
-
     @Column(nullable = false, name = "bill_address1")
     @Column(nullable = false, name = "bill_address1")
     private String billAddress1 = "";
     private String billAddress1 = "";
     @Column(nullable = false, name = "bill_address2")
     @Column(nullable = false, name = "bill_address2")
@@ -63,14 +59,6 @@ public class EventOrganiser extends GenericEntity {
     @Column(nullable = false, name = "bank_name2")
     @Column(nullable = false, name = "bank_name2")
     private String bankName2 = "";
     private String bankName2 = "";
 
 
-    public List<LanEvent> getEvents() {
-        return events;
-    }
-
-    public void setEvents(List<LanEvent> eventList) {
-        this.events = eventList;
-    }
-
     /**
     /**
      * @return the organisation
      * @return the organisation
      */
      */

code/moya-web/WebContent/eventorg/edit.xhtml

@@ -70,7 +70,7 @@
 			</h:form>
 			</h:form>
 
 
 			<h2>#{i18n['eventorg.events']}</h2>
 			<h2>#{i18n['eventorg.events']}</h2>
-			<h:dataTable border="1" id="org" value="#{eventorgView.eventorg.events}" var="event">
+			<h:dataTable border="1" id="org" value="#{eventorgView.organizersEvents}" var="event">
 				<h:column>
 				<h:column>
 					<f:facet name="header">
 					<f:facet name="header">
 						<h:outputText value="${i18n['event.name']}" />
 						<h:outputText value="${i18n['event.name']}" />

code/moya-web/WebContent/eventorg/editEvent.xhtml

@@ -129,7 +129,7 @@
 			<p:fieldset legend="Tools" toggleable="true" collapsed="true">
 			<p:fieldset legend="Tools" toggleable="true" collapsed="true">
 				<h:form>
 				<h:form>
 					<p:selectOneMenu value="#{eventorgView.copyParty}" converter="#{lanEventConverter}">
 					<p:selectOneMenu value="#{eventorgView.copyParty}" converter="#{lanEventConverter}">
-						<f:selectItems value="#{eventorgView.event.organiser.events}" var="e" itemLabel="#{e.name}" />
+						<f:selectItems value="#{eventorgView.organizersEvents}" var="e" itemLabel="#{e.name}" />
 					</p:selectOneMenu>
 					</p:selectOneMenu>
 					
 					
 					<h:commandButton action="#{eventorgView.copySiteContent}" value="#{i18n['event.copySiteContent']}" />
 					<h:commandButton action="#{eventorgView.copySiteContent}" value="#{i18n['event.copySiteContent']}" />

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/organisation/EventOrgView.java

@@ -70,6 +70,7 @@ public class EventOrgView extends GenericCDIView {
 	private String eventname;
 	private String eventname;
 
 
 	private List<EventOrganiser> organisations;
 	private List<EventOrganiser> organisations;
+	private List<LanEvent> oragnizersEvents;
 
 
 	private Integer eventid;
 	private Integer eventid;
 
 
@@ -86,28 +87,38 @@ public class EventOrgView extends GenericCDIView {
 
 
 	ScheduleModel eventsCalendar = null;
 	ScheduleModel eventsCalendar = null;
 
 
-	public void initCreate()
-	{
+	public void initCreate() {
 		if (super.requirePermissions(user.getUser().isSuperadmin())) {
 		if (super.requirePermissions(user.getUser().isSuperadmin())) {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}
 
 
-	public String removeDomain()
-	{
+	public String removeDomain() {
 		event.getDomains().remove(eventdomains.getRowData());
 		event.getDomains().remove(eventdomains.getRowData());
 		setEvent(eventbean.mergeChanges(event));
 		setEvent(eventbean.mergeChanges(event));
 		return null;
 		return null;
 	}
 	}
 
 
-	public String saveEvent()
-	{
+
+	public List<LanEvent> getOrganizersEvents() {
+		if (oragnizersEvents == null) {
+			EventOrganiser org = eventorg;
+			if (org == null && event != null) {
+				org = event.getOrganiser();
+			}
+			if (org != null) {
+				oragnizersEvents = eventbean.findAllEventsForOrganizer(org);
+			}
+		}
+		return oragnizersEvents;
+	}
+
+	public String saveEvent() {
 		setEvent(eventbean.mergeChanges(event));
 		setEvent(eventbean.mergeChanges(event));
 		return null;
 		return null;
 	}
 	}
 
 
-	public String saveEventorg()
-	{
+	public String saveEventorg() {
 		setEventorg(eventbean.mergeChanges(eventorg));
 		setEventorg(eventbean.mergeChanges(eventorg));
 		return null;
 		return null;
 	}
 	}
@@ -145,39 +156,29 @@ public class EventOrgView extends GenericCDIView {
 		}
 		}
 	}
 	}
 
 
-	public void initEditEvent()
-	{
-		if (eventid != null && super.requirePermissions(user.getUser().isSuperadmin() || eventorgbean.hasEventPermission(eventid)) && getEvent() == null)
-		{
+	public void initEditEvent() {
+		if (eventid != null && super.requirePermissions(user.getUser().isSuperadmin() || eventorgbean.hasEventPermission(eventid)) && getEvent() == null) {
 			setEvent(eventorgbean.findEvent(eventid));
 			setEvent(eventorgbean.findEvent(eventid));
 			super.beginConversation();
 			super.beginConversation();
-		} else if (super.requirePermissions(EventPermission.MANAGE_PROPERTIES) && getEvent() == null)
-		{
+		} else if (super.requirePermissions(EventPermission.MANAGE_PROPERTIES) && getEvent() == null) {
 			setEvent(eventbean.getCurrentEvent());
 			setEvent(eventbean.getCurrentEvent());
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}
 	}
 	}
 
 
-	public String createEvent()
-	{
-		if (eventorg.getEvents() == null) {
-			eventorg.setEvents(new ArrayList<LanEvent>());
-		}
+	public String createEvent() {
+
 		event = new LanEvent();
 		event = new LanEvent();
 		event.setName(eventname);
 		event.setName(eventname);
 		event.setOrganiser(eventorg);
 		event.setOrganiser(eventorg);
 		eventname = "";
 		eventname = "";
-		eventorg.getEvents().add(getEvent());
 		eventbean.create(event);
 		eventbean.create(event);
 
 
-		//eventorg = eventorgbean.save(eventorg);
-
 		return "/eventorg/editEvent";
 		return "/eventorg/editEvent";
 
 
 	}
 	}
 
 
-	public String create()
-	{
+	public String create() {
 
 
 		eventorg = eventorgbean.create(createorgname);
 		eventorg = eventorgbean.create(createorgname);
 		createorgname = "";
 		createorgname = "";
@@ -314,7 +315,7 @@ public class EventOrgView extends GenericCDIView {
 
 
 	public List<User> getSuperUsers() {
 	public List<User> getSuperUsers() {
 
 
-		if(!permbean.getCurrentUser().isSuperadmin())
+		if (!permbean.getCurrentUser().isSuperadmin())
 			return new ArrayList<User>();
 			return new ArrayList<User>();
 
 
 		return userBean.findSuperusers();
 		return userBean.findSuperusers();

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/CreditTransferView.java

@@ -61,8 +61,7 @@ public class CreditTransferView extends GenericCDIView {
 			wrap.add(new EventUserWrapper(u));
 			wrap.add(new EventUserWrapper(u));
 		}
 		}
 		this.users = wrap;
 		this.users = wrap;
-		events = eventbean.getCurrentEvent().getOrganiser().getEvents();
-
+		events = eventbean.findAllEventsForOrganizer(eventbean.getCurrentEvent().getOrganiser());
 	}
 	}
 
 
 	public String selectEvent() {
 	public String selectEvent() {

code/moya-web/src/main/java/fi/codecrew/moya/web/converter/CurrentEventorgEventConverter.java

@@ -37,14 +37,11 @@ public class CurrentEventorgEventConverter extends GenericIntegerEntityConverter
 	protected LanEvent find(Integer id) {
 	protected LanEvent find(Integer id) {
 		LanEvent ret = null;
 		LanEvent ret = null;
 		LanEvent curr = eventbean.getCurrentEvent();
 		LanEvent curr = eventbean.getCurrentEvent();
-		if (curr.getId().equals(id))
-		{
+		if (curr.getId().equals(id)) {
 			ret = curr;
 			ret = curr;
 		} else {
 		} else {
-			for (LanEvent e : curr.getOrganiser().getEvents())
-			{
-				if (e.getId().equals(id))
-				{
+			for (LanEvent e : eventbean.findAllEventsForOrganizer(curr.getOrganiser())) {
+				if (e.getId().equals(id)) {
 					ret = e;
 					ret = e;
 					break;
 					break;
 				}
 				}