Merge remote-tracking branch 'origin/feature/#1775-show-all-search-re…

…sults' into feature/#1775-show-all-search-results

src/main/java/com/faforever/client/api/FafApiAccessor.java

@@ -10,6 +10,7 @@
 import com.faforever.client.api.dto.GameReview;
 import com.faforever.client.api.dto.GlobalLeaderboardEntry;
 import com.faforever.client.api.dto.GlobalRating;
+import com.faforever.client.api.dto.GlobalRatingWithRank;
 import com.faforever.client.api.dto.Ladder1v1LeaderboardEntry;
 import com.faforever.client.api.dto.Ladder1v1Map;
 import com.faforever.client.api.dto.Map;
@@ -30,6 +31,7 @@
 import com.faforever.client.vault.search.SearchController.SearchConfig;
 import com.faforever.client.vault.search.SearchController.SortConfig;
 import com.faforever.commons.io.ByteCountListener;
+import com.github.jasminb.jsonapi.JSONAPIDocument;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -120,7 +122,7 @@ public interface FafApiAccessor {
 
   List<Map> findMapsByQuery(SearchConfig searchConfig, int page, int count);
 
-  List<GlobalLeaderboardEntry> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count);
+  JSONAPIDocument<List<GlobalRatingWithRank>> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count);
 
   List<Ladder1v1LeaderboardEntry> findLadder1v1LeaderboardEntryByQuery(String nameToSearch, int page, int count);
 

src/main/java/com/faforever/client/api/FafApiAccessorImpl.java

@@ -11,6 +11,7 @@
 import com.faforever.client.api.dto.GameReviewsSummary;
 import com.faforever.client.api.dto.GlobalLeaderboardEntry;
 import com.faforever.client.api.dto.GlobalRating;
+import com.faforever.client.api.dto.GlobalRatingWithRank;
 import com.faforever.client.api.dto.Ladder1v1LeaderboardEntry;
 import com.faforever.client.api.dto.Ladder1v1Map;
 import com.faforever.client.api.dto.Map;
@@ -39,6 +40,7 @@
 import com.faforever.client.vault.search.SearchController.SearchConfig;
 import com.faforever.client.vault.search.SearchController.SortConfig;
 import com.faforever.commons.io.ByteCountListener;
+import com.github.jasminb.jsonapi.JSONAPIDocument;
 import com.github.rutledgepaulv.qbuilders.builders.QBuilder;
 import com.github.rutledgepaulv.qbuilders.conditions.Condition;
 import com.github.rutledgepaulv.qbuilders.visitors.RSQLVisitor;
@@ -481,9 +483,9 @@ public List<Map> findMapsByQuery(SearchConfig searchConfig, int page, int count)
   }
 
   @Override
-  public List<GlobalLeaderboardEntry> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count) {
-    return getPage("/leaderboards/global", count, page,
-        ImmutableMap.of("playerNameMatchesRegex", nameToSearch + "%", "page[number]", page, "page[size]", count));
+  public JSONAPIDocument<List<GlobalRatingWithRank>> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count) {
+    return getPageWithMeta("/data/globalRatingWithRank", count, page,
+        ImmutableMap.of("filter", "player.login==" + nameToSearch + "*", "page[number]", page, "page[size]", count, "page[totals]", ""));
   }
 
   @Override
@@ -634,6 +636,13 @@ private <T> List<T> getPage(String endpointPath, int pageSize, int page, java.ut
     return getPage(endpointPath, pageSize, page, CollectionUtils.toMultiValueMap(multiValues));
   }
 
+  private <T> JSONAPIDocument<List<T>> getPageWithMeta(String endpointPath, int pageSize, int page, java.util.Map<String, Serializable> params) {
+    java.util.Map<String, List<String>> multiValues = params.entrySet().stream()
+        .collect(Collectors.toMap(Entry::getKey, entry -> Collections.singletonList(String.valueOf(entry.getValue()))));
+
+    return getPageWithMeta(endpointPath, pageSize, page, CollectionUtils.toMultiValueMap(multiValues));
+  }
+
   @SuppressWarnings("unchecked")
   @SneakyThrows
   private <T> List<T> getPage(String endpointPath, int pageSize, int page, MultiValueMap<String, String> params) {
@@ -644,6 +653,20 @@ private <T> List<T> getPage(String endpointPath, int pageSize, int page, MultiVa
         .build();
 
     authorizedLatch.await();
-    return (List<T>) restOperations.getForObject(uriComponents.toUriString(), List.class);
+    return restOperations.getForObject(uriComponents.toUriString(), List.class);
+  }
+
+  @SuppressWarnings("unchecked")
+  @SneakyThrows
+  private <T> JSONAPIDocument<List<T>> getPageWithMeta(String endpointPath, int pageSize, int page, MultiValueMap<String, String> params) {
+    UriComponents uriComponents = UriComponentsBuilder.fromPath(endpointPath)
+        .queryParams(params)
+        .replaceQueryParam("page[size]", pageSize)
+        .replaceQueryParam("page[number]", page)
+        .replaceQueryParam("page[totals]")
+        .build();
+
+    authorizedLatch.await();
+    return restOperations.getForObject(uriComponents.toUriString(), JSONAPIDocument.class);
   }
 }

