milestone 18: collapse duplicated infrastructure into shared listener core, crud list helper, resource shells, transport race, name and line helpers, ui modules

src/web/handlers/upstreams.zig

@@ -44,10 +44,7 @@ pub fn applyCreate(
     arena: Allocator,
     item: model.UpstreamServer,
 ) error{OutOfMemory}!Created {
-    const database = switch (mutations.configDb(state)) {
-        .database => |value| value,
-        .fail => |failure| return .{ .fail = failure },
-    };
+    const database = mutations.requireConfigDb(state) catch return .{ .fail = mutations.no_config_db };
     if (try mutations.checkUpstream(arena, item)) |problem| return .{ .fail = .{ .invalid = problem } };
 
     state.config_lock.lockUncancelable(io);
@@ -65,10 +62,7 @@ pub fn applyUpdate(
     id: i64,
     item: model.UpstreamServer,
 ) error{OutOfMemory}!?Failure {
-    const database = switch (mutations.configDb(state)) {
-        .database => |value| value,
-        .fail => |failure| return failure,
-    };
+    const database = mutations.requireConfigDb(state) catch return mutations.no_config_db;
     if (try mutations.checkUpstream(arena, item)) |problem| return .{ .invalid = problem };
 
     state.config_lock.lockUncancelable(io);
@@ -96,10 +90,7 @@ pub fn applyUpdate(
 /// answers nothing, and `validate.validate` refuses that configuration at
 /// startup — so allowing it here would only produce a box that will not boot.
 pub fn applyDelete(state: *server.WebState, io: std.Io, arena: Allocator, id: i64) ?Failure {
-    const database = switch (mutations.configDb(state)) {
-        .database => |value| value,
-        .fail => |failure| return failure,
-    };
+    const database = mutations.requireConfigDb(state) catch return mutations.no_config_db;
 
     state.config_lock.lockUncancelable(io);
     defer state.config_lock.unlock(io);
@@ -142,32 +133,19 @@ fn countEnabledExcept(
 // routes
 // ---------------------------------------------------------------------------
 
-pub fn list(state: *server.WebState, io: std.Io, request: *Request) HandlerError!void {
-    _ = io;
-    const database = switch (mutations.configDb(state)) {
-        .database => |value| value,
-        .fail => |failure| return mutations.respondFailure(request, failure, "listing upstreams"),
-    };
+const resource = mutations.Resource(.{
+    .Row = upstreams_repo.UpstreamRow,
+    .list = upstreams_repo.listUpstreamRows,
+    .get = upstreams_repo.getUpstream,
+    .remove = applyDelete,
+    .label = "an upstream",
+    .plural = "upstreams",
+    .envelope = "upstreams",
+});
 
-    const rows = upstreams_repo.listUpstreamRows(database, request.arena) catch |err|
-        return mutations.respondFailure(request, .{ .internal = err }, "listing upstreams");
-
-    return http_util.respondJson(request, .ok, .{ .upstreams = rows.items }, &.{});
-}
-
-pub fn get(state: *server.WebState, io: std.Io, request: *Request) HandlerError!void {
-    _ = io;
-    const database = switch (mutations.configDb(state)) {
-        .database => |value| value,
-        .fail => |failure| return mutations.respondFailure(request, failure, "reading an upstream"),
-    };
-
-    const row = upstreams_repo.getUpstream(database, request.arena, request.id.?) catch |err|
-        return mutations.respondFailure(request, .{ .internal = err }, "reading an upstream");
-    const found = row orelse return mutations.respondFailure(request, .not_found, "");
-
-    return http_util.respondJson(request, .ok, found, &.{});
-}
+pub const list = resource.list;
+pub const get = resource.get;
+pub const remove = resource.remove;
 
 pub fn create(state: *server.WebState, io: std.Io, request: *Request) HandlerError!void {
     const parsed = http_util.parseBody(Body, request) catch |err|
@@ -206,13 +184,6 @@ pub fn update(state: *server.WebState, io: std.Io, request: *Request) HandlerErr
     }, &.{});
 }
 
-pub fn remove(state: *server.WebState, io: std.Io, request: *Request) HandlerError!void {
-    if (applyDelete(state, io, request.arena, request.id.?)) |failure| {
-        return mutations.respondFailure(request, failure, "deleting an upstream");
-    }
-    return http_util.respondEmpty(request, .no_content);
-}
-
 fn toModel(body: Body) model.UpstreamServer {
     return .{
         .url = body.url,