Fixes #426 username reservation check

Author: Brutus5000

src/inttest/java/com/faforever/api/user/NameRecordRepositoryTest.java

@@ -0,0 +1,38 @@
+package com.faforever.api.user;
+
+import com.faforever.api.AbstractIntegrationTest;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class NameRecordRepositoryTest extends AbstractIntegrationTest {
+  @Autowired
+  private NameRecordRepository nameRecordRepository;
+
+  @Test
+  void testUsernameReservedOnCurrentUsage() {
+    Optional<Integer> result = nameRecordRepository.getLastUsernameOwnerWithinMonths("OLD_MODERATOR", 6);
+
+    assertThat(result.isPresent(), is(true));
+  }
+
+  @Test
+  void testUsernameReservedOnUsageBehindThreshold() {
+    Optional<Integer> result = nameRecordRepository.getLastUsernameOwnerWithinMonths("OLD_ADMIN", 6);
+
+    assertThat(result.isPresent(), is(false));
+  }
+
+  @Test
+  void testUsernameReservedOnNonExisting() {
+    Optional<Integer> result = nameRecordRepository.getLastUsernameOwnerWithinMonths("NOT_EXISTING", 6);
+
+    assertThat(result.isPresent(), is(false));
+  }
+}
+
+

src/inttest/resources/sql/prepDefaultData.sql

@@ -75,17 +75,20 @@ VALUES (1, 1),
        (2, 22);
 
 INSERT INTO name_history (change_time, user_id, previous_name)
-VALUES (NOW(), 2, 'OLD_MODERATOR');
+VALUES (NOW() - INTERVAL 10 YEAR, 3, 'OLD_ADMIN'),
+       (NOW(), 2, 'OLD_MODERATOR');
 
-INSERT INTO game_featuredMods (id, gamemod, name, description, publish, git_url, git_branch, file_extension, allow_override)
-VALUES
-  (1, 'faf', 'FAF', 'Forged Alliance Forever', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', FALSE),
-  (6, 'ladder1v1', 'FAF', 'Ladder games', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', TRUE),
-  (25, 'coop', 'Coop', 'Multiplayer campaign games', 1, 'https://github.com/FAForever/fa-coop.git', 'master', 'cop', TRUE);
+INSERT INTO game_featuredMods (id, gamemod, name, description, publish, git_url, git_branch, file_extension,
+                               allow_override)
+VALUES (1, 'faf', 'FAF', 'Forged Alliance Forever', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2',
+        FALSE),
+       (6, 'ladder1v1', 'FAF', 'Ladder games', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', TRUE),
+       (25, 'coop', 'Coop', 'Multiplayer campaign games', 1, 'https://github.com/FAForever/fa-coop.git', 'master',
+        'cop', TRUE);
 
-INSERT INTO leaderboard (id, technical_name, name_key, description_key) VALUES
-  (1, 'global', 'leaderboard.global.name', 'leaderboard.global.description'),
-  (2, 'ladder_1v1', 'leaderboard.ladder_1v1.name', 'leaderboard.ladder_1v1.description');
+INSERT INTO leaderboard (id, technical_name, name_key, description_key)
+VALUES (1, 'global', 'leaderboard.global.name', 'leaderboard.global.description'),
+       (2, 'ladder_1v1', 'leaderboard.ladder_1v1.name', 'leaderboard.ladder_1v1.description');
 
 INSERT INTO matchmaker_queue (id, technical_name, featured_mod_id, leaderboard_id, name_key, team_size, enabled) VALUES
   (1, 'ladder1v1', 1, 2, 'matchmaker_queue.ladder1v1', 1, 1);

src/main/java/com/faforever/api/user/NameRecordRepository.java

@@ -12,6 +12,6 @@ public interface NameRecordRepository extends JpaRepository<NameRecord, Integer>
   @Query(value = "SELECT datediff(now(), change_time) FROM name_history WHERE user_id = :userId AND datediff(now(), change_time) <= :maximumDaysAgo ORDER BY change_time DESC LIMIT 1", nativeQuery = true)
   Optional<BigInteger> getDaysSinceLastNewRecord(@Param("userId") Integer userId, @Param("maximumDaysAgo") Integer maximumDaysAgo);
 
-  @Query(value = "SELECT user_id FROM name_history WHERE previous_name = :name AND now() > date_add(change_time, INTERVAL :months MONTH) ORDER BY change_time DESC LIMIT 1", nativeQuery = true)
+  @Query(value = "SELECT user_id FROM name_history WHERE previous_name = :name AND (now() - INTERVAL :months MONTH) < change_time ORDER BY change_time DESC LIMIT 1", nativeQuery = true)
   Optional<Integer> getLastUsernameOwnerWithinMonths(@Param("name") String name, @Param("months") Integer months);
 }