[test] matching policy change

42organization · Aug 2, 2023 · 054b5ab · 054b5ab
1 parent 9967f51
commit 054b5ab
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/src/test/java/com/gg/server/domain/match/service/MatchServiceTest.java b/src/test/java/com/gg/server/domain/match/service/MatchServiceTest.java
@@ -147,12 +147,35 @@ void addMatchSameNormalOption() {
         matchService.makeMatch(UserDto.from(users.get(2)), Option.RANK, this.slotTimes.get(0));
         matchService.makeMatch(UserDto.from(users.get(0)), Option.NORMAL, this.slotTimes.get(0));
         matchService.makeMatch(UserDto.from(users.get(1)), Option.NORMAL, this.slotTimes.get(0));
+        matchService.cancelMatch(UserDto.from(users.get(0)), this.slotTimes.get(0));
         Optional<Game> game = gameRepository.findByStartTime(slotTimes.get(0));
-        Assertions.assertThat(game.isEmpty()).isEqualTo(false);
-        Long size = redisTemplate.opsForList().size(MatchKey.getTime(slotTimes.get(0)));
-        Assertions.assertThat(size).isEqualTo(1L);
+        Assertions.assertThat(game).isEmpty();
+        Long size = redisTemplate.opsForList().size(MatchKey.getTime(this.slotTimes.get(0)));
+        List<RedisMatchUser> allMatchUsers = redisMatchTimeRepository.getAllMatchUsers(this.slotTimes.get(0));
+        Assertions.assertThat(size).isEqualTo(2L);
         RedisMatchUser remainedUser = (RedisMatchUser) redisTemplate.opsForList().index(MatchKey.getTime(slotTimes.get(0)), 0);
         Assertions.assertThat(remainedUser.getUserId()).isEqualTo(users.get(2).getId());
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(1)).size()).isEqualTo(2);
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(0)).size()).isEqualTo(1);
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(2)).size()).isEqualTo(0);
+    }
+
+    @DisplayName("게임 재생성 테스트")
+    @Test
+    void remakeGameAfterCancelling() {
+        matchService.makeMatch(UserDto.from(users.get(2)), Option.RANK, this.slotTimes.get(0));
+        matchService.makeMatch(UserDto.from(users.get(0)), Option.NORMAL, this.slotTimes.get(0));
+        matchService.makeMatch(UserDto.from(users.get(1)), Option.BOTH, this.slotTimes.get(0));
+        matchService.cancelMatch(UserDto.from(users.get(2)), this.slotTimes.get(0));
+        Optional<Game> game = gameRepository.findByStartTime(slotTimes.get(0));
+        Assertions.assertThat(game).isPresent();
+        Long size = redisTemplate.opsForList().size(MatchKey.getTime(this.slotTimes.get(0)));
+        Assertions.assertThat(size).isEqualTo(2L);
+        RedisMatchUser remainedUser = (RedisMatchUser) redisTemplate.opsForList().index(MatchKey.getTime(slotTimes.get(0)), 0);
+        Assertions.assertThat(remainedUser.getUserId()).isEqualTo(users.get(0).getId());
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(1)).size()).isEqualTo(1);
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(0)).size()).isEqualTo(1);
+        Assertions.assertThat(notiRepository.findAllByUser(users.get(2)).size()).isEqualTo(1);
     }
 
     @DisplayName("Queue에 user가 선택한 random option으로 매칭 가능한 상대가 없을 경우")