df562742e1
Completes the .server.ts split started in #418. Every route that mixes a default-export component with a server-only loader/action now has a sibling <route>.server.ts holding the data-fetching helpers; the route .tsx is a thin delegator. Routes converted (21): activities._index, activities.$id, activities.new, auth.accept-terms, auth.verify, explore, feed, notifications, routes._index, routes.$id, routes.$id.edit, routes.new, settings, settings.account, settings.connections.komoot, settings.profile, settings.security, sync.import.$provider, sync.import.komoot, users.$username.followers, users.$username.following Pattern (same as home.tsx / users.$username.tsx / settings.connections.tsx): - loader → `return data(await loadX(request, params?))` - action → `return await xAction(request, params?)` - All `getDb` / Drizzle schema / `~/lib/*.server` imports move to the .server.ts sibling. - `throw redirect(...)` and `throw data(...)` propagate through the delegator unchanged. No behavior changes — pure module-graph cleanup. Component modules no longer transitively import the DB client; Vite's tree-shake of server-only code is now backed by an explicit, file-local contract. Verified: - pnpm typecheck — green - pnpm lint — green - pnpm test — 181 passed, 31 integration-gated skipped - pnpm --filter @trails-cool/journal build — succeeds Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
54 lines
1.8 KiB
TypeScript
54 lines
1.8 KiB
TypeScript
// Server-only loader/action for /sync/import/komoot. See `home.server.ts`.
|
|
|
|
import { data, redirect } from "react-router";
|
|
import { desc, eq, and } from "drizzle-orm";
|
|
import { requireSessionUser } from "~/lib/auth/session.server";
|
|
import { getService } from "~/lib/connected-services";
|
|
import { getDb } from "~/lib/db";
|
|
import { importBatches } from "@trails-cool/db/schema/journal";
|
|
|
|
export async function loadKomootImport(request: Request) {
|
|
const user = await requireSessionUser(request);
|
|
|
|
const service = await getService(user.id, "komoot");
|
|
if (!service) throw redirect("/settings/connections/komoot");
|
|
|
|
const db = getDb();
|
|
const [batch] = await db
|
|
.select()
|
|
.from(importBatches)
|
|
.where(and(eq(importBatches.userId, user.id), eq(importBatches.connectionId, service.id)))
|
|
.orderBy(desc(importBatches.startedAt))
|
|
.limit(1);
|
|
|
|
return {
|
|
batch: batch
|
|
? {
|
|
id: batch.id,
|
|
status: batch.status,
|
|
totalFound: batch.totalFound,
|
|
importedCount: batch.importedCount,
|
|
duplicateCount: batch.duplicateCount,
|
|
errorMessage: batch.errorMessage,
|
|
startedAt: batch.startedAt.toISOString(),
|
|
completedAt: batch.completedAt?.toISOString() ?? null,
|
|
}
|
|
: null,
|
|
};
|
|
}
|
|
|
|
export async function komootImportAction(request: Request) {
|
|
await requireSessionUser(request);
|
|
|
|
// Delegate to the API route — just redirect so the page reloads with
|
|
// the new batch after the POST.
|
|
const resp = await fetch(
|
|
new URL("/api/sync/komoot/import", new URL(request.url).origin),
|
|
{ method: "POST", headers: { cookie: request.headers.get("cookie") ?? "" } },
|
|
);
|
|
if (!resp.ok) {
|
|
const body = (await resp.json()) as { error?: string };
|
|
return data({ error: body.error ?? "failed" }, { status: resp.status });
|
|
}
|
|
return redirect("/sync/import/komoot");
|
|
}
|