More tournament stuff

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

@@ -9,9 +9,12 @@ import javax.ejb.Stateless;
 import fi.codecrew.moya.enums.TournamentStatus;
 import fi.codecrew.moya.facade.TournamentFacade;
 import fi.codecrew.moya.facade.TournamentGameFacade;
+import fi.codecrew.moya.facade.TournamentParticipantFacade;
 import fi.codecrew.moya.facade.TournamentRuleFacade;
+import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Tournament;
 import fi.codecrew.moya.model.TournamentGame;
+import fi.codecrew.moya.model.TournamentParticipant;
 import fi.codecrew.moya.model.TournamentRule;
 
 /**
@@ -24,6 +27,7 @@ public class TournamentBean implements TournamentBeanLocal {
 	@EJB private TournamentRuleFacade tournamentRuleFacade;
 	@EJB private TournamentGameFacade tournamentGameFacade;
 	@EJB private TournamentFacade tournamentFacade;
+	@EJB private TournamentParticipantFacade tournamentParticipantFacade;
 	
     /**
      * Default constructor. 
@@ -92,4 +96,29 @@ public class TournamentBean implements TournamentBeanLocal {
 		tournament = tournamentFacade.merge(tournament);
 		tournamentFacade.remove(tournament);
 	}
+
+	@Override
+	public void createParticipation(TournamentParticipant tournamentParticipant) throws Exception {
+		Tournament t = tournamentFacade.find(tournamentParticipant.getTournament().getId());
+		if(t.getParticipants().size() < t.getMaxParticipants()) {
+			tournamentParticipant = tournamentParticipantFacade.create(tournamentParticipant);
+			t.getParticipants().add(tournamentParticipant);
+		} else {
+			throw new Exception("tournament.participation_full");
+		}
+	}
+
+	@Override
+	public boolean hasParticipations(EventUser currentUser, Tournament tournament) {
+		for(TournamentParticipant tp : tournament.getParticipants()) {
+			for(EventUser eu : tp.getTeamMembers()) {
+				System.out.println(eu.getNick());
+				if(eu.equals(currentUser)) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
 }

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/TournamentFacade.java

@@ -9,7 +9,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
 import fi.codecrew.moya.enums.TournamentStatus;
+import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Tournament;
+import fi.codecrew.moya.model.TournamentParticipant;
 import fi.codecrew.moya.model.Tournament_;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User_;

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/TournamentBeanLocal.java

@@ -5,8 +5,10 @@ import java.util.List;
 import javax.ejb.Local;
 
 import fi.codecrew.moya.enums.TournamentStatus;
+import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Tournament;
 import fi.codecrew.moya.model.TournamentGame;
+import fi.codecrew.moya.model.TournamentParticipant;
 import fi.codecrew.moya.model.TournamentRule;
 
 @Local
@@ -24,5 +26,7 @@ public interface TournamentBeanLocal {
 	Tournament getTournamentById(Integer tournamentId);
 	void editTournament(Tournament tournament);
 	void deleteTournament(Tournament tournament);
+	void createParticipation(TournamentParticipant tournamentParticipant) throws Exception;
+	boolean hasParticipations(EventUser currentUser, Tournament tournament);
 
 }

code/MoyaDatabase/src/fi/codecrew/moya/model/Tournament.java

@@ -72,11 +72,15 @@ public class Tournament extends GenericEntity implements Serializable {
     @JoinColumn(name="rules", nullable=false)
     private TournamentRule rules;
 
-    @OneToMany
+    @ManyToOne
+    @JoinColumn(name="parent_tournament")
+    private Tournament parentTournament;
+    
+    @OneToMany(mappedBy="parentTournament")
     @OrderBy("id ASC")
     private List<Tournament> subTournaments;
     
-    @OneToMany
+    @OneToMany(mappedBy="tournament")
     private List<TournamentParticipant> participants;
     
     public Tournament() { super(); }

code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentMatch.java

@@ -43,7 +43,6 @@ public class TournamentMatch extends GenericEntity implements Serializable {
     @Temporal(TemporalType.TIMESTAMP)
     private Date endTime;
     
-    @OneToMany
     @OrderBy("rank")
     private List<TournamentMatchResult> matchResults;
     

code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentParticipant.java

@@ -32,4 +32,29 @@ public class TournamentParticipant extends GenericEntity implements Serializable
     public TournamentParticipant() {
         super();
     }
+
+    public EventUser getParticipator() {
+        return participator;
+    }
+
+    public void setParticipator(EventUser participator) {
+        this.participator = participator;
+    }
+
+    public List<EventUser> getTeamMembers() {
+        return teamMembers;
+    }
+
+    public void setTeamMembers(List<EventUser> teamMembers) {
+        this.teamMembers = teamMembers;
+    }
+
+    public Tournament getTournament() {
+        return tournament;
+    }
+
+    public void setTournament(Tournament tournament) {
+        this.tournament = tournament;
+    }
+    
 }

code/MoyaWeb/WebContent/tournaments/admin/createwizard.xhtml

@@ -81,7 +81,7 @@
 							</h:selectOneMenu>
 							
 							<br />
-							<h:outputText value="#{i18n['tournaments.players_per_match']}" />
+							<h:outputText value="#{i18n['tournaments.max_participants']}" />
 							<h:panelGrid columns="1" style="margin-bottom:10px">
 							    <p:inputText id="maxPartSlider" value="#{tournamentCreateView.tournament.maxParticipants}" /> 
 							    <p:slider for="maxPartSlider" />  

code/MoyaWeb/WebContent/tournaments/index.xhtml

@@ -5,14 +5,13 @@
 <h:body>
 	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
-			<f:event type="preRenderView" listener="#{tournamentListView.initView()}" />
 		</f:metadata>
 
 		<ui:define name="content">
-			<h1>#{i18n['tournaments.title']}</h1>
-			<p>#{i18n['tournaments.description']}</p>
-			
-			<h:panelGroup rendered="#{not empty tournamentListView.setupPhaseTournaments}">
+			<h:form>
+				<p:messages autoUpdate="true" redisplay="false"></p:messages>
+				<h1>#{i18n['tournaments.title']}</h1>
+				<p>#{i18n['tournaments.description']}</p>
 				<h2>#{i18n['tournaments.open_tournaments']}</h2>
 				<p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament">
 	 				<p:column>
@@ -51,8 +50,17 @@
 						</f:facet>
 						<h:outputText value="#{tournament.rules.name}" />
 					</p:column>
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['tournament.control']}" />
+						</f:facet>
+						<h:panelGroup>
+							<p:commandButton value="#{i18n['tournament.participate']}" action="#{tournamentParticipateView.participate(tournament.id)}" rendered="#{tournament.participants.size() lt tournament.maxParticipants}" ajax="false"/>
+							<h:outputText value="#{i18n['tournament.full']}" rendered="#{tournament.participants.size() ge tournament.maxParticipants}"/>
+						</h:panelGroup>
+					</p:column>
 	 			</p:dataTable>
-			</h:panelGroup>
+ 			</h:form>
 		</ui:define>
 	</ui:composition>
 </h:body>

code/MoyaWeb/WebContent/tournaments/participate_single.xhtml

+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core">
+<h:body>
+	<ui:composition template="#{sessionHandler.template}">
+		<f:metadata>
+		</f:metadata>
+
+		<ui:define name="content">
+			<h1>#{i18n['tournaments.participate_title']} #{tournamentParticipateView.tournament.tournamentName}</h1>
+			<p>#{i18n['tournaments.participate_description']}</p>
+			<h2>#{i18n['tournaments.participate_rules']}</h2>
+			<p><h:outputText value="#{tournamentParticipateView.tournament.rules.rules}" escape="false" /></p>
+			
+			<h:form>
+				<p:commandButton value="#{i18n['tournaments.cancel_participation']}" action="#{tournamentParticipateView.cancelParticipation}" />
+				<p:commandButton value="#{i18n['tournaments.accept_rules_and_participate']}" action="#{tournamentParticipateView.saveParticipation}" />
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentListView.java

@@ -15,26 +15,16 @@ import fi.codecrew.moya.model.Tournament;
 public class TournamentListView {
 	
 	@EJB private TournamentBeanLocal tournamentBean;
-	private List<Tournament> setupPhaseTournaments;
-	private List<Tournament> inProgressTournaments;
-	private List<Tournament> completedTournaments;
-	
-	
-	public void initView() {
-    	setupPhaseTournaments = tournamentBean.getTournamentsInStatus(TournamentStatus.SETUP);
-    	inProgressTournaments = tournamentBean.getTournamentsInStatus(TournamentStatus.IN_PROGRESS);
-    	completedTournaments = tournamentBean.getTournamentsInStatus(TournamentStatus.COMPLETED);
-    }
 	
 	public List<Tournament> getSetupPhaseTournaments() {
-		return setupPhaseTournaments;
+		return tournamentBean.getTournamentsInStatus(TournamentStatus.SETUP);
 	}
 	
 	public List<Tournament> getInProgressTournaments() {
-		return inProgressTournaments;
+		return tournamentBean.getTournamentsInStatus(TournamentStatus.IN_PROGRESS);
 	}
 	
 	public List<Tournament> getCompletedTournaments() {
-		return completedTournaments;
+		return tournamentBean.getTournamentsInStatus(TournamentStatus.COMPLETED);
 	}
 }

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/tournaments/TournamentParticipateView.java

+package fi.codecrew.moya.web.cdiview.tournaments;
+
+import java.util.ArrayList;
+
+import javax.ejb.EJB;
+import javax.enterprise.context.ConversationScoped;
+import javax.inject.Named;
+
+import fi.codecrew.moya.beans.PermissionBeanLocal;
+import fi.codecrew.moya.beans.TournamentBeanLocal;
+import fi.codecrew.moya.model.EventUser;
+import fi.codecrew.moya.model.Tournament;
+import fi.codecrew.moya.model.TournamentParticipant;
+import fi.codecrew.moya.utilities.I18n;
+import fi.codecrew.moya.utilities.jsf.MessageHelper;
+import fi.codecrew.moya.web.cdiview.GenericCDIView;
+
+@Named
+@ConversationScoped
+public class TournamentParticipateView extends GenericCDIView {
+	private static final long serialVersionUID = 8002140932622853455L;
+	private Tournament tournament;
+	private TournamentParticipant tournamentParticipant;
+	@EJB private TournamentBeanLocal tournamentBean;
+	@EJB private PermissionBeanLocal permissionBean; 
+	
+	public String participate(Integer tournamentId) {
+		tournament = tournamentBean.getTournamentById(tournamentId);
+		if(tournamentBean.hasParticipations(permissionBean.getCurrentUser(), tournament)) {
+			MessageHelper.err(I18n.get("tournament.already_participated_into_tournament"));
+			return "/tournaments/index.xhtml";
+		}
+		this.beginConversation();
+		
+		if(tournament != null) {
+			tournamentParticipant = new TournamentParticipant();
+			tournamentParticipant.setTournament(tournament);
+			tournamentParticipant.setParticipator(permissionBean.getCurrentUser());
+			tournamentParticipant.setTeamMembers(new ArrayList<EventUser>());
+			tournamentParticipant.getTeamMembers().add(permissionBean.getCurrentUser());
+			
+			if(tournament.getPlayersPerTeam() == 1) {
+				return "/tournaments/participate_single.xhtml";
+			} else {
+				return "/tournaments/index.xhtml";
+			}
+		} else {
+			return "/tournaments/index.xhtml";
+		}
+	}
+	
+	public String saveParticipation() {
+		if(tournamentParticipant != null) {
+			try {
+				tournamentBean.createParticipation(tournamentParticipant);
+				MessageHelper.info(I18n.get("tournament.admin.tournament_participation_success"));
+			} catch(Exception e) {
+				MessageHelper.err(I18n.get(e.getMessage()));
+			}
+		} else {
+			MessageHelper.err(I18n.get("tournament.admin.tournament_participation_failed"));
+		}
+		
+		this.endConversation();
+		return "/tournaments/index.xhtml";
+	}
+	
+	public String cancelParticipation() {
+		this.endConversation();
+		return "/tournaments/index.xhtml";
+	} 
+
+	public Tournament getTournament() {
+		return tournament;
+	}
+
+	public void setTournament(Tournament tournament) {
+		this.tournament = tournament;
+	}
+}