src/main/java/com/faforever/client/api/JsonApiMessageConverter.java

@@ -28,17 +28,19 @@ public JsonApiMessageConverter(ResourceConverter resourceConverter) {
   @Override
   protected boolean supports(Class<?> clazz) {
     return Collection.class.isAssignableFrom(clazz)
-        || ReflectionUtils.getTypeName(clazz) != null;
+        || ReflectionUtils.getTypeName(clazz) != null
+        || clazz.equals(JSONAPIDocument.class);
   }
 
   @Override
   @SneakyThrows
-  @SuppressWarnings("unchecked")
   protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage) {
     try (InputStream inputStream = inputMessage.getBody()) {
       JSONAPIDocument<?> document;
       if (Iterable.class.isAssignableFrom(clazz)) {
         document = resourceConverter.readDocumentCollection(inputStream, Object.class);
+      } else if (clazz.equals(JSONAPIDocument.class)) {
+        return resourceConverter.readDocumentCollection(inputStream, Object.class);
       } else {
         document = resourceConverter.readDocument(inputMessage.getBody(), Object.class);
       }

src/main/java/com/faforever/client/api/MockFafApiAccessor.java

@@ -11,6 +11,7 @@
 import com.faforever.client.api.dto.GamePlayerStats;
 import com.faforever.client.api.dto.GameReview;
 import com.faforever.client.api.dto.GlobalLeaderboardEntry;
+import com.faforever.client.api.dto.GlobalRatingWithRank;
 import com.faforever.client.api.dto.Ladder1v1LeaderboardEntry;
 import com.faforever.client.api.dto.Ladder1v1Map;
 import com.faforever.client.api.dto.Map;
@@ -32,6 +33,7 @@
 import com.faforever.client.vault.search.SearchController.SearchConfig;
 import com.faforever.client.vault.search.SearchController.SortConfig;
 import com.faforever.commons.io.ByteCountListener;
+import com.github.jasminb.jsonapi.JSONAPIDocument;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
@@ -255,8 +257,8 @@ public List<Map> findMapsByQuery(SearchConfig searchConfig, int page, int count)
   }
 
   @Override
-  public List<GlobalLeaderboardEntry> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count) {
-    return Collections.emptyList();
+  public JSONAPIDocument<List<GlobalRatingWithRank>> findGlobalLeaderboardEntryByQuery(String nameToSearch, int page, int count) {
+    return null;
   }
 
   @Override

src/main/java/com/faforever/client/api/dto/GlobalRatingWithRank.java

@@ -0,0 +1,21 @@
+package com.faforever.client.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Relationship;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.Data;
+
+@Data
+@Type("globalRatingWithRank")
+public class GlobalRatingWithRank {
+  @Id
+  private String id;
+  private double mean;
+  private double deviation;
+  private double rating;
+  private int rank;
+
+  @Relationship("player")
+  private Player player;
+
+}

src/main/java/com/faforever/client/api/dto/Ladder1v1RatingWithRank.java

@@ -0,0 +1,20 @@
+package com.faforever.client.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Relationship;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.Data;
+
+@Data
+@Type("Ladder1v1RatingWithRank")
+public class Ladder1v1RatingWithRank {
+  @Id
+  private String id;
+  private double mean;
+  private double deviation;
+  private double rating;
+  private int rank;
+
+  @Relationship("player")
+  private Player player;
+}

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

@@ -15,6 +15,7 @@
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.SimpleFloatProperty;
+import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
@@ -34,7 +35,9 @@
 import org.springframework.stereotype.Component;
 
 import java.lang.invoke.MethodHandles;
+import java.util.concurrent.CompletableFuture;
 
+import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableList;
 
 
@@ -49,12 +52,12 @@ public class LeaderboardController extends AbstractViewController<Node> {
   private final I18n i18n;
   private final ReportingService reportingService;
   public Pane leaderboardRoot;
-  public TableColumn<LeaderboardEntry, Number> rankColumn;
-  public TableColumn<LeaderboardEntry, String> nameColumn;
-  public TableColumn<LeaderboardEntry, Number> winLossColumn;
-  public TableColumn<LeaderboardEntry, Number> gamesPlayedColumn;
-  public TableColumn<LeaderboardEntry, Number> ratingColumn;
-  public TableView<LeaderboardEntry> ratingTable;
+  public TableColumn<RatingWithRank, Number> rankColumn;
+  public TableColumn<RatingWithRank, String> nameColumn;
+  public TableColumn<RatingWithRank, Number> meanColumn;
+  public TableColumn<RatingWithRank, Number> deviationColumn;
+  public TableColumn<RatingWithRank, Number> ratingColumn;
+  public TableView<RatingWithRank> ratingTable;
   public TextField searchTextField;
   public Pane connectionProgressPane;
   public Pane contentPane;
@@ -71,14 +74,14 @@ public void initialize() {
     rankColumn.setCellValueFactory(param -> param.getValue().rankProperty());
     rankColumn.setCellFactory(param -> new StringCell<>(rank -> i18n.number(rank.intValue())));
 
-    nameColumn.setCellValueFactory(param -> param.getValue().usernameProperty());
+    nameColumn.setCellValueFactory(param -> new SimpleStringProperty(param.getValue().getPlayer().getLogin())) ;
     nameColumn.setCellFactory(param -> new StringCell<>(name -> name));
 
-    winLossColumn.setCellValueFactory(param -> param.getValue().winLossRatioProperty());
-    winLossColumn.setCellFactory(param -> new StringCell<>(number -> i18n.get("percentage", number.floatValue() * 100)));
+    meanColumn.setCellValueFactory(param -> param.getValue().meanProperty());
+    meanColumn.setCellFactory(param -> new StringCell<>(number -> i18n.rounded(number.doubleValue(), 2)));
 
-    gamesPlayedColumn.setCellValueFactory(param -> param.getValue().gamesPlayedProperty());
-    gamesPlayedColumn.setCellFactory(param -> new StringCell<>(count -> i18n.number(count.intValue())));
+    deviationColumn.setCellValueFactory(param -> param.getValue().deviationProperty());
+    deviationColumn.setCellFactory(param -> new StringCell<>(number -> i18n.rounded(number.doubleValue(), 2)));
 
     ratingColumn.setCellValueFactory(param -> param.getValue().ratingProperty());
     ratingColumn.setCellFactory(param -> new StringCell<>(rating -> i18n.number(rating.intValue())));
@@ -123,9 +126,15 @@ private void  updateTable(int currentPage)
     Assert.checkNullIllegalState(ratingType, "ratingType must not be null");
 
     contentPane.setVisible(false);
-    leaderboardService.getSearchResults(ratingType, searchTextFieldText,currentPage+1, NUMBER_OF_PLAYERS_PER_PAGE).thenAccept(leaderboardEntryBeans -> {
+    leaderboardService.getSearchResultsWithMeta(ratingType, searchTextFieldText,currentPage+1, NUMBER_OF_PLAYERS_PER_PAGE).thenAccept(ratingWithRankBeans -> {
       Platform.runLater(() -> {
-        ratingTable.setItems(observableList(leaderboardEntryBeans));
+        ratingTable.setItems(observableList(
+
+            ratingWithRankBeans.get()
+                .parallelStream()
+                .map(RatingWithRank::fromGlobal)
+                .collect(toList()))
+        );
         contentPane.setVisible(true);
       });
     }).exceptionally(throwable -> {

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

@@ -2,6 +2,7 @@
 
 import com.faforever.client.FafClientApplication;
 import com.faforever.client.api.dto.GlobalRating;
+import com.faforever.client.api.dto.GlobalRatingWithRank;
 import com.faforever.client.api.dto.Rating;
 import com.faforever.client.game.KnownFeaturedMod;
 import com.faforever.client.query.SearchablePropertyMappings;
@@ -10,6 +11,7 @@
 import com.faforever.client.vault.search.SearchController.SearchConfig;
 import com.faforever.client.vault.search.SearchController.SortConfig;
 import com.faforever.client.vault.search.SearchController.SortOrder;
+import com.github.jasminb.jsonapi.JSONAPIDocument;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
@@ -67,7 +69,18 @@ public CompletableFuture<List<LeaderboardEntry>> getEntries(KnownFeaturedMod rat
     }
   }
 
-  public CompletableFuture<List<LeaderboardEntry>> getSearchResults(KnownFeaturedMod ratingType, String nameToSearch, int page, int count) {
+  public CompletableFuture<JSONAPIDocument<List<GlobalRatingWithRank>>> getSearchResultsWithMeta(KnownFeaturedMod ratingType, String nameToSearch, int page, int count) {
+    switch (ratingType) {
+      case FAF:
+        return fafService.findGlobalLeaderboardEntryByQuery(nameToSearch, page, count);
+      case LADDER_1V1:
+        return null;
+      default:
+        throw new IllegalArgumentException("Not supported: " + ratingType);
+    }
+  }
+
+  /*public CompletableFuture<List<LeaderboardEntry>> getSearchResults(KnownFeaturedMod ratingType, String nameToSearch, int page, int count) {
     switch (ratingType) {
       case FAF:
         return fafService.findGlobalLeaderboardEntryByQuery(nameToSearch, page, count);
@@ -77,5 +90,5 @@ public CompletableFuture<List<LeaderboardEntry>> getSearchResults(KnownFeaturedM
         throw new IllegalArgumentException("Not supported: " + ratingType);
     }
 
-  }
+  }*/
 }