add findAllUsersSortedByMatchCount that is used instead of find all to return users sorted by overall match count by default

remove UserRepository delete method

issue: #56

Author: alekszivko

gamertrack-db/src/main/java/com/gepardec/adapter/output/persistence/repository/UserRepositoryImpl.java

@@ -61,23 +61,18 @@ public void deleteUser(User user) {
   }
 
   @Override
-  public void deleteAllUsers() {
-    entityManager.createQuery("DELETE FROM UserEntity ").executeUpdate();
-    log.info("Deleted all users. size: {}", findAllUsers(false).size());
-  }
-
-  @Override
-  public List<User> findAllUsers(boolean includeDeactivatedUsers) {
+  public List<User> findAllUsersSortedByMatchCount(boolean includeDeactivated) {
     List<UserEntity> resultList = entityManager.createQuery(
-            "SELECT u FROM UserEntity u " +
-                    "Where(:includeDeactivatedUsers = true OR u.deactivated = false) "
-                    , UserEntity.class)
-            .setParameter("includeDeactivatedUsers", includeDeactivatedUsers)
+                    "select u from UserEntity u " +
+                            "left join MatchEntity mu on u member of mu.users " +
+                            "where :includeDeactivated = true OR u.deactivated = false " +
+                            "group by u " +
+                            "order by count(u) desc", UserEntity.class)
+            .setParameter("includeDeactivated", includeDeactivated)
             .getResultList();
-    log.info("Find all users. Returned list of size:{}", resultList.size());
+    log.info("Find all users sorted by match count in game. Returned list of size:{}", resultList.size());
     return resultList.stream().map(userMapper::userEntityToUserModel)
         .collect(Collectors.toList());
-
   }
 
   @Override

gamertrack-db/src/test/java/com/gepardec/adapter/output/persistence/repository/UserRepositoryTest.java

@@ -1,8 +1,15 @@
 package com.gepardec.adapter.output.persistence.repository;
 
 import com.gepardec.TestFixtures;
+import com.gepardec.adapter.output.persistence.entity.GameEntity;
+import com.gepardec.adapter.output.persistence.entity.MatchEntity;
+import com.gepardec.adapter.output.persistence.entity.UserEntity;
+import com.gepardec.core.repository.GameRepository;
+import com.gepardec.core.repository.MatchRepository;
 import com.gepardec.core.repository.UserRepository;
 import com.gepardec.core.services.TokenService;
+import com.gepardec.model.Game;
+import com.gepardec.model.Match;
 import com.gepardec.model.User;
 import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
