Enable voting for very old accounts with few valid games

 (e.g. single player fanatics).
Lex Uveso

Author: Brutus5000

src/main/java/com/faforever/api/voting/VotingService.java

@@ -25,6 +25,7 @@
 @Service
 @RequiredArgsConstructor
 public class VotingService {
+  public static final int ACCOUNT_AGE_YEARS_VOTE_QUALIFIED = 3;
   private final VoteRepository voteRepository;
   private final VotingSubjectRepository votingSubjectRepository;
   private final GamePlayerStatsRepository gamePlayerStatsRepository;
@@ -100,7 +101,9 @@ private List<Error> ableToVote(Player player, int votingSubjectId) {
       errors.add(new Error(ErrorCode.VOTE_ALREADY_ENDED, subject.getEndOfVoteTime()));
     }
 
-    if (gamesPlayed < subject.getMinGamesToVote()) {
+    boolean accountQualifiedBySteamAndAge = player.getSteamId() != null && OffsetDateTime.now().minusYears(ACCOUNT_AGE_YEARS_VOTE_QUALIFIED).isAfter(player.getCreateTime());
+
+    if (!accountQualifiedBySteamAndAge && gamesPlayed < subject.getMinGamesToVote()) {
       errors.add(new Error(ErrorCode.NOT_ENOUGH_GAMES, gamesPlayed, subject.getMinGamesToVote()));
     }
     return errors;

src/test/java/com/faforever/api/error/ApiExceptionMatcher.java

@@ -6,11 +6,12 @@
 import java.util.Arrays;
 
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
+import static org.hamcrest.Matchers.hasItemInArray;
 
 public final class ApiExceptionMatcher {
 
   public static Matcher<ApiException> hasErrorCodes(ErrorCode... errorCodes) {
-    return new FeatureMatcher<ApiException, ErrorCode[]>(arrayContainingInAnyOrder(errorCodes), "error codes", "error codes") {
+    return new FeatureMatcher<>(arrayContainingInAnyOrder(errorCodes), "error codes", "error codes") {
       @Override
       protected ErrorCode[] featureValueOf(ApiException actual) {
         return Arrays.stream(actual.getErrors())
@@ -21,7 +22,7 @@ protected ErrorCode[] featureValueOf(ApiException actual) {
   }
 
   public static Matcher<ApiException> hasErrorCode(ErrorCode errorCode) {
-    return new FeatureMatcher<ApiException, ErrorCode[]>(arrayContainingInAnyOrder(errorCode), "error code", "error code") {
+    return new FeatureMatcher<>(hasItemInArray(errorCode), "error code", "error code") {
       @Override
       protected ErrorCode[] featureValueOf(ApiException actual) {
         return Arrays.stream(actual.getErrors())

src/test/java/com/faforever/api/voting/VotingServiceTest.java

@@ -16,14 +16,13 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.time.OffsetDateTime;
-import java.util.Arrays;
+import java.time.temporal.ChronoUnit;
 import java.util.Optional;
 import java.util.Set;
 
 import static com.faforever.api.error.ApiExceptionMatcher.hasErrorCode;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -102,7 +101,7 @@ public void notSaveVoteIfUserVotedAlready() {
     when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
 
     ApiException result = assertThrows(ApiException.class, () -> instance.saveVote(vote, player));
-    assertTrue(Arrays.stream(result.getErrors()).anyMatch(error -> error.getErrorCode().equals(ErrorCode.VOTED_TWICE)));
+    assertThat(result, hasErrorCode(ErrorCode.VOTED_TWICE));
 
     verify(voteRepository, never()).save(vote);
   }
@@ -176,7 +175,6 @@ public void saveVoteInvalidChoiceId() {
     when(voteRepository.findByPlayerAndVotingSubjectId(player, votingSubject.getId())).thenReturn(Optional.empty());
     when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
 
-
     ApiException result = assertThrows(ApiException.class, () -> instance.saveVote(vote, player));
     assertThat(result, hasErrorCode(ErrorCode.VOTING_CHOICE_DOES_NOT_EXIST));
 
@@ -219,11 +217,9 @@ public void notSaveVoteIfAlternativeOrdinalWrong() {
     when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
     when(votingChoiceRepository.findById(anyInt())).thenReturn(Optional.of(votingChoice)).thenReturn(Optional.of(votingChoice2));
 
-    try {
-      instance.saveVote(vote, player);
-    } catch (ApiException e) {
-      assertTrue(Arrays.stream(e.getErrors()).anyMatch(error -> error.getErrorCode().equals(ErrorCode.MALFORMATTED_ALTERNATIVE_ORDINALS)));
-    }
+    ApiException result = assertThrows(ApiException.class, () -> instance.saveVote(vote, player));
+    assertThat(result, hasErrorCode(ErrorCode.MALFORMATTED_ALTERNATIVE_ORDINALS));
+
     verify(voteRepository, never()).save(vote);
   }
 
@@ -261,11 +257,59 @@ public void notSaveVoteOnTooManyAnswers() {
     when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
     when(votingChoiceRepository.findById(anyInt())).thenReturn(Optional.of(votingChoice)).thenReturn(Optional.of(votingChoice2));
 
-    try {
-      instance.saveVote(vote, player);
-    } catch (ApiException e) {
-      assertTrue(Arrays.stream(e.getErrors()).anyMatch(error -> error.getErrorCode().equals(ErrorCode.TOO_MANY_ANSWERS)));
-    }
+    ApiException result = assertThrows(ApiException.class, () -> instance.saveVote(vote, player));
+    assertThat(result, hasErrorCode(ErrorCode.TOO_MANY_ANSWERS));
+
+    verify(voteRepository, never()).save(vote);
+  }
+
+  @Test
+  public void notSaveVoteOnNotEnoughGames() {
+    Vote vote = new Vote();
+    VotingSubject votingSubject = new VotingSubject();
+    votingSubject.setId(1);
+    votingSubject.setBeginOfVoteTime(OffsetDateTime.now());
+    votingSubject.setEndOfVoteTime(OffsetDateTime.MAX);
+    VotingQuestion votingQuestion = new VotingQuestion();
+    votingQuestion.setAlternativeQuestion(false);
+    votingQuestion.setMaxAnswers(1);
+    votingSubject.setVotingQuestions(Set.of(votingQuestion));
+    votingSubject.setMinGamesToVote(100);
+
+    vote.setVotingSubject(votingSubject);
+    Player player = new Player();
+
+    when(voteRepository.findByPlayerAndVotingSubjectId(player, votingSubject.getId())).thenReturn(Optional.empty());
+    when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
+
+    ApiException result = assertThrows(ApiException.class, () -> instance.saveVote(vote, player));
+    assertThat(result, hasErrorCode(ErrorCode.NOT_ENOUGH_GAMES));
+
     verify(voteRepository, never()).save(vote);
   }
+
+  @Test
+  public void saveVoteOnNotEnoughGamesButSteamLinkAndAccountAge() {
+    Vote vote = new Vote();
+    VotingSubject votingSubject = new VotingSubject();
+    votingSubject.setId(1);
+    votingSubject.setBeginOfVoteTime(OffsetDateTime.now());
+    votingSubject.setEndOfVoteTime(OffsetDateTime.MAX);
+    VotingQuestion votingQuestion = new VotingQuestion();
+    votingQuestion.setAlternativeQuestion(false);
+    votingQuestion.setMaxAnswers(1);
+    votingSubject.setVotingQuestions(Set.of(votingQuestion));
+    votingSubject.setMinGamesToVote(100);
+
+    vote.setVotingSubject(votingSubject);
+    Player player = new Player();
+    player.setSteamId("someSteamId");
+    player.setCreateTime(OffsetDateTime.now().minus(5, ChronoUnit.YEARS));
+
+    when(voteRepository.findByPlayerAndVotingSubjectId(player, votingSubject.getId())).thenReturn(Optional.empty());
+    when(votingSubjectRepository.findById(votingSubject.getId())).thenReturn(Optional.of(votingSubject));
+
+    instance.saveVote(vote, player);
+    verify(voteRepository).save(vote);
+  }
 }