WIP

Author: BlackYps

build.gradle

@@ -294,7 +294,7 @@ dependencies {
   implementation("io.projectreactor.addons:reactor-extra")
   implementation("io.projectreactor:reactor-tools")
 
-  def commonsVersion = "c060e973aa54e1fa215df15c1b8bad22806d84aa"
+  def commonsVersion = "6d00833b277996e851730a2b1a5593852174e701"
 
   implementation("com.github.FAForever.faf-java-commons:faf-commons-data:${commonsVersion}") {
             exclude module: 'guava'

src/main/java/com/faforever/client/domain/ReplayBean.java

@@ -67,6 +67,7 @@ public class ReplayBean {
       .boxed()
       .findFirst()
       .orElse(null));
+  ObjectProperty<List<LeagueScoreJournalBean>> leagueScores = new SimpleObjectProperty<>();
 
   public static String getReplayUrl(int replayId, String baseUrlFormat) {
     return String.format(baseUrlFormat, replayId);
@@ -311,6 +312,19 @@ public void setLocal(boolean local) {
     this.local.set(local);
   }
 
+  public List<LeagueScoreJournalBean> getLeagueScores() {
+    return leagueScores.get();
+  }
+
+  public ObjectProperty<List<LeagueScoreJournalBean>> leagueScoresProperty() {
+    return leagueScores;
+  }
+
+  public void setLeagueScores(List<LeagueScoreJournalBean> scores) {
+    leagueScores.set(scores);
+    System.out.println(scores);
+  }
+
   @Value
   public static class ChatMessage {
     ObjectProperty<Duration> time = new SimpleObjectProperty<>();

src/main/java/com/faforever/client/game/PlayerCardController.java

@@ -5,6 +5,7 @@
 import com.faforever.client.domain.GamePlayerStatsBean;
 import com.faforever.client.domain.LeaderboardRatingJournalBean;
 import com.faforever.client.domain.PlayerBean;
+import com.faforever.client.domain.SubdivisionBean;
 import com.faforever.client.fx.Controller;
 import com.faforever.client.fx.JavaFxUtil;
 import com.faforever.client.fx.SimpleChangeListener;
@@ -21,6 +22,7 @@
 import com.faforever.client.fx.contextmenu.ShowPlayerInfoMenuItem;
 import com.faforever.client.fx.contextmenu.ViewReplaysMenuItem;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.leaderboard.LeaderboardService;
 import com.faforever.client.player.CountryFlagService;
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.theme.UiService;
@@ -59,6 +61,7 @@ public class PlayerCardController implements Controller<Node> {
   private final UiService uiService;
   private final CountryFlagService countryFlagService;
   private final AvatarService avatarService;
+  private final LeaderboardService leaderboardService;
   private final ContextMenuBuilder contextMenuBuilder;
   private final I18n i18n;
 
@@ -70,21 +73,24 @@ public class PlayerCardController implements Controller<Node> {
   public Label friendIconText;
   public Region factionIcon;
   public ImageView factionImage;
+  public ImageView divisionImageView;
   public Label noteIcon;
   public Label ratingChange;
 
   private final ObjectProperty<PlayerBean> player = new SimpleObjectProperty<>();
   private final ObjectProperty<GamePlayerStatsBean> playerStats = new SimpleObjectProperty<>();
   private final ObjectProperty<Integer> rating = new SimpleObjectProperty<>();
+  private final ObjectProperty<SubdivisionBean> division = new SimpleObjectProperty<>();
   private final ObjectProperty<Faction> faction = new SimpleObjectProperty<>();
   private final Tooltip noteTooltip = new Tooltip();
   private final Tooltip avatarTooltip = new Tooltip();
 
   @Override
   public void initialize() {
-    JavaFxUtil.bindManagedToVisible(factionIcon, foeIconText, factionImage, friendIconText, countryImageView, noteIcon);
+    JavaFxUtil.bindManagedToVisible(factionIcon, foeIconText, factionImage, friendIconText, countryImageView, divisionImageView, noteIcon);
     countryImageView.visibleProperty().bind(countryImageView.imageProperty().isNotNull());
     avatarImageView.visibleProperty().bind(avatarImageView.imageProperty().isNotNull());
+    divisionImageView.visibleProperty().bind(divisionImageView.imageProperty().isNotNull());
 
     ObservableValue<Boolean> showing = uiService.createShowingProperty(getRoot());
 
@@ -98,10 +104,13 @@ public void initialize() {
             .when(showing));
     avatarImageView.imageProperty()
         .bind(player.flatMap(PlayerBean::avatarProperty).map(avatarService::loadAvatar).when(showing));
+    divisionImageView.imageProperty()
+            .bind(division.flatMap(SubdivisionBean::smallImageUrlProperty).map(leaderboardService::loadDivisionImage).when(showing));
     playerInfo.textProperty()
         .bind(player.flatMap(PlayerBean::usernameProperty)
-            .flatMap(username -> rating.map(value -> i18n.get("userInfo.tooltipFormat.withRating", username, value))
-                .orElse(i18n.get("userInfo.tooltipFormat.noRating", username)))
+            .map(username -> (rating.get() != null && division.get() == null)
+                ? i18n.get("userInfo.tooltipFormat.withRating", username, rating.get())
+                : i18n.get("userInfo.tooltipFormat.noRating", username))
             .when(showing));
     foeIconText.visibleProperty()
         .bind(player.flatMap(PlayerBean::socialStatusProperty)
@@ -235,6 +244,18 @@ public void setRating(Integer rating) {
     this.rating.set(rating);
   }
 
+  public SubdivisionBean getDivision() {
+    return division.get();
+  }
+
+  public ObjectProperty<SubdivisionBean> divisionProperty() {
+    return division;
+  }
+
+  public void setDivision(SubdivisionBean subdivision) {
+    this.division.set(subdivision);
+  }
+
   public Faction getFaction() {
     return faction.get();
   }

src/main/java/com/faforever/client/game/TeamCardController.java

@@ -4,6 +4,7 @@
 import com.faforever.client.domain.GameBean;
 import com.faforever.client.domain.GamePlayerStatsBean;
 import com.faforever.client.domain.PlayerBean;
+import com.faforever.client.domain.SubdivisionBean;
 import com.faforever.client.fx.Controller;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.SimpleChangeListener;
@@ -55,6 +56,7 @@ public class TeamCardController implements Controller<Node> {
   private final ObjectProperty<List<Integer>> playerIds = new SimpleObjectProperty<>(List.of());
   private final ObjectProperty<List<PlayerBean>> players = new SimpleObjectProperty<>(List.of());
   private final ObjectProperty<Function<PlayerBean, Integer>> ratingProvider = new SimpleObjectProperty<>();
+  private final ObjectProperty<Function<PlayerBean, SubdivisionBean>> divisionProvider = new SimpleObjectProperty<>();
   private final ObjectProperty<Function<PlayerBean, Faction>> factionProvider = new SimpleObjectProperty<>();
   private final ObjectProperty<RatingPrecision> ratingPrecision = new SimpleObjectProperty<>();
   private final IntegerProperty teamId = new SimpleIntegerProperty();
@@ -98,6 +100,8 @@ private List<PlayerCardController> createPlayerCardControllers(List<PlayerBean>
       controller.ratingProperty()
           .bind(ratingProvider.map(ratingFunction -> ratingFunction.apply(player))
               .flatMap(rating -> ratingPrecision.map(precision -> precision == RatingPrecision.ROUNDED ? RatingUtil.getRoundedRating(rating) : rating)));
+      controller.divisionProperty()
+              .bind(divisionProvider.map(divisionFunction -> divisionFunction.apply(player)));
       controller.factionProperty()
           .bind(factionProvider.map(factionFunction -> factionFunction.apply(player)));
       controller.setPlayer(player);
@@ -119,6 +123,10 @@ public void setRatingProvider(Function<PlayerBean, Integer> ratingProvider) {
     this.ratingProvider.set(ratingProvider);
   }
 
+  public void setDivisionProvider(Function<PlayerBean, SubdivisionBean> divisionProvider) {
+    this.divisionProvider.set(divisionProvider);
+  }
+
   public void setFactionProvider(Function<PlayerBean, Faction> factionProvider) {
     this.factionProvider.set(factionProvider);
   }

src/main/java/com/faforever/client/leaderboard/LeaderboardService.java

@@ -225,13 +225,12 @@ public CompletableFuture<List<LeagueEntryBean>> getEntries(SubdivisionBean subdi
     );
   }
 
-  public CompletableFuture<LeagueScoreJournalBean> getLeagueScoreJournalEntry(PlayerBean player, ReplayBean replay) {
+  public CompletableFuture<List<LeagueScoreJournalBean>> getLeagueScoreJournalForReplay(ReplayBean replay) {
     ElideNavigatorOnCollection<LeagueScoreJournal> navigator = ElideNavigator.of(LeagueScoreJournal.class).collection()
-        .setFilter(qBuilder().intNum("login.id").eq(player.getId())
-            .and().intNum("game.id").eq(replay.getId()));
+        .setFilter(qBuilder().intNum("game.id").eq(replay.getId()));
     return fafApiAccessor.getMany(navigator)
-        .next()
         .map(dto -> leaderboardMapper.map(dto, new CycleAvoidingMappingContext()))
+        .collectList()
         .toFuture();
   }
 

src/main/java/com/faforever/client/replay/ReplayDetailController.java

@@ -3,13 +3,15 @@
 import com.faforever.client.config.ClientProperties;
 import com.faforever.client.domain.FeaturedModBean;
 import com.faforever.client.domain.GamePlayerStatsBean;
+import com.faforever.client.domain.LeagueScoreJournalBean;
 import com.faforever.client.domain.MapBean;
 import com.faforever.client.domain.MapVersionBean;
 import com.faforever.client.domain.PlayerBean;
 import com.faforever.client.domain.ReplayBean;
 import com.faforever.client.domain.ReplayBean.ChatMessage;
 import com.faforever.client.domain.ReplayBean.GameOption;
 import com.faforever.client.domain.ReplayReviewBean;
+import com.faforever.client.domain.SubdivisionBean;
 import com.faforever.client.fx.Controller;
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.fx.ImageViewHelper;
@@ -20,6 +22,7 @@
 import com.faforever.client.game.RatingPrecision;
 import com.faforever.client.game.TeamCardController;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.leaderboard.LeaderboardService;
 import com.faforever.client.main.event.DeleteLocalReplayEvent;
 import com.faforever.client.map.MapService;
 import com.faforever.client.map.MapService.PreviewSize;
@@ -98,6 +101,7 @@ public class ReplayDetailController implements Controller<Node> {
   private final UiService uiService;
   private final ReplayService replayService;
   private final RatingService ratingService;
+  private final LeaderboardService leaderboardService;
   private final MapService mapService;
   private final MapGeneratorService mapGeneratorService;
   private final PlayerService playerService;
@@ -300,6 +304,8 @@ private void onReplayChanged(ReplayBean newValue) {
     if (newValue.getReplayFile() != null) {
       enrichReplayLater(newValue.getReplayFile(), newValue);
     }
+    
+    leaderboardService.getLeagueScoreJournalForReplay(newValue).thenAccept(newValue::setLeagueScores);
 
     reviewsController.setCanWriteReview(true);
 
@@ -441,6 +447,7 @@ private List<TeamCardController> createTeamCardControllers(Map<String, List<Game
 
       controller.setRatingPrecision(RatingPrecision.EXACT);
       controller.setRatingProvider(player -> getPlayerRating(player, statsByPlayer));
+      controller.setDivisionProvider(this::getPlayerDivision);
       controller.setFactionProvider(player -> getPlayerFaction(player, statsByPlayer));
       controller.setTeamId(Integer.parseInt(team));
       controller.setPlayers(statsByPlayer.keySet());
@@ -464,6 +471,16 @@ private Integer getPlayerRating(PlayerBean player, Map<PlayerBean, GamePlayerSta
         .map(RatingUtil::getRating)
         .orElse(null);
   }
+  
+  private SubdivisionBean getPlayerDivision(PlayerBean player) {
+    return replay.map(ReplayBean::getLeagueScores).map(leagueScoreJournalBeans -> leagueScoreJournalBeans
+        .stream()
+        .filter(leagueScoreJournalBean -> leagueScoreJournalBean.getLoginId() == player.getId())
+        .findFirst()
+        .map(LeagueScoreJournalBean::getDivisionAfter)
+        .orElse(null)
+    ).getValue();
+  }
 
   public void onReport() {
     ReportDialogController reportDialogController = uiService.loadFxml("theme/reporting/report_dialog.fxml");

src/main/resources/theme/player_card.fxml

@@ -54,4 +54,6 @@
     <Label fx:id="ratingChange"
            minWidth="-Infinity"
            styleClass="rating-change-label"/>
+    <ImageView fx:id="divisionImageView" fitHeight="20.0" fitWidth="40.0" pickOnBounds="true" preserveRatio="true"
+               visible="false"/>
 </HBox>

src/main/resources/theme/team_card.fxml

@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml/1" VBox.vgrow="ALWAYS" fx:id="teamPaneRoot"
       xmlns="http://javafx.com/javafx/10.0.2" fx:controller="com.faforever.client.game.TeamCardController">
-    <VBox VBox.vgrow="ALWAYS" prefWidth="215.0" spacing="20.0" styleClass="card">
+    <VBox VBox.vgrow="ALWAYS" prefWidth="230.0" spacing="20.0" styleClass="card">
         <children>
             <Label fx:id="teamNameLabel" styleClass="h3" text="Label"/>
             <VBox fx:id="teamPane"/>

src/test/java/com/faforever/client/game/PlayerCardControllerTest.java

@@ -7,6 +7,7 @@
 import com.faforever.client.fx.contextmenu.ContextMenuBuilder;
 import com.faforever.client.helper.TooltipHelper;
 import com.faforever.client.i18n.I18n;
+import com.faforever.client.leaderboard.LeaderboardService;
 import com.faforever.client.player.CountryFlagService;
 import com.faforever.client.player.SocialStatus;
 import com.faforever.client.test.PlatformTest;
@@ -37,6 +38,8 @@ public class PlayerCardControllerTest extends PlatformTest {
   @Mock
   private CountryFlagService countryFlagService;
   @Mock
+  private LeaderboardService leaderboardService;
+  @Mock
   private AvatarService avatarService;
   @Mock
   private EventBus eventBus;
@@ -47,7 +50,7 @@ public class PlayerCardControllerTest extends PlatformTest {
 
   @BeforeEach
   public void setUp() throws Exception {
-    instance = new PlayerCardController(uiService, countryFlagService, avatarService, contextMenuBuilder, i18n);
+    instance = new PlayerCardController(uiService, countryFlagService, avatarService, leaderboardService, contextMenuBuilder, i18n);
 
     when(uiService.getImage(UiService.RANDOM_FACTION_IMAGE)).thenReturn(new Image(UiService.RANDOM_FACTION_IMAGE));
     when(uiService.createShowingProperty(any())).thenReturn(new SimpleBooleanProperty(true));