From 899d17e89c513c2f131a16deabcb298f9c20c3d1 Mon Sep 17 00:00:00 2001
From: Turid Dahl <turidcd@stud.ntnu.no>
Date: Mon, 23 Mar 2020 14:05:53 +0100
Subject: [PATCH] #45 CreateJoinState done connecting to DB

---
 .../core/src/com/gameware/game/GameWare.java  | 20 +++++++++++++++++++
 .../states/CreateJoinTournamentState.java     | 13 ++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/frontend/core/src/com/gameware/game/GameWare.java b/frontend/core/src/com/gameware/game/GameWare.java
index e74e3fe..ce42cc0 100644
--- a/frontend/core/src/com/gameware/game/GameWare.java
+++ b/frontend/core/src/com/gameware/game/GameWare.java
@@ -43,6 +43,7 @@ public class GameWare extends ApplicationAdapter {
 	private static String darkModeLabelString = "default";
 	private Player player;
 	private List<Game> games = new ArrayList<>();
+//	private List<Tournament> tournaments = new ArrayList<>();
 
 	public static Map<String, State> gameIdToPlayState = new HashMap<>();
 
@@ -135,6 +136,25 @@ public class GameWare extends ApplicationAdapter {
 		}
 		return games;
 	}
+//
+//	public List<Tournament> getTournaments() throws IOException {
+//		if(tournaments.isEmpty()){
+//			tournaments = QueryIntermediate.getTournamentsForPlayer(player.getId());
+//		}
+//		return tournaments;
+//	}
+//
+//	public void addTournament(Tournament t){
+//		if(!tournaments.contains(t)) {
+//			tournaments.add(t);
+//		}
+//	}
+//
+//	public void removeTournament(Tournament t){
+//		if(tournaments.contains(t)){
+//			tournaments.remove(t);
+//		}
+//	}
 
 	public String getDarkModeLabelString(){
 		return darkModeLabelString;
diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
index 505a3be..ca34bf9 100644
--- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
+++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java
@@ -70,8 +70,8 @@ public class CreateJoinTournamentState extends State {
     public CreateJoinTournamentState(GameStateManager gsm) {
         super(gsm);
         try{
+//            tournaments = GameWare.getInstance().getTournaments();
             tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId());
-            System.out.println(tournaments);
         }catch(Exception e){
             System.out.println(e);
         }
@@ -223,11 +223,10 @@ public class CreateJoinTournamentState extends State {
 
     private void handleLeaveBtnClick(Tournament t){
         System.out.println("Left tournament with id = "+ t.get_id());
-        //TODO: fjern remove og heller ha update eller noe når faktisk oppkobling
         tournaments.remove(t);
         try {
-//            QueryIntermidiate.leaveTournament(String GameWare.getPlayer().getId(), t.get_id());
-            //tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getPlayer().getId());
+            QueryIntermediate.leaveTournament(t.get_id(), GameWare.getInstance().getPlayer().getId());
+//            GameWare.getInstance().removeTournament(t);
 
             //Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte
             outerTable.remove();
@@ -244,9 +243,9 @@ public class CreateJoinTournamentState extends State {
 
     private void handleJoinBtnClick(){
         try {
-            QueryIntermediate.joinATournament(GameWare.getInstance().getPlayer().getId());
-            tournaments = QueryIntermediate.getTournamentsForPlayer(GameWare.getInstance().getPlayer().getId());
-
+            Tournament newT = QueryIntermediate.joinATournament(GameWare.getInstance().getPlayer().getId());
+//            GameWare.getInstance().addTournament(newT);
+            tournaments.add(newT);
             //Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte
             outerTable.remove();
             makeStage();
-- 
GitLab