mirror of
https://github.com/juherr/kill-the-news.git
synced 2026-06-21 06:13:48 +00:00
refactor: separate Feed domain state from persistence DTO
Move four DDD tensions on the Feed aggregate to ground: - #1 The aggregate now holds a domain FeedState (camelCase) instead of the snake_case FeedConfig DTO; infrastructure/feed-mapper.ts owns the FeedState<->FeedConfig/FeedListItem translation as the sole snake_case site outside the HTTP edge. - #3 Replace the edit() recomputeExpiry control flag with a Lifetime VO: passing a lifetime recomputes expiry, omitting it preserves the current one (the dashboard quick-edit path). - #4 Domain events carry their own feedId; dispatchFeedEvents centralizes the drain+dispatch in the application layer (no more manual pullEvents at call sites), keeping infra->application dependency direction intact. - #6 Rename FeedId.fromTrusted to FeedId.unchecked to make the absence of revalidation explicit. Adds Lifetime + feed-mapper round-trip tests. 353 tests green, tsc clean, wrangler dry-run OK. Docs (CLAUDE.md) synced. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -998,7 +998,7 @@ app.post(
|
||||
const { title, description } = c.req.valid("json");
|
||||
|
||||
// Quick-edit: only title/description, expiry untouched.
|
||||
const result = await editFeedDetails(env, FeedId.fromTrusted(feedId), {
|
||||
const result = await editFeedDetails(env, FeedId.unchecked(feedId), {
|
||||
title,
|
||||
description,
|
||||
});
|
||||
|
||||
@@ -158,7 +158,7 @@ emailsRouter.get("/feeds/:feedId/emails", async (c) => {
|
||||
const message = c.req.query("message");
|
||||
const count = Number(c.req.query("count") || "0");
|
||||
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
const feedConfig = await repo.getConfig(id);
|
||||
const feedMetadata = await repo.getMetadata(id);
|
||||
|
||||
@@ -656,7 +656,7 @@ emailsRouter.post("/emails/:emailKey/delete", async (c) => {
|
||||
return c.text("Feed ID is required", 400);
|
||||
}
|
||||
|
||||
const feed = await repo.load(FeedId.fromTrusted(feedId));
|
||||
const feed = await repo.load(FeedId.unchecked(feedId));
|
||||
|
||||
await repo.deleteEmail(emailKey);
|
||||
if (feed) {
|
||||
@@ -691,7 +691,7 @@ emailsRouter.post("/feeds/:feedId/emails/bulk-delete", async (c) => {
|
||||
(c.req.header("Accept") || "").includes("application/json");
|
||||
|
||||
try {
|
||||
const feed = await repo.load(FeedId.fromTrusted(feedId));
|
||||
const feed = await repo.load(FeedId.unchecked(feedId));
|
||||
|
||||
if (!feed) {
|
||||
return wantsJson
|
||||
|
||||
@@ -153,7 +153,7 @@ feedsRouter.get("/:feedId/edit", async (c) => {
|
||||
const feedId = c.req.param("feedId");
|
||||
|
||||
const feedConfig = await FeedRepository.from(env).getConfig(
|
||||
FeedId.fromTrusted(feedId),
|
||||
FeedId.unchecked(feedId),
|
||||
);
|
||||
|
||||
if (!feedConfig) {
|
||||
@@ -335,7 +335,7 @@ feedsRouter.post("/:feedId/edit", async (c) => {
|
||||
blockedSenders,
|
||||
});
|
||||
|
||||
const result = await editFeed(env, FeedId.fromTrusted(feedId), {
|
||||
const result = await editFeed(env, FeedId.unchecked(feedId), {
|
||||
title: parsedData.title,
|
||||
description: parsedData.description,
|
||||
language: parsedData.language,
|
||||
@@ -365,7 +365,7 @@ feedsRouter.post("/:feedId/edit", async (c) => {
|
||||
feedsRouter.post("/:feedId/sender-filter", async (c) => {
|
||||
const env = c.env;
|
||||
const feedId = c.req.param("feedId");
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
const repo = FeedRepository.from(env);
|
||||
|
||||
const body = await c.req.json().catch(() => null);
|
||||
@@ -422,7 +422,7 @@ feedsRouter.post("/:feedId/delete", async (c) => {
|
||||
const wantsJson = (c.req.header("Accept") || "").includes("application/json");
|
||||
|
||||
try {
|
||||
await deleteFeedRecord(env, FeedId.fromTrusted(feedId), (p) =>
|
||||
await deleteFeedRecord(env, FeedId.unchecked(feedId), (p) =>
|
||||
waitUntilSafe(c, p),
|
||||
);
|
||||
|
||||
@@ -460,7 +460,7 @@ feedsRouter.post("/:feedId/purge", async (c) => {
|
||||
|
||||
const step = await purgeFeedKeysStep(
|
||||
emailStorage,
|
||||
FeedId.fromTrusted(feedId),
|
||||
FeedId.unchecked(feedId),
|
||||
{
|
||||
cursor,
|
||||
limit,
|
||||
@@ -522,7 +522,7 @@ feedsRouter.post("/bulk-delete", async (c) => {
|
||||
|
||||
for (const feedId of parsedFeedIds) {
|
||||
try {
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
// Read unsubscribe URLs before the feed metadata is deleted.
|
||||
const urls = await collectUnsubscribeUrls(emailStorage, id);
|
||||
const result = await deleteFeedFastDetailed(emailStorage, id);
|
||||
@@ -606,7 +606,7 @@ feedsRouter.post("/bulk-delete", async (c) => {
|
||||
|
||||
for (const feedId of parsedFeedIds) {
|
||||
try {
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
// Read unsubscribe URLs before the feed metadata is deleted.
|
||||
const urls = await collectUnsubscribeUrls(emailStorage, id);
|
||||
const result = await deleteFeedFastDetailed(emailStorage, id);
|
||||
|
||||
@@ -176,7 +176,7 @@ apiApp.openapi(
|
||||
const env = c.env;
|
||||
const { feedId } = c.req.valid("param");
|
||||
const repo = FeedRepository.from(env);
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
const config = await repo.getConfig(id);
|
||||
if (!config) return c.json({ error: "Feed not found" }, 404);
|
||||
const metadata = await repo.getMetadata(id);
|
||||
@@ -209,7 +209,7 @@ apiApp.openapi(
|
||||
async (c) => {
|
||||
const env = c.env;
|
||||
const { feedId } = c.req.valid("param");
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
const body = c.req.valid("json");
|
||||
const result = await editFeed(env, id, {
|
||||
title: body.title,
|
||||
@@ -248,10 +248,8 @@ apiApp.openapi(
|
||||
async (c) => {
|
||||
const env = c.env;
|
||||
const { feedId } = c.req.valid("param");
|
||||
const removed = await deleteFeedRecord(
|
||||
env,
|
||||
FeedId.fromTrusted(feedId),
|
||||
(p) => waitUntilSafe(c, p),
|
||||
const removed = await deleteFeedRecord(env, FeedId.unchecked(feedId), (p) =>
|
||||
waitUntilSafe(c, p),
|
||||
);
|
||||
if (!removed) return c.json({ error: "Feed not found" }, 404);
|
||||
return c.json({ ok: true }, 200);
|
||||
@@ -278,7 +276,7 @@ apiApp.openapi(
|
||||
const env = c.env;
|
||||
const { feedId } = c.req.valid("param");
|
||||
const metadata = await FeedRepository.from(env).getMetadata(
|
||||
FeedId.fromTrusted(feedId),
|
||||
FeedId.unchecked(feedId),
|
||||
);
|
||||
if (!metadata) return c.json({ error: "Feed not found" }, 404);
|
||||
return c.json(
|
||||
@@ -315,7 +313,7 @@ apiApp.openapi(
|
||||
const { feedId, entryId } = c.req.valid("param");
|
||||
const receivedAt = parseInt(entryId, 10);
|
||||
const repo = FeedRepository.from(env);
|
||||
const metadata = await repo.getMetadata(FeedId.fromTrusted(feedId));
|
||||
const metadata = await repo.getMetadata(FeedId.unchecked(feedId));
|
||||
const metaEntry = metadata?.emails.find((e) => e.receivedAt === receivedAt);
|
||||
if (!metaEntry) return c.json({ error: "Email not found" }, 404);
|
||||
const data = await repo.getEmail(metaEntry.key);
|
||||
@@ -359,7 +357,7 @@ apiApp.openapi(
|
||||
const repo = FeedRepository.from(env);
|
||||
const { feedId, entryId } = c.req.valid("param");
|
||||
const receivedAt = parseInt(entryId, 10);
|
||||
const feed = await repo.load(FeedId.fromTrusted(feedId));
|
||||
const feed = await repo.load(FeedId.unchecked(feedId));
|
||||
const metaEntry = feed?.emails.find((e) => e.receivedAt === receivedAt);
|
||||
if (!feed || !metaEntry) return c.json({ error: "Email not found" }, 404);
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
|
||||
return new Response("Feed ID is required", { status: 400 });
|
||||
}
|
||||
|
||||
const feedData = await fetchFeedData(FeedId.fromTrusted(feedId), c.env);
|
||||
const feedData = await fetchFeedData(FeedId.unchecked(feedId), c.env);
|
||||
if (!feedData) {
|
||||
return new Response("Feed not found", { status: 404 });
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
|
||||
}
|
||||
|
||||
const repo = FeedRepository.from(c.env);
|
||||
const id = FeedId.fromTrusted(feedId);
|
||||
const id = FeedId.unchecked(feedId);
|
||||
|
||||
const [feedMetadata, feedConfig] = await Promise.all([
|
||||
repo.getMetadata(id),
|
||||
|
||||
@@ -45,7 +45,7 @@ export async function handleFeedFavicon(
|
||||
if (!feedId) return projectFavicon();
|
||||
|
||||
const metadata = await FeedRepository.from(env).getMetadata(
|
||||
FeedId.fromTrusted(feedId),
|
||||
FeedId.unchecked(feedId),
|
||||
);
|
||||
const domain = metadata?.iconDomain;
|
||||
if (!domain) return projectFavicon();
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ hubRouter.post("/", async (c) => {
|
||||
);
|
||||
}
|
||||
const format = match[1] as "rss" | "atom";
|
||||
const feedId = FeedId.fromTrusted(match[2]);
|
||||
const feedId = FeedId.unchecked(match[2]);
|
||||
|
||||
// Verify the feed exists before accepting any subscription
|
||||
const feedConfig = await FeedRepository.from(env).getConfig(feedId);
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
|
||||
return new Response("Feed ID is required", { status: 400 });
|
||||
}
|
||||
|
||||
const feedData = await fetchFeedData(FeedId.fromTrusted(feedId), c.env);
|
||||
const feedData = await fetchFeedData(FeedId.unchecked(feedId), c.env);
|
||||
if (!feedData) {
|
||||
return new Response("Feed not found", { status: 404 });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user