releaseb return char on error

Sammers21 · Dec 19, 2023 · c361554 · c361554
1 parent b103196
commit c361554
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/io/github/sammers/pla/http/Http.java b/src/io/github/sammers/pla/http/Http.java
@@ -126,14 +126,7 @@ public void start() {
             VTHREAD_EXECUTOR.execute(() -> {
                 String realm = ctx.pathParam("realm");
                 String name = ctx.pathParam("name");
-                Optional<WowAPICharacter> charWithName = ladder.wowChar(ladder.realms.get().nameToSlug(realm), name);
-                Optional<WowAPICharacter> charWithSlug = ladder.wowChar(realm, name);
-                Optional<WowAPICharacter> res = Stream.of(charWithName, charWithSlug).filter(Optional::isPresent).findFirst().map(Optional::get);
-                if (res.isEmpty() || res.get().hidden()) {
-                    ctx.response().setStatusCode(404).end(new JsonObject().put("error", "Character not found").encode());
-                } else {
-                    ctx.response().end(wowCharToJson(res.get()).encode());
-                }
+                nameRealmLookupResponse(ctx, realm, name);
             });
         });
         router.get("/api/:region/:realm/:name/update").handler(ctx -> {
@@ -149,7 +142,7 @@ public void start() {
                         } else {
                             ctx.response().end(wowCharToJson(wowAPICharacter.get()).encode());
                         }
-                    });
+                    }, err -> nameRealmLookupResponse(ctx, realm, name));
             });
         });
         router.get("/:region/ladder/:bracket").handler(ctx -> ctx.response().sendFile("index.html"));
@@ -160,6 +153,17 @@ public void start() {
         vertx.createHttpServer().requestHandler(router).listen(9000);
     }
 
+    private void nameRealmLookupResponse(RoutingContext ctx, String realm, String name) {
+        Optional<WowAPICharacter> charWithName = ladder.wowChar(ladder.realms.get().nameToSlug(realm), name);
+        Optional<WowAPICharacter> charWithSlug = ladder.wowChar(realm, name);
+        Optional<WowAPICharacter> res = Stream.of(charWithName, charWithSlug).filter(Optional::isPresent).findFirst().map(Optional::get);
+        if (res.isEmpty() || res.get().hidden()) {
+            ctx.response().setStatusCode(404).end(new JsonObject().put("error", "Character not found").encode());
+        } else {
+            ctx.response().end(wowCharToJson(res.get()).encode());
+        }
+    }
+
     private JsonObject wowCharToJson(WowAPICharacter character) {
         Set<WowAPICharacter> alts = characterCache.altsFor(character);
         JsonObject res = character.toJson();