Add new league columns (#580)

* Add new league columns

* Bump league service version

Author: BlackYps

src/inttest/java/com/faforever/api/config/LeagueDbTestContainers.java

@@ -20,7 +20,7 @@
 @Configuration
 public class LeagueDbTestContainers {
   private static final MariaDBContainer<?> leagueServiceDBContainer = new MariaDBContainer<>("mariadb:10.6");
-  private static final GenericContainer<?> leagueServiceContainer = new GenericContainer<>("faforever/faf-league-service:1.0.0");
+  private static final GenericContainer<?> leagueServiceContainer = new GenericContainer<>("faforever/faf-league-service:1.1.0");
   private static final Network sharedNetwork = Network.newNetwork();
 
   @Bean

src/inttest/java/com/faforever/api/league/LeagueSeasonElideTest.java

@@ -10,6 +10,7 @@
 
 import static com.faforever.api.data.JsonApiMediaType.JSON_API_MEDIA_TYPE;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
@@ -35,7 +36,11 @@ void anyOneCanReadSpecificLeagueSeason() throws Exception {
     mockMvc.perform(
       get("/data/leagueSeason/1")
     )
-      .andExpect(status().isOk());
+      .andExpect(status().isOk())
+      .andExpect(jsonPath("$.data.attributes.placementGames", is(10)))
+      .andExpect(jsonPath("$.data.attributes.placementGamesReturningPlayer", is(3)))
+      .andExpect(jsonPath("$.data.attributes.seasonNumber", is(1)))
+      .andExpect(jsonPath("$.data.attributes.nameKey", is("season1")));
   }
 
   @Test

src/inttest/java/com/faforever/api/league/LeagueSeasonScoreElideTest.java

@@ -10,6 +10,7 @@
 
 import static com.faforever.api.data.JsonApiMediaType.JSON_API_MEDIA_TYPE;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
@@ -44,7 +45,11 @@ void anyOneCanReadSpecificLeagueSeasonScore() throws Exception {
     mockMvc.perform(
       get("/data/leagueSeasonScore/1")
     )
-      .andExpect(status().isOk());
+      .andExpect(status().isOk())
+      .andExpect(jsonPath("$.data.attributes.loginId", is(1)))
+      .andExpect(jsonPath("$.data.attributes.score", is(10)))
+      .andExpect(jsonPath("$.data.attributes.gameCount", is(10)))
+      .andExpect(jsonPath("$.data.attributes.returningPlayer", is(false)));
   }
 
   @Test

src/inttest/resources/sql/league/prepLeagueData.sql

@@ -6,10 +6,10 @@ VALUES (1, 'league1', 'league_name_1', 'league_description_1',
        (2, 'league2', 'league_name_2', 'league_description_2',
        'https://example2.com/', 'https://example2.com/medium/', 'https://example2.com/small/');
 
-INSERT INTO league_season (id, league_id, leaderboard_id, placement_games, season_number,
-                           name_key, start_date, end_date)
-VALUES (1, 1, 1, 10, 1, 'season1', NOW(), DATE_ADD(NOW(), INTERVAL 1 MONTH)),
-       (2, 2, 2, 10, 2, 'season2', DATE_SUB(NOW(), INTERVAL 1 MONTH), DATE_SUB(NOW(), INTERVAL 1 DAY));
+INSERT INTO league_season (id, league_id, leaderboard_id, placement_games, placement_games_returning_player,
+                           season_number, name_key, start_date, end_date)
+VALUES (1, 1, 1, 10, 3, 1, 'season1', NOW(), DATE_ADD(NOW(), INTERVAL 1 MONTH)),
+       (2, 2, 2, 10, 3, 2, 'season2', DATE_SUB(NOW(), INTERVAL 1 MONTH), DATE_SUB(NOW(), INTERVAL 1 DAY));
 
 INSERT INTO league_season_division (id, league_season_id, division_index, name_key, description_key)
 VALUES (1, 1, 1, 'division_name_1', 'division_description_1'),
@@ -24,15 +24,15 @@ VALUES (1, 1, 1, 'subdivision_name_1', 'subdivision_description_1', 0.0, 1000.0,
        (3, 2, 3, 'subdivision_name_3', 'subdivision_description_3', 0.0, 500.0, 50),
        (4, 2, 4, 'subdivision_name_4', 'subdivision_description_4', 500.0, 1000.0, 550);
 
-INSERT INTO league_season_score (id, league_season_id, subdivision_id, login_id, score, game_count)
-VALUES (1, 1, 1, 1, 10, 10),
-       (2, 1, 1, 2, 11, 10),
-       (3, 1, 1, 3, 12, 10),
-       (4, 1, 1, 4, 13, 10),
-       (5, 1, 2, 5, 20, 20),
-       (6, 1, 2, 6, 21, 20),
-       (7, 1, 2, 7, 22, 20),
-       (8, 1, 2, 8, 23, 20);
+INSERT INTO league_season_score (id, league_season_id, subdivision_id, login_id, score, game_count, returning_player)
+VALUES (1, 1, 1, 1, 10, 10, FALSE),
+       (2, 1, 1, 2, 11, 10, FALSE),
+       (3, 1, 1, 3, 12, 10, FALSE),
+       (4, 1, 1, 4, 13, 10, FALSE),
+       (5, 1, 2, 5, 20, 20, FALSE),
+       (6, 1, 2, 6, 21, 20, FALSE),
+       (7, 1, 2, 7, 22, 20, FALSE),
+       (8, 1, 2, 8, 23, 20, FALSE);
 
 INSERT INTO league_score_journal (id, login_id, league_season_id, subdivision_id_before, subdivision_id_after,
                                   score_before, score_after, game_count)

src/main/java/com/faforever/api/league/domain/LeagueSeason.java

@@ -24,6 +24,7 @@ public class LeagueSeason {
   private League league;
   private Leaderboard leaderboard;
   private Integer placementGames;
+  private Integer placementGamesReturningPlayer;
   private Integer seasonNumber;
   private String nameKey;
   private OffsetDateTime startDate;
@@ -53,6 +54,9 @@ public Integer getPlacementGames() {
     return placementGames;
   }
 
+  @Column(name = "placement_games_returning_player")
+  public Integer getPlacementGamesReturningPlayer() {return placementGamesReturningPlayer;}
+
   @Column(name = "season_number")
   public Integer getSeasonNumber() {
     return seasonNumber;

src/main/java/com/faforever/api/league/domain/LeagueSeasonScore.java

@@ -25,6 +25,7 @@ public class LeagueSeasonScore {
   private LeagueSeasonDivisionSubdivision leagueSeasonDivisionSubdivision;
   private Integer score;
   private Integer gameCount;
+  private Boolean returningPlayer;
 
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -59,4 +60,9 @@ public Integer getScore() {
   public Integer getGameCount() {
     return gameCount;
   }
+
+  @Column(name = "returning_player")
+  public Boolean getReturningPlayer() {
+    return returningPlayer;
+  }
 }