prune active games list

Author: h908714124

src/main/java/com/bernd/ActiveGames.java

@@ -2,26 +2,39 @@
 
 import com.bernd.model.ActiveGame;
 import com.bernd.model.ActiveGameList;
+import com.bernd.model.StatusMap;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Component
 public class ActiveGames {
+
+  private final StatusMap statusMap;
   private final Map<String, ActiveGame> map = new LinkedHashMap<>();
 
+  ActiveGames(StatusMap statusMap) {
+    this.statusMap = statusMap;
+  }
+
   ActiveGame put(ActiveGame game) {
     map.put(game.id(), game);
     return game;
   }
 
   ActiveGameList games() {
-    return new ActiveGameList(List.copyOf(map.values()));
-  }
-
-  ActiveGame remove(String name) {
-    return map.remove(name);
+    Set<String> active = statusMap.activeGames();
+    List<ActiveGame> result = new ArrayList<>(active.size());
+    for (String gameId : active) {
+      ActiveGame game = map.get(gameId);
+      if (game != null) {
+        result.add(game);
+      }
+    }
+    return new ActiveGameList(result);
   }
 }

src/main/java/com/bernd/model/StatusMap.java

@@ -5,14 +5,14 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Component
 public final class StatusMap {
 
-  private static final long USER_TIMEOUT = 45 * 1000;
-
   private final Map<String, UserStatus> map = new LinkedHashMap<>();
 
   public UserStatus put(String user, UserStatus status) {
@@ -37,20 +37,31 @@ public Map<String, List<String>> prune() {
       UserStatus status = e.getValue();
       String room = status.room();
       String user = e.getKey();
-      if (status.lastSeen() + USER_TIMEOUT < current) {
-        remove.add(new RemoveItem(user, room));
-      } else {
+      if (status.isActive(current)) {
         tmp.computeIfAbsent(room, key -> new ArrayList<>()).add(user);
+      } else {
+        remove.add(new RemoveItem(user, room));
       }
     }
     Map<String, List<String>> result = new LinkedHashMap<>(Math.max(8, (int) (tmp.size() * 1.5)));
     for (RemoveItem item : remove) {
-      result.put(item.room, tmp.get(item.room));
+      result.put(item.room, tmp.getOrDefault(item.room, List.of()));
       map.remove(item.user);
     }
     return result;
   }
 
+  public Set<String> activeGames() {
+    Set<String> result = new LinkedHashSet<>();
+    long current = System.currentTimeMillis();
+    for (UserStatus status : map.values()) {
+      if (status.isActive(current)) {
+        result.add(status.room());
+      }
+    }
+    return result;
+  }
+
   private record RemoveItem(String user, String room) {
   }
 }

src/main/java/com/bernd/model/UserStatus.java

@@ -1,7 +1,12 @@
 package com.bernd.model;
 
 public record UserStatus(String room, long lastSeen) {
+  private static final long USER_TIMEOUT = 45 * 1000;
   public static UserStatus create(String room) {
     return new UserStatus(room, System.currentTimeMillis());
   }
+
+  public boolean isActive(long current) {
+    return current < lastSeen + USER_TIMEOUT;
+  }
 }