Update counter

This reverts commit dd653cb525.

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.7</version>
+        <version>3.5.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>nl.connected-it</groupId>
@@ -50,7 +50,10 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

src/main/java/nl/connectedit/swiss/controller/TournamentController.java

@@ -161,8 +161,10 @@ public class TournamentController {
   }
 
   @PostMapping("/tournaments/{tournamentId}/matches/{matchId}/start")
-    public ResponseEntity<TournamentDto> startMatch(@PathVariable Long tournamentId, @PathVariable Long matchId,
-                                                    @RequestParam("court") Long court, @RequestParam("counter") Long counter) {
+  public ResponseEntity<TournamentDto> startMatch(@PathVariable Long tournamentId,
+                                                  @PathVariable Long matchId,
+                                                  @RequestParam("court") Long court,
+                                                  @RequestParam("counter") Long counter) {
     var tournament = tournamentService.findTournamentById(tournamentId);
 
     return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.startMatch(tournament, matchId, court, counter)));
@@ -176,14 +178,18 @@ public class TournamentController {
   }
 
   @PostMapping("/tournaments/{tournamentId}/matches/{matchId}")
-    public ResponseEntity<TournamentDto> saveResult(@PathVariable Long tournamentId, @PathVariable Long matchId, @RequestBody ResultDto resultDto) {
+  public ResponseEntity<TournamentDto> saveResult(@PathVariable Long tournamentId,
+                                                  @PathVariable Long matchId,
+                                                  @RequestBody ResultDto resultDto) {
     var tournament = tournamentService.findTournamentById(tournamentId);
 
     return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.saveResult(tournament, matchId, resultDto)));
   }
 
   @PatchMapping("/tournaments/{tournamentId}/players/{playerId}/paid/{paid}")
-    public ResponseEntity<Void> updatePaid(@PathVariable Long tournamentId, @PathVariable Long playerId, @PathVariable Boolean paid) {
+  public ResponseEntity<Void> updatePaid(@PathVariable Long tournamentId,
+                                         @PathVariable Long playerId,
+                                         @PathVariable Boolean paid) {
     var tournament = tournamentService.findTournamentById(tournamentId);
 
     tournamentPlayService.updatePaid(tournament, playerId, paid);
@@ -192,7 +198,9 @@ public class TournamentController {
   }
 
   @PatchMapping("/tournaments/{tournamentId}/players/{playerId}/present/{present}")
-    public ResponseEntity<Void> updatePresent(@PathVariable Long tournamentId, @PathVariable Long playerId, @PathVariable Boolean present) {
+  public ResponseEntity<Void> updatePresent(@PathVariable Long tournamentId,
+                                            @PathVariable Long playerId,
+                                            @PathVariable Boolean present) {
     var tournament = tournamentService.findTournamentById(tournamentId);
 
     tournamentPlayService.updatePresent(tournament, playerId, present);
@@ -201,9 +209,21 @@ public class TournamentController {
   }
 
   @PostMapping("/tournaments/{tournamentId}/players/{playerId}/substitutions")
-    public ResponseEntity<TournamentDto> substitutePlayer(@PathVariable Long tournamentId, @PathVariable Long playerId, @RequestBody TournamentPlayerSubstitutionDto[] substitutions) {
+  public ResponseEntity<TournamentDto> substitutePlayer(@PathVariable Long tournamentId,
+                                                        @PathVariable Long playerId,
+                                                        @RequestBody TournamentPlayerSubstitutionDto[] substitutions) {
     var tournament = tournamentService.findTournamentById(tournamentId);
 
     return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.playerSubstitutions(tournament, playerId, substitutions)));
   }
+
+  @PatchMapping("/tournaments/{tournamentId}/matches/{matchId}/update")
+  public ResponseEntity<TournamentDto> updateCounter(@PathVariable Long tournamentId,
+                                                     @PathVariable Long matchId,
+                                                     @RequestParam("counter") Long counter) {
+    var tournament = tournamentService.findTournamentById(tournamentId);
+
+    return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.updateCounter(tournament, matchId, counter)));
+  }
+
 }

src/main/java/nl/connectedit/swiss/domain/entity/Event.java

