Merge branch 'fix/team-in-multiple-divisions' into 'main'

fix(teamDAO): teams can now be in multiple divisions

See merge request carljgu/tournament-service!137

src/main/java/edu/ntnu/idatt1002/k1g4/Match.java

@@ -161,7 +161,6 @@ public class Match {
     public void setFinished() {
         setFinished(LocalDateTime.now());
         if (isKnockout) {
-            System.out.println("WTF");
             setWinner();
         }
     }

src/main/java/edu/ntnu/idatt1002/k1g4/client/Model.java

@@ -370,7 +370,7 @@ public class Model {
             team.setName(teamName);
             team.setCompeting(true);
             try {
-                teamDAO.addTeam(team);
+                teamDAO.addTeam(team, currentDivision.getDivisionId());
                 teamDAO.linkTeamToDivision(teamDAO.getTeamByName(teamName).getTeamId(), currentDivision.getDivisionId());
             } catch (IllegalArgumentException e) {
                 result = false;

src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java

@@ -186,7 +186,7 @@ public class TeamDAO {
      *
      * @param team Team: the team to be added to the database.
      */
-    public void addTeam(Team team) throws IllegalArgumentException {
+    public void addTeam(Team team, int divisionId) throws IllegalArgumentException {
         String sql = "INSERT INTO teams(teamName, competing) VALUES(?, ?)";
         Team teamFromDb = getTeamByName(team.getName());
         ResultSet resultSet = null;
@@ -205,7 +205,25 @@ public class TeamDAO {
                 close(connection, preparedStatement, resultSet);
             }
         } else {
-            throw new IllegalArgumentException();
+            String sqlLink = "SELECT * FROM teams, divisionsteamslink WHERE teams.teamId = divisionsteamslink.teamId AND teams.teamName = ? AND divisionsteamslink.divisionId = ?";
+            Team newTeamFromDB;
+            try {
+                connection = Database.instance().getConnection();
+                preparedStatement = connection.prepareStatement(sqlLink);
+                preparedStatement.setString(1, team.getName());
+                preparedStatement.setInt(2, divisionId);
+                resultSet = preparedStatement.executeQuery();
+                newTeamFromDB = getTeamFromResultSet(resultSet);
+                if (newTeamFromDB == null) {
+                    linkTeamToDivision(teamFromDb.getTeamId(), divisionId);
+                } else {
+                    throw new IllegalArgumentException();
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+            } finally {
+                close(connection, preparedStatement, resultSet);
+            }
         }
     }
 

src/test/java/edu/ntnu/idatt1002/k1g4/MatchDAOTest.java

@@ -33,7 +33,6 @@ public class MatchDAOTest {
         expectedFieldList.add("A1");
         expectedFieldList.add("A2");
         expectedFieldList.add("A3");
-        System.out.println(actualMatches.size());
         assertTrue(actualMatches.size() == expectedFieldList.size() && actualMatches.containsAll(expectedFieldList));
     }
 

src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java

@@ -64,7 +64,7 @@ public class TeamDAOTest {
     public void testAddTeam() {
         Team team = new Team("Callums Javaer", true);
         try {
-            teamDAO.addTeam(team);
+            teamDAO.addTeam(team, 1);
         } catch (IllegalArgumentException e) {
             System.out.println(e.getMessage());
         }