Resolve map author names locally

OvercastNetwork · Feb 7, 2017 · c06e44f · c06e44f
1 parent 8a79575
commit c06e44f
Show file tree

Hide file tree

Showing 21 changed files with 324 additions and 147 deletions.
diff --git a/API/api/src/main/java/tc/oc/api/docs/virtual/MapDoc.java b/API/api/src/main/java/tc/oc/api/docs/virtual/MapDoc.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -50,6 +51,12 @@ enum Gamemode { tdm, ctw, ctf, dtc, dtm, ad, koth, blitz, rage, scorebox, arcade
     Collection<UUID> author_uuids();
     Collection<UUID> contributor_uuids();
 
+    @Serialize(false)
+    default Stream<UUID> authorAndContributorUuids() {
+        return Stream.concat(author_uuids().stream(),
+                             contributor_uuids().stream());
+    }
+
     @Serialize
     interface Team extends Model {
         @Nonnull String name();

diff --git a/API/api/src/main/java/tc/oc/api/maps/MapService.java b/API/api/src/main/java/tc/oc/api/maps/MapService.java
@@ -13,5 +13,8 @@ public interface MapService extends ModelService<MapDoc, MapDoc> {
 
     ListenableFuture<MapRatingsResponse> getRatings(MapRatingsRequest request);
 
-    ListenableFuture<MapUpdateMultiResponse> updateMapsAndLookupAuthors(Collection<? extends MapDoc> maps);
+    /**
+     * Send map updates to the backend, and retrieve data about map contributors.
+     */
+    UpdateMapsResponse updateMaps(Collection<? extends MapDoc> maps);
 }
diff --git a/API/api/src/main/java/tc/oc/api/maps/NullMapService.java b/API/api/src/main/java/tc/oc/api/maps/NullMapService.java
@@ -7,6 +7,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import tc.oc.api.docs.MapRating;
 import tc.oc.api.docs.virtual.MapDoc;
+import tc.oc.api.message.types.UpdateMultiResponse;
 import tc.oc.api.model.NullModelService;
 
 public class NullMapService extends NullModelService<MapDoc, MapDoc> implements MapService {
@@ -22,7 +23,10 @@ public ListenableFuture<MapRatingsResponse> getRatings(MapRatingsRequest request
     }
 
     @Override
-    public ListenableFuture<MapUpdateMultiResponse> updateMapsAndLookupAuthors(Collection<? extends MapDoc> maps) {
-        return Futures.immediateFuture(new MapUpdateMultiResponse(Collections.emptyMap()));
+    public UpdateMapsResponse updateMaps(Collection<? extends MapDoc> maps) {
+        return new UpdateMapsResponse(
+            Futures.immediateFuture(UpdateMultiResponse.EMPTY),
+            Collections.emptyMap()
+        );
     }
 }
diff --git a/API/api/src/main/java/tc/oc/api/maps/UpdateMapsResponse.java b/API/api/src/main/java/tc/oc/api/maps/UpdateMapsResponse.java
@@ -0,0 +1,38 @@
+package tc.oc.api.maps;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import tc.oc.api.docs.virtual.UserDoc;
+import tc.oc.api.message.types.UpdateMultiResponse;
+
+/**
+ * Result of {@link MapService#updateMaps(Collection)}
+ */
+public class UpdateMapsResponse {
+
+    private final ListenableFuture<UpdateMultiResponse> maps;
+    private final Map<UUID, ListenableFuture<UserDoc.Identity>> authors;
+
+    public UpdateMapsResponse(ListenableFuture<UpdateMultiResponse> maps, Map<UUID, ListenableFuture<UserDoc.Identity>> authors) {
+        this.maps = maps;
+        this.authors = authors;
+    }
+
+    /**
+     * Result of updating all the maps
+     */
+    public ListenableFuture<UpdateMultiResponse> maps() {
+        return maps;
+    }
+
+    /**
+     * Result of each individual map contributor lookup,
+     * which may not all arrive at the same time.
+     */
+    public Map<UUID, ListenableFuture<UserDoc.Identity>> authors() {
+        return authors;
+    }
+}
diff --git a/API/api/src/main/java/tc/oc/api/users/UserSearchRequest.java b/API/api/src/main/java/tc/oc/api/users/UserSearchRequest.java
@@ -5,6 +5,7 @@
 import tc.oc.api.annotations.Serialize;
 import tc.oc.api.docs.PlayerId;
 import tc.oc.api.docs.virtual.Document;
+import tc.oc.minecraft.api.user.UserUtils;
 
 public class UserSearchRequest implements Document {
     @Serialize public final String username;

diff --git a/API/api/src/main/java/tc/oc/api/users/UserUtils.java b/API/api/src/main/java/tc/oc/api/users/UserUtils.java
diff --git a/API/minecraft/src/main/java/tc/oc/api/minecraft/maps/LocalMapService.java b/API/minecraft/src/main/java/tc/oc/api/minecraft/maps/LocalMapService.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -13,16 +12,20 @@
 import tc.oc.api.maps.MapRatingsRequest;
 import tc.oc.api.maps.MapRatingsResponse;
 import tc.oc.api.maps.MapService;
-import tc.oc.api.maps.MapUpdateMultiResponse;
+import tc.oc.api.maps.UpdateMapsResponse;
+import tc.oc.api.message.types.UpdateMultiResponse;
 import tc.oc.api.minecraft.users.UserStore;
 import tc.oc.api.model.NullModelService;
+import tc.oc.api.users.UserService;
+import tc.oc.api.util.UUIDs;
 import tc.oc.commons.core.stream.Collectors;
 import tc.oc.minecraft.api.entity.Player;
 
 @Singleton
 public class LocalMapService extends NullModelService<MapDoc, MapDoc> implements MapService {
 
     @Inject private UserStore<Player> userStore;
+    @Inject private UserService userService;
 
     @Override
     public ListenableFuture<?> rate(MapRating rating) {
@@ -35,14 +38,13 @@ public ListenableFuture<MapRatingsResponse> getRatings(MapRatingsRequest request
     }
 
     @Override
-    public ListenableFuture<MapUpdateMultiResponse> updateMapsAndLookupAuthors(Collection<? extends MapDoc> maps) {
-        return Futures.immediateFuture(new MapUpdateMultiResponse(
+    public UpdateMapsResponse updateMaps(Collection<? extends MapDoc> maps) {
+        return new UpdateMapsResponse(
+            Futures.immediateFuture(UpdateMultiResponse.EMPTY),
             maps.stream()
-                .flatMap(map -> Stream.concat(map.author_uuids().stream(),
-                                              map.contributor_uuids().stream()))
-                .collect(Collectors.mappingTo(uuid -> userStore.byUuid(uuid)
-                                                               .flatMap(userStore::user)
-                                                               .orElse(null)))
-        ));
+                .flatMap(MapDoc::authorAndContributorUuids)
+                .distinct()
+                .collect(Collectors.mappingTo(uuid -> (ListenableFuture) userService.find(() -> UUIDs.normalize(uuid))))
+        );
     }
 }
diff --git a/API/minecraft/src/main/java/tc/oc/api/minecraft/servers/LocalServerDocument.java b/API/minecraft/src/main/java/tc/oc/api/minecraft/servers/LocalServerDocument.java
@@ -17,7 +17,7 @@
 import tc.oc.api.docs.virtual.MatchDoc;
 import tc.oc.api.docs.virtual.ServerDoc;
 import tc.oc.api.minecraft.config.MinecraftApiConfiguration;
-import tc.oc.minecraft.api.entity.OfflinePlayer;
+import tc.oc.minecraft.api.user.User;
 import tc.oc.minecraft.api.server.LocalServer;
 
 @Singleton
@@ -162,8 +162,8 @@ public String settings_profile() {
     @Override
     public Map<UUID, String> operators() {
         final ImmutableMap.Builder<UUID, String> ops = ImmutableMap.builder();
-        for(OfflinePlayer op : minecraftServer.getOperators()) {
-            ops.put(op.getUniqueId(), op.getLastKnownName().orElse("Player"));
+        for(User op : minecraftServer.getOperators()) {
+            ops.put(op.getUniqueId(), op.name().orElse("Player"));
         }
         return ops.build();
     }

diff --git a/API/minecraft/src/main/java/tc/oc/api/minecraft/users/LocalUserDocument.java b/API/minecraft/src/main/java/tc/oc/api/minecraft/users/LocalUserDocument.java
@@ -15,18 +15,24 @@
 import tc.oc.api.docs.User;
 import tc.oc.api.docs.virtual.UserDoc;
 import tc.oc.api.minecraft.servers.DefaultPermissions;
-import tc.oc.minecraft.api.entity.OfflinePlayer;
 
 public class LocalUserDocument extends SimplePlayerId implements User {
 
-    private final OfflinePlayer player;
+    private final UUID uuid;
+    private final String ip;
 
-    public LocalUserDocument(OfflinePlayer player) {
-        super(player.getUniqueId().toString(),
-              player.getUniqueId().toString(),
-              player.getLastKnownName().orElse(""));
+    LocalUserDocument(UUID uuid, String name, String ip) {
+        super(uuid.toString(), uuid.toString(), name);
+        this.uuid = uuid;
+        this.ip = ip;
+    }
 
-        this.player = player;
+    LocalUserDocument(tc.oc.minecraft.api.user.User user) {
+        this(user.getUniqueId(),
+             user.getName(),
+             user.onlinePlayer()
+                 .map(p -> p.getAddress().getHostString())
+                 .orElse(""));
     }
 
     @Override
@@ -41,7 +47,7 @@ public LocalUserDocument(OfflinePlayer player) {
 
     @Override
     public UUID uuid() {
-        return player.getUniqueId();
+        return uuid;
     }
 
     @Override
@@ -76,9 +82,7 @@ public int raindrops() {
 
     @Override
     public String mc_last_sign_in_ip() {
-        return player.onlinePlayer()
-                     .map(p -> p.getAddress().getHostString())
-                     .orElse("");
+        return ip;
     }
 
     @Override

diff --git a/API/minecraft/src/main/java/tc/oc/api/minecraft/users/LocalUserService.java b/API/minecraft/src/main/java/tc/oc/api/minecraft/users/LocalUserService.java
@@ -30,39 +30,43 @@
 import tc.oc.api.users.UserService;
 import tc.oc.api.users.UserUpdateResponse;
 import tc.oc.commons.core.concurrent.FutureUtils;
-import tc.oc.minecraft.api.entity.OfflinePlayer;
-import tc.oc.minecraft.api.server.LocalServer;
+import tc.oc.minecraft.api.user.UserFinder;
 
 @Singleton
-public class LocalUserService extends NullModelService<User, UserDoc.Partial> implements UserService {
+class LocalUserService extends NullModelService<User, UserDoc.Partial> implements UserService {
 
-    @Inject private LocalServer minecraftServer;
     @Inject private LocalSessionFactory sessionFactory;
+    @Inject private UserFinder userFinder;
 
     @Override
     public ListenableFuture<User> find(UserId userId) {
-        return Futures.immediateFuture(new LocalUserDocument(minecraftServer.getOfflinePlayer(UUID.fromString(userId.player_id()))));
+        return FutureUtils.mapSync(
+            userFinder.findUserAsync(UUID.fromString(userId.player_id())),
+            user -> {
+                if(user.hasValidId() && user.name().isPresent()) {
+                    return new LocalUserDocument(user);
+                }
+                throw new NotFound("No user with UUID " + userId.player_id());
+            }
+        );
     }
 
     @Override
     public ListenableFuture<UserSearchResponse> search(UserSearchRequest request) {
-        for(OfflinePlayer player : minecraftServer.getSavedPlayers()) {
-            if(player.getLastKnownName()
-                     .filter(name -> name.equalsIgnoreCase(request.username))
-                     .isPresent()) {
-                return Futures.immediateFuture(new UserSearchResponse(new LocalUserDocument(player),
-                                                                      player.isOnline(),
-                                                                      false,
-                                                                      null,
-                                                                      null));
+        return FutureUtils.mapSync(
+            userFinder.findUserAsync(request.username),
+            user -> {
+                if(user.hasValidId()) {
+                    return new UserSearchResponse(new LocalUserDocument(user), user.isOnline(), false, null, null);
+                }
+                throw new NotFound("No user named '" + request.username + "'");
             }
-        }
-        return Futures.immediateFailedFuture(new NotFound("No user named '" + request.username + "'", null));
+        );
     }
 
     @Override
     public ListenableFuture<LoginResponse> login(LoginRequest request) {
-        final User user = new LocalUserDocument(minecraftServer.getOfflinePlayer(request.uuid));
+        final User user = new LocalUserDocument(request.uuid, request.username, request.ip.getHostAddress());
         final Session session = request.start_session ? sessionFactory.newSession(user, request.ip)
                                                       : null;
 

diff --git a/...c/oc/api/maps/MapUpdateMultiResponse.java → ...tc/oc/api/ocn/MapUpdateMultiResponse.java b/...c/oc/api/maps/MapUpdateMultiResponse.java → ...tc/oc/api/ocn/MapUpdateMultiResponse.java
@@ -1,4 +1,4 @@
-package tc.oc.api.maps;
+package tc.oc.api.ocn;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/API/ocn/src/main/java/tc/oc/api/ocn/OCNMapService.java b/API/ocn/src/main/java/tc/oc/api/ocn/OCNMapService.java
@@ -6,12 +6,16 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import tc.oc.api.docs.MapRating;
 import tc.oc.api.docs.virtual.MapDoc;
+import tc.oc.api.docs.virtual.UserDoc;
+import tc.oc.api.exceptions.NotFound;
 import tc.oc.api.http.HttpOption;
 import tc.oc.api.maps.MapRatingsRequest;
 import tc.oc.api.maps.MapRatingsResponse;
 import tc.oc.api.maps.MapService;
-import tc.oc.api.maps.MapUpdateMultiResponse;
+import tc.oc.api.maps.UpdateMapsResponse;
 import tc.oc.api.model.HttpModelService;
+import tc.oc.commons.core.concurrent.FutureUtils;
+import tc.oc.commons.core.stream.Collectors;
 
 @Singleton
 class OCNMapService extends HttpModelService<MapDoc, MapDoc> implements MapService {
@@ -24,7 +28,21 @@ public ListenableFuture<MapRatingsResponse> getRatings(MapRatingsRequest request
         return this.client().post(memberUri(request.map_id, "get_ratings"), request, MapRatingsResponse.class, HttpOption.INFINITE_RETRY);
     }
 
-    public ListenableFuture<MapUpdateMultiResponse> updateMapsAndLookupAuthors(Collection<? extends MapDoc> maps) {
-        return updateMulti(maps, MapUpdateMultiResponse.class);
+    public UpdateMapsResponse updateMaps(Collection<? extends MapDoc> maps) {
+        final ListenableFuture<MapUpdateMultiResponse> future = updateMulti(maps, MapUpdateMultiResponse.class);
+        return new UpdateMapsResponse(
+            (ListenableFuture) future,
+            maps.stream()
+                .flatMap(MapDoc::authorAndContributorUuids)
+                .distinct()
+                .collect(Collectors.mappingTo(uuid -> FutureUtils.mapSync(
+                    future,
+                    response -> {
+                        final UserDoc.Identity user = response.users_by_uuid.get(uuid);
+                        if(user != null) return user;
+                        throw new NotFound();
+                    }
+                )))
+        );
     }
 }
diff --git a/PGM/src/main/java/tc/oc/pgm/map/MapDocument.java b/PGM/src/main/java/tc/oc/pgm/map/MapDocument.java
@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import javax.annotation.Nullable;
@@ -25,6 +26,7 @@ public class MapDocument extends AbstractModel implements MapDoc {
     private final InfoModule infoModule;
     private final MapInfo info;
     private final List<MapDoc.Team> teams;
+    private final List<UUID> authors, contributors;
 
     @Inject private MapDocument(MapFolder folder, InfoModule infoModule, MapInfo info, List<TeamFactory> teams) {
         this.folder = folder;
@@ -33,6 +35,16 @@ public class MapDocument extends AbstractModel implements MapDoc {
         this.teams = teams.stream()
                           .map(TeamFactory::getDocument)
                           .collect(toImmutableList());
+
+        this.authors = info.authors.stream()
+                                   .map(Contributor::getUuid)
+                                   .filter(Objects::nonNull)
+                                   .collect(toImmutableList());
+
+        this.contributors = info.contributors.stream()
+                                             .map(Contributor::getUuid)
+                                             .filter(Objects::nonNull)
+                                             .collect(toImmutableList());
     }
 
     @Override
@@ -113,18 +125,12 @@ public List<Team> teams() {
 
     @Override
     public Collection<UUID> author_uuids() {
-        return info.authors.stream()
-            .map(Contributor::getUuid)
-            .filter(uuid -> uuid != null)
-            .collect(toImmutableList());
+        return authors;
     }
 
     @Override
     public Collection<UUID> contributor_uuids() {
-        return info.contributors.stream()
-            .map(Contributor::getUuid)
-            .filter(uuid -> uuid != null)
-            .collect(toImmutableList());
+        return contributors;
     }
 
 }