@@ -26,7 +26,7 @@ public class Event extends AbstractEntity {
     @ManyToOne
     private Tournament tournament;
 
-    @OneToMany(mappedBy = "event", cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
     private List<Registration> registrations;
 
     @Enumerated(EnumType.STRING)

src/main/java/nl/connectedit/swiss/domain/entity/Group.java

@@ -33,12 +33,12 @@ public class Group extends AbstractEntity {
   @OrderBy("name")
   private List<Round> rounds;
 
-  @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+  @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
   @JoinTable(
     name = "eventgroup_teams",
     joinColumns = @JoinColumn(name = "group_id"),
     inverseJoinColumns = @JoinColumn(name = "teams_id")
   )
-  private List<Team> teams;
+  private List<Team> teams = new ArrayList<>();
 
 }

src/main/java/nl/connectedit/swiss/domain/entity/Match.java

@@ -30,11 +30,9 @@ public class Match extends AbstractEntity {
     private Round round;
 
     @ManyToOne
-    @JoinColumn(name = "team1_id")
     private Team team1;
 
     @ManyToOne
-    @JoinColumn(name = "team2_id")
     private Team team2;
 
     private Boolean played;

src/main/java/nl/connectedit/swiss/domain/entity/Player.java

@@ -58,11 +58,11 @@ public class Player extends AbstractEntity {
     @Enumerated(EnumType.STRING)
     private PlayerStrength strength;
 
-    @OneToMany(mappedBy = "player", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private List<Registration> registrations;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Registration> registrations;// = new ArrayList<>();
 
-    @OneToMany(mappedBy = "partner", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    private List<Registration> partnerRegistrations;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    private List<Registration> partnerRegistrations;// = new ArrayList<>();
 
     public String getFullName() {
         return hasLength(middleName) ?

src/main/java/nl/connectedit/swiss/domain/entity/Registration.java

@@ -20,8 +20,8 @@ public class Registration extends AbstractEntity {
     @ManyToOne
     private Event event;
 
-//    @ManyToOne
-//    private Tournament tournament;
+    @ManyToOne
+    private Tournament tournament;
 
     @ManyToOne
     @JoinColumn(name = "player_id")

src/main/java/nl/connectedit/swiss/domain/entity/Round.java

@@ -27,7 +27,7 @@ public class Round extends AbstractEntity {
 
     private Status status;
 
-    @OneToMany(mappedBy = "round", cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
     @OrderBy("id")
     private List<Match> matches;
 

src/main/java/nl/connectedit/swiss/domain/entity/Team.java

@@ -2,6 +2,7 @@ package nl.connectedit.swiss.domain.entity;
 
 import jakarta.annotation.Nullable;
 import jakarta.persistence.*;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +20,7 @@ public class Team extends AbstractEntity {
     private Long id;
 
     @ManyToMany(mappedBy = "teams", fetch = FetchType.LAZY)
-    private List<Group> groups;
+    private List<Group> groups = new ArrayList<>();
 
     @ManyToOne
     private Player player1;

src/main/java/nl/connectedit/swiss/domain/entity/Tournament.java

@@ -35,7 +35,7 @@ public class Tournament extends AbstractEntity {
     @Enumerated(EnumType.STRING)
     private TournamentStatus status;
 
-    @OneToMany(mappedBy = "tournament", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<Event> events;
 
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)

src/main/java/nl/connectedit/swiss/mapper/TournamentMapper.java

@@ -96,6 +96,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
     for (var event : tournament.getEvents()) {
       if (event.getGroups() != null) {
         for (var group : event.getGroups()) {
+          if (group.getRounds() != null) {
             for (var round : group.getRounds()) {
               for (var match : round.getMatches()) {
                 if (match.getStatus() == Status.IN_PROGRESS && match.getCounter() != null) {
@@ -109,6 +110,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
           }
         }
       }
+    }
     return playersCounting;
   }
 
@@ -118,6 +120,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
     for (var event : tournament.getEvents()) {
       if (event.getGroups() != null) {
         for (var group : event.getGroups()) {
+          if (group.getRounds() != null) {
             for (var round : group.getRounds()) {
               for (var match : round.getMatches()) {
                 if (match.getStatus() == Status.IN_PROGRESS) {
@@ -128,6 +131,7 @@ public class TournamentMapper implements DtoMapper<Tournament, TournamentDto>, E
           }
         }
       }
+    }
 
     return playersPlaying;
   }

src/main/java/nl/connectedit/swiss/service/RegistrationService.java

@@ -27,7 +27,7 @@ public class RegistrationService {
         .findAny();
       if (optionalExistingPlayerRegistration.isEmpty()) { // no previous registration for this event
         var newRegistration = new Registration();
-//        newRegistration.setTournament(tournament);
+        newRegistration.setTournament(tournament);
         newRegistration.setEvent(event);
         newRegistration.setPlayer(player);
         if (eventRegistration.getPartner() != null) {
@@ -53,8 +53,10 @@ public class RegistrationService {
   private void removeEventFromTournamentPlayer(Tournament tournament, Player player, Event event) {
     var tournamentPlayer = findOrAddTournamentPlayer(tournament, player);
     tournamentPlayer.getEvents().removeIf(eventType -> eventType.equals(event.getType().name()));
+    if (tournamentPlayer.getSubstitutions() != null) {
       tournamentPlayer.getSubstitutions().removeIf(substitution -> substitution.getEvent().equals(event));
     }
+  }
 
   private void addEventToTournamentPlayer(Tournament tournament, Player player, Event event) {
     var tournamentPlayer = findOrAddTournamentPlayer(tournament, player);

src/main/java/nl/connectedit/swiss/service/TournamentDivideService.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.java.Log;
 import nl.connectedit.swiss.domain.EventType;
 import nl.connectedit.swiss.domain.Status;
 import nl.connectedit.swiss.domain.TournamentStatus;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
+@Log
 public class TournamentDivideService {
 
   private final TournamentValidationService tournamentValidationService;
@@ -72,7 +74,7 @@ public class TournamentDivideService {
   private List<Registration> groupRegistrations(List<Registration> registrations) {
     var groupedRegistrations = new ArrayList<Registration>();
 
-nextRegistration:
+    nextRegistration:
     for (var registration : registrations) {
       for (var groupedRegistration : groupedRegistrations) {
         if (Objects.equals(groupedRegistration.getPartner(), registration.getPlayer())) {
@@ -91,13 +93,16 @@ nextRegistration:
     group.setStatus(Status.IN_PROGRESS);
     group.setTeams(new ArrayList<>());
     for (var registration : registrations) {
-      group.getTeams().add(getTeam(registration, group));
+//      group.getTeams().add(getTeam(registration, group));
+      addTeamToGroup(registration, group);
     }
 
     return group;
   }
 
   private List<Group> getGroups(List<Registration> orgRegistrations, EventType type) {
+    var groups = new ArrayList<Group>();
+
     var registrations = new ArrayList<>(orgRegistrations);
 
     var group1 = new Group();
@@ -140,18 +145,28 @@ nextRegistration:
       group2.getTeams().removeLast();
     }
 
-    return List.of(group1, group2);
+    groups.add(group1);
+    groups.add(group2);
+    return groups;
   }
 
   private Team getTeam(Registration registration, Group group) {
     var team = new Team();
     team.setPlayer1(registration.getPlayer());
     team.setPlayer2(registration.getPartner());
-    team.setGroups(List.of(group));
+    team.getGroups().add(group);
 
     return team;
   }
 
+  private void addTeamToGroup(Registration registration, Group group) {
+    var team = new Team();
+    team.setPlayer1(registration.getPlayer());
+    team.setPlayer2(registration.getPartner());
+    team.getGroups().add(group);
+    group.getTeams().add(team);
+  }
+
   public Tournament clear(Tournament tournament) {
     for (var event : tournament.getEvents()) {
       event.getGroups().clear();

src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java

@@ -168,22 +168,12 @@ public class TournamentPlayService {
 
     round.setMatches(matches);
 
-    printRound(round, standings);
-
     group.getRounds().add(round);
 
     tournamentRepository.save(tournament);
     return tournament;
   }
 
-  private void printRound(Round round, List<StandingsEntry> standings) {
-    for (var match: round.getMatches()) {
-      log.info("%s - %s".formatted(
-        String.valueOf(standings.stream().filter(entry -> entry.getTeam().equals(match.getTeam1())).map(StandingsEntry::getPosition).findFirst().get()),
-        String.valueOf(standings.stream().filter(entry -> entry.getTeam().equals(match.getTeam2())).map(StandingsEntry::getPosition).findFirst().get())));
-    }
-  }
-
   public Tournament playerSubstitutions(Tournament tournament, Long playerId, TournamentPlayerSubstitutionDto[] substitutions) {
     var tournamentPlayer = getTournamentPlayer(tournament, playerId);
 
@@ -230,6 +220,21 @@ public class TournamentPlayService {
     return null;
   }
 
+  public Tournament updateCounter(Tournament tournament, Long matchId, Long counter) {
+    var match = getMatch(tournament, matchId);
+
+    var currentlyCountingPlayer = getTournamentPlayer(tournament, match.getCounter().getId());
+    currentlyCountingPlayer.setCounting(false);
+
+    var newCountingPlayer = getTournamentPlayer(tournament, counter);
+    newCountingPlayer.setCounting(true);
+    match.setCounter(newCountingPlayer.getPlayer());
+
+    tournamentRepository.save(tournament);
+    return tournament;
+
+  }
+
 
   private static class ConflictInDrawException extends RuntimeException {}
 
@@ -244,7 +249,6 @@ public class TournamentPlayService {
       if (!findPreviousMatchOccurence(newMatch.getTeam1(), remainingTeams.get(opponentIndex), group)) {
         newMatch.setTeam2(remainingTeams.get(opponentIndex));
       } else {
-        log.info("Wedstrijd %s - %s kwam al eerder voor.".formatted(newMatch.getTeam1().toString(), remainingTeams.get(opponentIndex).toString()));
         continue;
       }
       var newRemainingTeams = getRemainingTeams(remainingTeams, opponentIndex);