Fix that player info was not displayed on side window when opening a private channel (#3426)

* use player info instead of chat user to display player info

* remove `getter`lombok and use correct names

* fix PrivateChatTabControllerTest class

* fix load rating info and achievements

* fix PrivatePlayerInfoControllerTest class

* remove mentions of a chat user from `PrivatePlayerInfoControllerTest` class

Author: Marc-Spector

src/main/java/com/faforever/client/chat/PrivateChatTabController.java

@@ -3,6 +3,7 @@
 import com.faforever.client.avatar.AvatarService;
 import com.faforever.client.domain.server.PlayerInfo;
 import com.faforever.client.fx.JavaFxUtil;
+import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.PrivatePlayerInfoController;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
@@ -20,6 +21,7 @@
 public class PrivateChatTabController extends AbstractChatTabController {
 
   private final AvatarService avatarService;
+  private final PlayerService playerService;
 
   public Tab privateChatTabRoot;
   public ImageView avatarImageView;
@@ -29,9 +31,10 @@ public class PrivateChatTabController extends AbstractChatTabController {
   public ScrollPane gameDetailScrollPane;
 
   @Autowired
-  public PrivateChatTabController(ChatService chatService, AvatarService avatarService) {
+  public PrivateChatTabController(ChatService chatService, AvatarService avatarService, PlayerService playerService) {
     super(chatService);
     this.avatarService = avatarService;
+    this.playerService = playerService;
   }
 
   @Override
@@ -46,14 +49,12 @@ protected void onInitialize() {
 
     privateChatTabRoot.textProperty().bind(channelName.when(attached));
 
-    ObservableValue<ChatChannelUser> chatUser = chatChannel.flatMap(
-        channel -> channelName.map(chanName -> channel.getUser(chanName).orElse(null)));
-    privatePlayerInfoController.chatUserProperty().bind(chatUser.when(showing));
+    ObservableValue<PlayerInfo> player = channelName.map(
+        playerName -> playerService.getPlayerByNameIfOnline(playerName).orElse(null));
+    privatePlayerInfoController.playerProperty().bind(player.when(showing));
 
-    avatarImageView.imageProperty().bind(chatUser
-                                             .flatMap(ChatChannelUser::playerProperty)
-                                             .flatMap(PlayerInfo::avatarProperty)
-                                             .map(avatarService::loadAvatar).when(showing));
+    avatarImageView.imageProperty()
+                   .bind(player.flatMap(PlayerInfo::avatarProperty).map(avatarService::loadAvatar).when(showing));
   }
 
   @Override

src/main/java/com/faforever/client/player/PrivatePlayerInfoController.java

@@ -1,7 +1,6 @@
 package com.faforever.client.player;
 
 import com.faforever.client.achievements.AchievementService;
-import com.faforever.client.chat.ChatChannelUser;
 import com.faforever.client.domain.api.Leaderboard;
 import com.faforever.client.domain.server.GameInfo;
 import com.faforever.client.domain.server.PlayerInfo;
@@ -18,7 +17,6 @@
 import com.faforever.commons.lobby.GameStatus;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -34,7 +32,6 @@
 import reactor.core.publisher.Mono;
 import reactor.function.TupleUtils;
 
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -63,14 +60,7 @@ public class PrivatePlayerInfoController extends NodeController<Node> {
   public Label unlockedAchievementsLabel;
   public Separator separator;
 
-  private final ObjectProperty<ChatChannelUser> chatUser = new SimpleObjectProperty<>();
-
-  private final ChangeListener<PlayerInfo> playerChangeListener = (observable, oldValue, newValue) -> {
-    if (newValue != null && !Objects.equals(oldValue, newValue)) {
-      loadReceiverRatingInformation(newValue);
-      populateUnlockedAchievementsLabel(newValue);
-    }
-  };
+  private final ObjectProperty<PlayerInfo> player = new SimpleObjectProperty<>();
 
   @Override
   public Node getRoot() {
@@ -85,8 +75,7 @@ protected void onInitialize() {
     gameDetailController.setPlaytimeVisible(true);
     gameDetailWrapper.setVisible(false);
 
-    ObservableValue<Boolean> playerExistsProperty = chatUser.flatMap(user -> user.playerProperty().isNotNull())
-                                                            .when(showing);
+    ObservableValue<Boolean> playerExistsProperty = player.isNotNull().when(showing);
     userImageView.visibleProperty().bind(playerExistsProperty);
     country.visibleProperty().bind(playerExistsProperty);
     ratingsLabels.visibleProperty().bind(playerExistsProperty);
@@ -96,36 +85,30 @@ protected void onInitialize() {
     unlockedAchievements.visibleProperty().bind(playerExistsProperty);
     unlockedAchievementsLabel.visibleProperty().bind(playerExistsProperty);
 
-    ObservableValue<PlayerInfo> playerObservable = chatUser.flatMap(ChatChannelUser::playerProperty);
-
     gamesPlayed.textProperty()
-               .bind(playerObservable.flatMap(PlayerInfo::numberOfGamesProperty).map(i18n::number).when(showing));
+               .bind(player.flatMap(PlayerInfo::numberOfGamesProperty).map(i18n::number).when(showing));
 
-    username.textProperty().bind(chatUser.map(ChatChannelUser::getUsername).when(showing));
+    username.textProperty().bind(player.map(PlayerInfo::getUsername).when(showing));
     country.textProperty()
-           .bind(
-               playerObservable.flatMap(PlayerInfo::countryProperty).map(i18n::getCountryNameLocalized).when(showing));
+           .bind(player.flatMap(PlayerInfo::countryProperty).map(i18n::getCountryNameLocalized).when(showing));
     userImageView.imageProperty()
-                 .bind(playerObservable.map(PlayerInfo::getId).map(IdenticonUtil::createIdenticon).when(showing));
-    ObservableValue<GameInfo> gameObservable = playerObservable.flatMap(PlayerInfo::gameProperty);
+                 .bind(player.map(PlayerInfo::getId).map(IdenticonUtil::createIdenticon).when(showing));
+    ObservableValue<GameInfo> gameObservable = player.flatMap(PlayerInfo::gameProperty);
     gameDetailController.gameProperty().bind(gameObservable.when(showing));
     gameDetailWrapper.visibleProperty().bind(gameObservable.flatMap(GameInfo::statusProperty)
                                          .map(status -> status == GameStatus.OPEN || status == GameStatus.PLAYING)
                                          .orElse(false)
                                          .when(showing));
-    chatUser.flatMap(ChatChannelUser::playerProperty).addListener(playerChangeListener);
-  }
-
-  public void setChatUser(ChatChannelUser chatUser) {
-    this.chatUser.set(chatUser);
-  }
-
-  public ChatChannelUser getChatUser() {
-    return chatUser.get();
+    player.when(showing).subscribe((playerInfo) -> {
+        if (playerInfo != null) {
+          loadReceiverRatingInformation(playerInfo);
+          populateUnlockedAchievementsLabel(playerInfo);
+        }
+    });
   }
 
-  public ObjectProperty<ChatChannelUser> chatUserProperty() {
-    return chatUser;
+  public ObjectProperty<PlayerInfo> playerProperty() {
+    return player;
   }
 
   private void populateUnlockedAchievementsLabel(PlayerInfo player) {

src/test/java/com/faforever/client/chat/PrivateChatTabControllerTest.java

@@ -13,6 +13,7 @@
 import com.faforever.client.navigation.NavigationHandler;
 import com.faforever.client.notification.NotificationService;
 import com.faforever.client.player.CountryFlagService;
+import com.faforever.client.player.PlayerService;
 import com.faforever.client.player.PrivatePlayerInfoController;
 import com.faforever.client.preferences.ChatPrefs;
 import com.faforever.client.replay.WatchButtonController;
@@ -33,6 +34,7 @@
 import org.mockito.Spy;
 
 import java.io.InputStream;
+import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -76,6 +78,8 @@ public class PrivateChatTabControllerTest extends PlatformTest {
   @Mock
   private AvatarService avatarService;
   @Mock
+  private PlayerService playerService;
+  @Mock
   private ChatService chatService;
   @Spy
   private ChatPrefs chatPrefs;
@@ -88,22 +92,22 @@ public class PrivateChatTabControllerTest extends PlatformTest {
   @InjectMocks
   private PrivateChatTabController instance;
 
-  private String playerName;
   private PlayerInfo player;
 
   @BeforeEach
   public void setUp() throws Exception {
     player = PlayerInfoBuilder.create().defaultValues().get();
-    playerName = player.getUsername();
+    String playerName = player.getUsername();
 
+    lenient().when(playerService.getPlayerByNameIfOnline(playerName)).thenReturn(Optional.of(player));
     lenient().when(chatMessageViewController.chatChannelProperty()).thenReturn(new SimpleObjectProperty<>());
     lenient().when(chatService.getCurrentUsername()).thenReturn(playerName);
     lenient().when(themeService.getThemeFileUrl(any())).then(invocation -> getThemeFileUrl(invocation.getArgument(0)));
-    lenient().when(privatePlayerInfoController.chatUserProperty()).thenReturn(new SimpleObjectProperty<>());
+    lenient().when(privatePlayerInfoController.playerProperty()).thenReturn(new SimpleObjectProperty<>());
     lenient().when(avatarService.loadAvatar(player.getAvatar())).thenReturn(new Image(InputStream.nullInputStream()));
 
     ChatChannel chatChannel = new ChatChannel(playerName);
-    ChatChannelUser chatChannelUser = new ChatChannelUser(playerName, new ChatChannel(playerName));
+    ChatChannelUser chatChannelUser = new ChatChannelUser(playerName, chatChannel);
     chatChannelUser.setPlayer(player);
     chatChannel.addUser(chatChannelUser);