Factory method for event types

Author: ntbeastboy

server/src/main/java/com/auction/server/controller/UserController.java

@@ -166,9 +166,11 @@ public void handleBanUser(Context ctx) {
     long durationSeconds = permanent ? 0 : Long.parseLong(durationParam);
     User user = userService.banUser(id, durationSeconds, permanent, getAuthenticatedUser(ctx));
     if (banExpiryScheduler != null) banExpiryScheduler.scheduleIfTemporary(user);
-    List<String> revertedItemIds = revertWinningBidsForUnavailableUser(id);
+    List<String> affectedItemIds = new ArrayList<>();
+    affectedItemIds.addAll(cancelAutoBidsForUser(id));
+    affectedItemIds.addAll(revertWinningBidsForUnavailableUser(id));
     broadcastUserBanned(id);
-    revertedItemIds.forEach(this::broadcastItemUpdated);
+    affectedItemIds.forEach(this::broadcastItemUpdated);
     ctx.json(userToMap(user));
   }
 
@@ -200,12 +202,26 @@ public void handleChangePassword(Context ctx) {
   public void handleDeleteUser(Context ctx) {
     String id = ctx.pathParam("id");
     userService.deleteAccount(id, getAuthenticatedUser(ctx));
-    List<String> revertedItemIds = revertWinningBidsForUnavailableUser(id);
+    List<String> affectedItemIds = new ArrayList<>();
+    affectedItemIds.addAll(cancelAutoBidsForUser(id));
+    affectedItemIds.addAll(revertWinningBidsForUnavailableUser(id));
     broadcastUserDeleted(id);
-    revertedItemIds.forEach(this::broadcastItemUpdated);
+    affectedItemIds.forEach(this::broadcastItemUpdated);
     ctx.json(Map.of("message", "User deleted."));
   }
 
+  private List<String> cancelAutoBidsForUser(String userId) {
+    if (autoBidRepo == null) return List.of();
+
+    List<AutoBid> userAutoBids = autoBidRepo.findByUserId(userId);
+    List<String> affectedItemIds = new ArrayList<>();
+    for (AutoBid autoBid : userAutoBids) {
+      autoBidRepo.delete(autoBid.getUserId(), autoBid.getItemId());
+      affectedItemIds.add(autoBid.getItemId());
+    }
+    return affectedItemIds;
+  }
+
   private List<String> revertWinningBidsForUnavailableUser(String userId) {
     if (itemRepo == null || bidRepo == null) return List.of();
 

server/src/main/java/com/auction/server/events/ItemEventBroadcaster.java

@@ -9,6 +9,15 @@ public class ItemEventBroadcaster {
 
   private final Set<WsContext> clients = ConcurrentHashMap.newKeySet();
 
+  private enum EventType {
+    ITEM_UPDATED,
+    ITEMS_CHANGED,
+    USER_UPDATED,
+    USER_BANNED,
+    USER_DELETED,
+    USERS_CHANGED
+  }
+
   public void register(Javalin app) {
     app.ws(
         "/api/events",
@@ -20,30 +29,41 @@ public void register(Javalin app) {
   }
 
   public void broadcastItemUpdated(String itemId) {
-    broadcast("{\"type\":\"ITEM_UPDATED\",\"itemId\":\"" + escapeJson(itemId) + "\"}");
+    broadcast(createEvent(EventType.ITEM_UPDATED, "itemId", itemId));
   }
 
   public void broadcastItemsChanged() {
-    broadcast("{\"type\":\"ITEMS_CHANGED\"}");
+    broadcast(createEvent(EventType.ITEMS_CHANGED));
   }
 
   public void broadcastUserUpdated(String userId) {
-    broadcast("{\"type\":\"USER_UPDATED\",\"userId\":\"" + escapeJson(userId) + "\"}");
+    broadcast(createEvent(EventType.USER_UPDATED, "userId", userId));
     broadcastUsersChanged();
   }
 
   public void broadcastUserBanned(String userId) {
-    broadcast("{\"type\":\"USER_BANNED\",\"userId\":\"" + escapeJson(userId) + "\"}");
+    broadcast(createEvent(EventType.USER_BANNED, "userId", userId));
     broadcastUsersChanged();
   }
 
   public void broadcastUserDeleted(String userId) {
-    broadcast("{\"type\":\"USER_DELETED\",\"userId\":\"" + escapeJson(userId) + "\"}");
+    broadcast(createEvent(EventType.USER_DELETED, "userId", userId));
     broadcastUsersChanged();
   }
 
   public void broadcastUsersChanged() {
-    broadcast("{\"type\":\"USERS_CHANGED\"}");
+    broadcast(createEvent(EventType.USERS_CHANGED));
+  }
+
+  private String createEvent(EventType type) {
+    return "{\"type\":\"" + type.name() + "\"}";
+  }
+
+  private String createEvent(EventType type, String key, String value) {
+    return "{"
+        + "\"type\":\"" + type.name() + "\","
+        + "\"" + escapeJson(key) + "\":\"" + escapeJson(value) + "\""
+        + "}";
   }
 
   private void broadcast(String message) {
@@ -59,4 +79,4 @@ private void broadcast(String message) {
   private String escapeJson(String value) {
     return value == null ? "" : value.replace("\\", "\\\\").replace("\"", "\\\"");
   }
-}
+}