@@ -37,12 +44,18 @@ public class UserRepositoryTest extends GamertrackDbIT {
   @Inject
   UserRepository userRepository;
 
+  @Inject
+  MatchRepository matchRepository;
+
+  @Inject
+  GameRepository gameRepository;
+
   @Inject
   TokenService tokenService;
 
   @BeforeEach
-  public void before() {
-    userRepository.deleteAllUsers();
+  public void before() throws Exception {
+    removeTableData(MatchEntity.class, GameEntity.class, UserEntity.class);
     entityManager.clear();
   }
 
@@ -73,32 +86,15 @@ void ensureDeleteUserWorks() {
     User user = TestFixtures.user(1L);
     userRepository.saveUser(user);
 
-    int sizeBefore = userRepository.findAllUsers(true).size();
+    int sizeBefore = userRepository.findAllUsersSortedByMatchCount(true).size();
 
     userRepository.deleteUser(user);
 
     assertEquals(1, sizeBefore);
-    assertEquals(0, userRepository.findAllUsers(true).size());
+    assertEquals(0, userRepository.findAllUsersSortedByMatchCount(true).size());
     assertFalse(userRepository.findUserByToken(user.getToken()).isPresent());
   }
 
-  @Test
-  void ensureDeleteAllUsersWorks() {
-    List<User> users = TestFixtures.users(4);
-    userRepository.saveUser(users.get(0));
-    userRepository.saveUser(users.get(1));
-    userRepository.saveUser(users.get(2));
-    userRepository.saveUser(users.get(3));
-
-    int sizeBefore = userRepository.findAllUsers(true).size();
-
-    userRepository.deleteAllUsers();
-
-    assertEquals(4, sizeBefore);
-    assertEquals(0, userRepository.findAllUsers(true).size());
-    assertFalse(userRepository.findUserByToken(users.get(1).getToken()).isPresent());
-  }
-
   @Test
   void ensureFindAllUsers() {
 
@@ -110,21 +106,21 @@ void ensureFindAllUsers() {
     userRepository.saveUser(user2);
     userRepository.saveUser(user3);
 
-    assertEquals(2, userRepository.findAllUsers(false).size());
+    assertEquals(2, userRepository.findAllUsersSortedByMatchCount(false).size());
   }
 
   @Test
   void ensureFindAllUsersIncludeDeleted() {
 
-    User user1 = TestFixtures.user(1L);
-    User user2 = TestFixtures.user(2L);
-    User user3 = new User(3L, "Test", "deleted", true,tokenService.generateToken());
+    User user1 = TestFixtures.user(10L);
+    User user2 = TestFixtures.user(20L);
+    User user3 = new User(30L, "Test", "deleted", true,tokenService.generateToken());
 
     userRepository.saveUser(user1);
     userRepository.saveUser(user2);
     userRepository.saveUser(user3);
 
-    assertEquals(3, userRepository.findAllUsers(true).size());
+    assertEquals(3, userRepository.findAllUsersSortedByMatchCount(true).size());
   }
 
   @Test
@@ -138,16 +134,16 @@ void ensureFindUserByTokenWorks() {
     userRepository.saveUser(user2);
     userRepository.saveUser(user3);
 
-    assertEquals(3, userRepository.findAllUsers(true).size());
+    assertEquals(3, userRepository.findAllUsersSortedByMatchCount(true).size());
     assertTrue(userRepository.findUserByToken(user1.getToken()).isPresent());
   }
 
   @Test
   void ensureFindUserByTokenWorksIncludedDeleted() {
 
-    User user1 = TestFixtures.user(1L);
-    User user2 = TestFixtures.user(2L);
-    User user3 = TestFixtures.user(3L);
+    User user1 = TestFixtures.user(10L);
+    User user2 = TestFixtures.user(20L);
+    User user3 = TestFixtures.user(30L);
     user3.setDeactivated(true);
 
     userRepository.saveUser(user1);
@@ -172,4 +168,24 @@ void ensureExistsByUserTokenWorks() {
 
   }
 
+  @Test
+  void ensureFindAllUsersSortedByMatchCountWorks() {
+    List<Match> matches = TestFixtures.matches(5);
+    Game game = gameRepository.saveGame(TestFixtures.games(1).getFirst()).get();
+    List<User> users = TestFixtures.users(4);
+    User user1 = userRepository.saveUser(users.getFirst()).get();
+    User user2 = userRepository.saveUser(users.getLast()).get();
+    User user3 = userRepository.saveUser(users.get(2)).get();
+    List<Match> matches2 = TestFixtures.matches(10);
+    matches.forEach(match -> { match.setUsers(List.of(user1)); match.setGame(game);});
+    matches2.forEach(match -> { match.setUsers(List.of(user2)); match.setGame(game);});
+    matches.forEach(matchRepository::saveMatch);
+    matches2.forEach(matchRepository::saveMatch);
+
+    List<Match> matchList = matchRepository.findAllMatches();
+    var foundUsers = userRepository.findAllUsersSortedByMatchCount(false);
+
+    matchList.forEach(System.out::println);
+    foundUsers.forEach(System.out::println);
+  }
 }

gamertrack-domain/src/main/java/com/gepardec/core/repository/UserRepository.java

@@ -10,12 +10,7 @@ public interface UserRepository {
   Optional<User> saveUser(User user);
   Optional<User> updateUser(User user);
   void deleteUser(User user);
-  /**
-   * deleteAllUsers - Only for testing purposes
-   */
-  void deleteAllUsers();
-  List<User> findAllUsers(boolean includeDeactivatedUsers);
+  List<User> findAllUsersSortedByMatchCount(boolean includeDeactivatedUsers);
   Optional<User> findUserByToken(String token);
   Boolean existsByUserToken(List<String> userTokens);
-
 }

gamertrack-domain/src/main/java/com/gepardec/impl/service/UserServiceImpl.java

@@ -85,7 +85,7 @@ public Optional<User> deleteUser(String token) {
 
     @Override
     public List<User> findAllUsers(boolean includeDeactivated) {
-        return userRepository.findAllUsers(includeDeactivated);
+        return userRepository.findAllUsersSortedByMatchCount(includeDeactivated);
     }
 
     @Override

gamertrack-domain/src/test/java/com/gepardec/TestFixtures.java

@@ -5,6 +5,7 @@
 import com.gepardec.model.Match;
 import com.gepardec.model.Score;
 import com.gepardec.model.User;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,7 +18,7 @@ public static List<Game> games(int gameCount) {
     List<Game> games = new ArrayList<>();
 
     for (int i = 0; i < gameCount; i++) {
-      games.add(new Game(null, null, "TestGameTitle" + i, "TestGameRules" + i));
+      games.add(new Game(null, tokenService.generateToken(), "TestGameTitle" + i, "TestGameRules" + i));
     }
     return games;
   }

gamertrack-domain/src/test/java/com/gepardec/impl/service/UserServiceImplTest.java

@@ -123,7 +123,7 @@ void ensureFindAllUsersWorksAndReturnsAllUsers() {
         User user3 = TestFixtures.user(3L);
         user3.setDeactivated(true);
 
-        when(userRepository.findAllUsers(false)).thenReturn(List.of(user1,user2));
+        when(userRepository.findAllUsersSortedByMatchCount(false)).thenReturn(List.of(user1,user2));
 
         assertEquals(2, userService.findAllUsers(false).size());
     }
@@ -134,7 +134,7 @@ void ensureFindAllUsersIncludeDeletedWorksAndReturnsAllUsersIncludingDeleted() {
         User user3 = TestFixtures.user(3L);
         user3.setDeactivated(true);
 
-        when(userRepository.findAllUsers(true)).thenReturn(List.of(user1, user2, user3));
+        when(userRepository.findAllUsersSortedByMatchCount(true)).thenReturn(List.of(user1, user2, user3));
 
         assertEquals(3, userService.findAllUsers(true).size());
     }