diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java b/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java
index 6923106a9ad597af023aa60b54cc490d909e3890..2425c12e4c65fff4d29aabf67453760281939ed1 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/client/App.java
@@ -1,7 +1,6 @@
package edu.ntnu.idatt1002.k1g4.client;
import edu.ntnu.idatt1002.k1g4.dao.CreateDatabase;
-import edu.ntnu.idatt1002.k1g4.dao.TeamDAO;
import javafx.application.Application;
import javafx.application.Platform;
import javafx.scene.Scene;
@@ -39,8 +38,6 @@ public class App extends Application {
stage.setTitle("Floorball cup manager");
CreateDatabase.createNewDatabase("tournament.db");
CreateDatabase.createNewTables("tournament.db");
- TeamDAO teamDAO = new TeamDAO();
- System.out.println(teamDAO.getTeamById(1, 1));
stage.setMaxWidth(DEFAULT_WIDTH);
stage.setMinWidth(DEFAULT_WIDTH);
diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java b/src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java
index 6064683e4abb7ea05cc45e71e6d7ea1caa8e586b..747b05d4ff407d2a9803767ffae5d09157b322a2 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java
@@ -372,8 +372,7 @@ public class Model {
team.setCompeting(true);
try {
teamDAO.addTeam(team, currentDivision.getDivisionId());
- teamDAO.linkTeamToDivision(teamDAO.getTeamByName(teamName, currentDivision.getDivisionId()).getTeamId(), currentDivision.getDivisionId());
- System.out.println(teamDAO.getTeamByName(teamName, currentDivision.getDivisionId()).isCompeting());
+ teamDAO.linkTeamToDivision(teamDAO.getTeamByName(teamName).getTeamId(), currentDivision.getDivisionId());
} catch (IllegalArgumentException e) {
result = false;
giveError("Team already exists");
diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/DivisionDAO.java b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/DivisionDAO.java
index b94f4579d72f2289d665ca1b4470465077ef725b..b5bd03b63e14c4a7e36d5ce27c45daa57f3a189b 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/DivisionDAO.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/DivisionDAO.java
@@ -85,9 +85,9 @@ public class DivisionDAO {
* @param divisionId int: the id of the division to be deleted
*/
public void deleteDivision(int divisionId) {
- String sqlDeleteFromTeams = "DELETE FROM teams WHERE teams.teamId IN (" +
- "SELECT teams.teamId FROM teams INNER JOIN divisionsteamslink dtl ON teams.teamId = dtl.teamId " +
- "INNER JOIN divisions div ON dtl.divisionId = div.divisionId WHERE dtl.divisionId = ?)";
+ String sqlDeleteFromTeams = "DELETE FROM divisionsteamslink WHERE divisionsteamslink.divisionId IN (" +
+ "SELECT divisionsteamslink.divisionId FROM divisionsteamslink " +
+ "INNER JOIN divisions div ON divisionsteamslink.divisionId = div.divisionId WHERE divisionsteamslink.divisionId = ?)";
String sql = "DELETE FROM divisions WHERE divisionId = ?";
String sqlTeamDivisionLink = "DELETE FROM divisionsteamslink WHERE divisionId = ?";
String sqlDeleteDivisionMatches = "DELETE FROM matches WHERE divisionId = ?";
diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
index 630e5d9e17f5e0971b75e0de258b9ac5b84290de..0fb2e169f3c277c0433e4bfb29c52abb294d4674 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
@@ -69,7 +69,6 @@ public class TeamDAO {
team = new Team();
team.setTeamId(resultSet.getInt("teamId"));
team.setName(resultSet.getString("teamName"));
- System.out.println(resultSet.getBoolean("competing"));
team.setCompeting(resultSet.getBoolean("competing"));
teams.put(resultSet.getInt("teamId"), team);
}
@@ -88,9 +87,9 @@ public class TeamDAO {
* @param name String: the team name
* @return team Team: the team with the given name
*/
- public Team getTeamByName(String name, int divisionId) {
+ public Team getTeamByName(String name) {
Team team = null;
- String sql = "SELECT teams.teamId, teams.teamName, dtl.competing FROM teams, divisionsteamslink dtl WHERE teams.teamName=? AND dtl.divisionId=? AND dtl.teamId=teams.teamId";
+ String sql = "SELECT * FROM teams WHERE teams.teamName=?";
ResultSet resultSet = null;
PreparedStatement preparedStatement = null;
Connection connection = null;
@@ -98,7 +97,6 @@ public class TeamDAO {
connection = Database.instance().getConnection();
preparedStatement = connection.prepareStatement(sql);
preparedStatement.setString(1, name);
- preparedStatement.setInt(2, divisionId);
resultSet = preparedStatement.executeQuery();
team = getTeamFromResultSet(resultSet);
} catch (SQLException e) {
@@ -128,7 +126,6 @@ public class TeamDAO {
preparedStatement.setInt(1, teamId);
preparedStatement.setInt(2, divisionId);
resultSet = preparedStatement.executeQuery();
- System.out.println("Wtf bro " + resultSet.getBoolean("competing"));
team = getTeamFromResultSet(resultSet);
} catch (SQLException e) {
e.printStackTrace();
@@ -151,7 +148,6 @@ public class TeamDAO {
team = new Team();
team.setTeamId(resultSet.getInt("teamId"));
team.setName(resultSet.getString("teamName"));
- System.out.println(resultSet.getBoolean("competing"));
team.setCompeting(resultSet.getBoolean("competing"));
}
} catch (SQLException e) {
@@ -174,7 +170,6 @@ public class TeamDAO {
try {
connection = Database.instance().getConnection();
preparedStatement = connection.prepareStatement(sql);
- System.out.println(team.isCompeting());
preparedStatement.setBoolean(1, team.isCompeting());
preparedStatement.setInt(2, team.getTeamId());
preparedStatement.setInt(3, divisionId);
@@ -194,7 +189,7 @@ public class TeamDAO {
*/
public void addTeam(Team team, int divisionId) throws IllegalArgumentException {
String sql = "INSERT INTO teams(teamName) VALUES(?)";
- Team teamFromDb = getTeamByName(team.getName(), 1);
+ Team teamFromDb = getTeamByName(team.getName());
ResultSet resultSet = null;
PreparedStatement preparedStatement = null;
Connection connection = null;
diff --git a/src/test/java/edu/ntnu/idatt1002/k1g4/CreateTestDB.java b/src/test/java/edu/ntnu/idatt1002/k1g4/CreateTestDB.java
index c9ec879f555a8c2d07873ed67634b58533ddeb88..605fa731fffc8f875bfd99a18162fe5e455d9652 100644
--- a/src/test/java/edu/ntnu/idatt1002/k1g4/CreateTestDB.java
+++ b/src/test/java/edu/ntnu/idatt1002/k1g4/CreateTestDB.java
@@ -28,8 +28,7 @@ public class CreateTestDB {
String teamsSql = "CREATE TABLE IF NOT EXISTS teams (\n"
+ " teamId integer PRIMARY KEY,\n"
- + " teamName text,\n"
- + " competing bit\n"
+ + " teamName text\n"
+ ");";
@@ -68,16 +67,17 @@ public class CreateTestDB {
String divisionsTeamsSql = "CREATE TABLE IF NOT EXISTS divisionsteamslink(\n"
+ " divisionId integer,\n"
+ " teamId integer,\n"
+ + " competing bit, \n"
+ " FOREIGN KEY (divisionId) REFERENCES divisions(divisionId),\n"
+ " FOREIGN KEY (teamId) REFERENCES teams(teamId),\n"
+ " PRIMARY KEY (divisionId, teamId)\n"
+ ");";
- String insertTeam = "INSERT INTO teams (teamName, competing) VALUES ('Jims Warriors', 1)";
- String insertTeam2 = "INSERT INTO teams (teamName, competing) VALUES ('Rogers Warriors', 1)";
- String insertTeam3 = "INSERT INTO teams (teamName, competing) VALUES ('Tommys Krigere', 1)";
- String insertTeam4 = "INSERT INTO teams (teamName, competing) VALUES ('Jeremies Fighters', 1)";
+ String insertTeam = "INSERT INTO teams (teamName) VALUES ('Jims Warriors')";
+ String insertTeam2 = "INSERT INTO teams (teamName) VALUES ('Rogers Warriors')";
+ String insertTeam3 = "INSERT INTO teams (teamName) VALUES ('Tommys Krigere')";
+ String insertTeam4 = "INSERT INTO teams (teamName) VALUES ('Jeremies Fighters')";
String insertMatch = "INSERT INTO matches (divisionId, team1Id, team2Id, scoreTeam1, scoreTeam2, matchStartTime, matchEndTime, duration, fieldNumber, finished, walkover, knockout) VALUES (1, 1, 2, 0, 0, '2007-12-03T10:15:30', '2007-12-03T10:15:50', 20, 'A1', 1, 1, 1)";
String insertMatch2 = "INSERT INTO matches (divisionId, team1Id, team2Id, scoreTeam1, scoreTeam2, matchStartTime, matchEndTime, duration, fieldNumber, finished, walkover, knockout) VALUES (1, 2, 3, 0, 0, '2008-12-03T10:15:30', '2008-12-03T10:15:50', 20, 'A2', 1, 1, 1)";
String insertMatch3 = "INSERT INTO matches (divisionId, team1Id, team2Id, scoreTeam1, scoreTeam2, matchStartTime, matchEndTime, duration, fieldNumber, finished, walkover, knockout) VALUES (1, 1, 4, 0, 0, '2009-12-03T10:15:30', '2009-12-03T10:15:50', 20, 'A3', 1, 1, 1)";
@@ -88,10 +88,10 @@ public class CreateTestDB {
String insertCup = "INSERT INTO cups (cupName, location, cupStartTime, cupEndTime) VALUES ('Dragvoll Cup', 'Dragvoll', '2007-12-03T10:15:30', '2007-12-05T10:15:30')";
String insertCup2 = "INSERT INTO cups (cupName, location, cupStartTime, cupEndTime) VALUES ('Inne Cup', 'Oslo', '2009-12-03T10:15:30', '2009-12-05T10:15:30')";
String insertCup3 = "INSERT INTO cups (cupName, location, cupStartTime, cupEndTime) VALUES ('Bandy Cup', 'Trondheim', '2009-12-03T10:15:30', '2009-12-05T10:15:30')";
- String linkTeamsDivisions = "INSERT INTO divisionsteamslink (divisionId, teamId) VALUES (1, 1)";
- String linkTeamsDivisions2 = "INSERT INTO divisionsteamslink (divisionId, teamId) VALUES (1, 2)";
- String linkTeamsDivisions3 = "INSERT INTO divisionsteamslink (divisionId, teamId) VALUES (1, 3)";
- String linkTeamsDivisions4 = "INSERT INTO divisionsteamslink (divisionId, teamId) VALUES (1, 4)";
+ String linkTeamsDivisions = "INSERT INTO divisionsteamslink (divisionId, teamId, competing) VALUES (1, 1, 1)";
+ String linkTeamsDivisions2 = "INSERT INTO divisionsteamslink (divisionId, teamId, competing) VALUES (1, 2, 1)";
+ String linkTeamsDivisions3 = "INSERT INTO divisionsteamslink (divisionId, teamId, competing) VALUES (1, 3, 1)";
+ String linkTeamsDivisions4 = "INSERT INTO divisionsteamslink (divisionId, teamId, competing) VALUES (1, 4, 1)";
try {