docs: add catalog-driven gear flow design spec

Conceptual vision for integrating the global catalog into the add/edit
flow — search-first UX, tag system, catalog submission with review,
and thread-driven research from catalog items.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

docs/superpowers/specs/2026-04-05-catalog-driven-gear-flow-design.md

@@ -0,0 +1,187 @@
+# Catalog-Driven Gear Flow
+
+**Date:** 2026-04-05
+**Status:** Draft
+**Scope:** Conceptual vision — how users discover, add, research, and contribute gear through the global catalog.
+
+---
+
+## Product Focus
+
+GearBox is focused on **bikepacking, cycling, adventure, and outdoor gear**. The global catalog, tags, and all curated content target this vertical. Other gear types (sim racing, etc.) may be supported later via multi-collection, but are out of scope for this design.
+
+---
+
+## The Three Pillars
+
+1. **Collection Management** — Track what you own, see weight/cost totals, organize into setups
+2. **Research & Purchase** — Find new gear, compare options in threads, make informed decisions
+3. **Community & Sharing** — Public profiles, shared setups, reviews, discussions (future: feed)
+
+The **global catalog** is the connective tissue between all three. It's the shared source of truth for "what gear exists in the outdoor/adventure world."
+
+---
+
+## Global Catalog
+
+### What It Is
+
+A curated, community-contributed database of outdoor/adventure gear. Think of it as a gear encyclopedia — every item has specs, images, ratings, review links, and community data.
+
+### Data Model
+
+Each catalog item has:
+
+- **Brand & Model** — the identity (e.g., "Revelate Designs Pika")
+- **Specs** — weight, price (MSRP), dimensions where relevant
+- **Image** — product photo
+- **Description** — short summary of what it is
+- **Tags** — flexible, combinable labels (see Tag System below)
+- **Rating** — aggregated from user reviews (future)
+- **Review Links** — links to trusted publications (bikepacking.com, etc.)
+- **Owner Count** — how many GearBox users have this in their collection
+- **Submission Status** — `approved`, `pending_review`, `rejected`
+
+### Tag System
+
+Tags replace rigid category hierarchies. They're flat, combinable, and natural-language friendly.
+
+**Tag types:**
+- **Gear type:** handlebar-bag, framebag, tent, stove, headlamp, wheel
+- **Activity:** bikepacking, touring, hiking, camping, ultralight
+- **Property:** waterproof, ultralight, budget, premium, durable
+- **Mounting/fit:** handlebar-mount, fork-mount, seatpost, frame
+
+**How tags work:**
+- Each catalog item has multiple tags
+- Users search with natural language — "waterproof handlebar bag under 200g" matches items tagged `waterproof` + `handlebar-bag` with weight < 200g
+- Tags are suggested during search as refinement chips
+- Tags are admin-curated to prevent fragmentation (users suggest, admins approve)
+
+---
+
+## Core Flows
+
+### Flow 1: Adding Gear (FAB → Search → Add)
+
+**Entry point:** The floating action button (+) on the collection view.
+
+1. **Click +** → A mini menu appears near the button with two options:
+   - 📦 **Add to Collection** — for gear you already own
+   - 🔍 **Start New Thread** — to research a purchase
+
+2. **Full-screen search opens** — regardless of which option was chosen:
+   - Large search bar at top with back arrow
+   - Quick tag chips below for common filters (Bags, Shelter, Lights, Cooking, etc.)
+   - Context indicator: "Adding to Collection" or "Starting Thread"
+   - "Add manually" link for items not in catalog
+
+3. **Type and search** → Full-screen results:
+   - Each result shows: name, rating badge, weight, price, owner count
+   - Active tag filters shown as chips above results, with suggested refinements
+   - Each result has an **"+ Add"** button
+
+4. **Click "+ Add"** on a catalog result:
+   - **For Collection:** Quick confirmation step — item details pre-filled from catalog, user picks their category and optionally adds notes. One tap to confirm.
+   - **For Thread:** Instant add as candidate. No confirmation needed — it's just being added to a comparison list.
+
+5. **Item not found → "Add Manually":**
+   - Opens the manual entry form (existing ItemForm)
+   - User fills in all fields themselves
+   - After saving, a non-intrusive opt-in prompt: "Submit this to the global catalog? Other users could find it too."
+   - If they dismiss it, don't ask again. The item works in their collection regardless.
+
+### Flow 2: Research Thread (Catalog-Driven)
+
+The existing thread concept, but powered by the catalog:
+
+1. User looks at their collection → "I need a new handlebar bag"
+2. Clicks + → "Start New Thread"
+3. Searches catalog: "handlebar bag"
+4. Browses results — sees specs, ratings, owner counts, review links
+5. Adds promising options as thread candidates (instant add)
+6. Goes to thread view — candidates are there with all catalog data
+7. Reads review links, compares specs, adds personal notes/pros/cons
+8. Picks a winner → item moves to collection (existing resolution flow)
+
+### Flow 3: Catalog Submission
+
+When a user manually adds an item that isn't in the catalog:
+
+1. After saving, a subtle prompt appears: "Submit to catalog?"
+2. If accepted, the item data (name, weight, price, image, etc.) becomes a **pending submission**
+3. The item is usable in the user's collection immediately — submission is async
+4. Admin reviews pending submissions — approve, reject, or merge with existing entry
+5. On approval, the user's item automatically links to the new catalog entry
+
+**Submission states:** `pending_review` → `approved` / `rejected`
+
+**Review is admin-only for now.** No community moderation. Keep it simple — one person curates the catalog quality.
+
+---
+
+## Navigation
+
+The catalog is accessed **through the add flow** (FAB → search), not as a standalone page. There is no "Browse Catalog" link in the main nav. Discovery happens through:
+
+- The add/thread flow (primary)
+- Future: community feed showing what others are adding/reviewing
+- Future: "Popular in category" sections
+
+The existing `/global-items` route can remain as a direct URL for power users but doesn't need prominent navigation.
+
+---
+
+## What Changes From Current State
+
+### New
+- FAB mini menu (replace direct "add item" panel open)
+- Full-screen catalog search overlay
+- Search results page with catalog items
+- Quick-add confirmation step (category picker + notes)
+- Tag system on global items
+- Catalog submission flow (manual entry → submit for review)
+- Admin review queue for submissions
+- Review links on catalog items (trusted publications)
+
+### Modified
+- Thread creation — starts from catalog search instead of blank form
+- Thread candidates <20><> can be added from catalog (linked to global item)
+- Global items schema — add tags, rating, review links, submission status
+
+### Unchanged
+- Collection view, setup management, existing item editing
+- Thread comparison view, resolution flow
+- Public profiles and setup sharing
+- Single collection per user (multi-collection deferred)
+
+---
+
+## Data Model Changes (Conceptual)
+
+**global_items** gains:
+- `tags` — array or join table for flexible tagging
+- `rating` — aggregated score (future, when reviews exist)
+- `reviewLinks` — JSON array of `{ title, url, source }` for publication reviews
+- `submissionStatus` — pending_review / approved / rejected
+- `submittedBy` — user who submitted (for pending items)
+
+**New: tags table** (or similar):
+- Curated list of allowed tags
+- Tag-to-global-item many-to-many relationship
+
+**thread_candidates** gains:
+- `globalItemId` — optional link to catalog item (like items have via itemGlobalLinks)
+
+---
+
+## Future (Out of Scope)
+
+These are acknowledged as part of the larger vision but not designed here:
+
+- **Community feed** — Instagram/Reddit-style discovery of gear and setups
+- **User reviews and ratings** — per-item reviews that aggregate into catalog rating
+- **Discussion threads** — comment sections on catalog items
+- **Multi-collection** — separate collections per activity (bikepacking, hiking, etc.)
+- **AI-powered search** — natural language → structured query translation
+- **Price tracking** — historical price data, deal alerts

src/client/hooks/useAuth.ts

@@ -11,6 +11,7 @@ export function useAuth() {
 		queryKey: ["auth"],
 		queryFn: () => apiGet<AuthState>("/api/auth/me"),
 		staleTime: 5 * 60 * 1000,
+		retry: false,
 	});
 }
 

src/client/routeTree.gen.ts

@@ -12,9 +12,12 @@ import { Route as rootRouteImport } from './routes/__root'
 import { Route as SettingsRouteImport } from './routes/settings'
 import { Route as LoginRouteImport } from './routes/login'
 import { Route as IndexRouteImport } from './routes/index'
+import { Route as GlobalItemsIndexRouteImport } from './routes/global-items/index'
 import { Route as CollectionIndexRouteImport } from './routes/collection/index'
+import { Route as UsersUserIdRouteImport } from './routes/users/$userId'
 import { Route as ThreadsThreadIdRouteImport } from './routes/threads/$threadId'
 import { Route as SetupsSetupIdRouteImport } from './routes/setups/$setupId'
+import { Route as GlobalItemsGlobalItemIdRouteImport } from './routes/global-items/$globalItemId'
 
 const SettingsRoute = SettingsRouteImport.update({
   id: '/settings',
@@ -31,11 +34,21 @@ const IndexRoute = IndexRouteImport.update({
   path: '/',
   getParentRoute: () => rootRouteImport,
 } as any)
+const GlobalItemsIndexRoute = GlobalItemsIndexRouteImport.update({
+  id: '/global-items/',
+  path: '/global-items/',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const CollectionIndexRoute = CollectionIndexRouteImport.update({
   id: '/collection/',
   path: '/collection/',
   getParentRoute: () => rootRouteImport,
 } as any)
+const UsersUserIdRoute = UsersUserIdRouteImport.update({
+  id: '/users/$userId',
+  path: '/users/$userId',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const ThreadsThreadIdRoute = ThreadsThreadIdRouteImport.update({
   id: '/threads/$threadId',
   path: '/threads/$threadId',
@@ -46,31 +59,45 @@ const SetupsSetupIdRoute = SetupsSetupIdRouteImport.update({
   path: '/setups/$setupId',
   getParentRoute: () => rootRouteImport,
 } as any)
+const GlobalItemsGlobalItemIdRoute = GlobalItemsGlobalItemIdRouteImport.update({
+  id: '/global-items/$globalItemId',
+  path: '/global-items/$globalItemId',
+  getParentRoute: () => rootRouteImport,
+} as any)
 
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
   '/login': typeof LoginRoute
   '/settings': typeof SettingsRoute
+  '/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
   '/setups/$setupId': typeof SetupsSetupIdRoute
   '/threads/$threadId': typeof ThreadsThreadIdRoute
+  '/users/$userId': typeof UsersUserIdRoute
   '/collection/': typeof CollectionIndexRoute
+  '/global-items/': typeof GlobalItemsIndexRoute
 }
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
   '/login': typeof LoginRoute
   '/settings': typeof SettingsRoute
+  '/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
   '/setups/$setupId': typeof SetupsSetupIdRoute
   '/threads/$threadId': typeof ThreadsThreadIdRoute
+  '/users/$userId': typeof UsersUserIdRoute
   '/collection': typeof CollectionIndexRoute
+  '/global-items': typeof GlobalItemsIndexRoute
 }
 export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/': typeof IndexRoute
   '/login': typeof LoginRoute
   '/settings': typeof SettingsRoute
+  '/global-items/$globalItemId': typeof GlobalItemsGlobalItemIdRoute
   '/setups/$setupId': typeof SetupsSetupIdRoute
   '/threads/$threadId': typeof ThreadsThreadIdRoute
+  '/users/$userId': typeof UsersUserIdRoute
   '/collection/': typeof CollectionIndexRoute
+  '/global-items/': typeof GlobalItemsIndexRoute
 }
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
@@ -78,34 +105,46 @@ export interface FileRouteTypes {
     | '/'
     | '/login'
     | '/settings'
+    | '/global-items/$globalItemId'
     | '/setups/$setupId'
     | '/threads/$threadId'
+    | '/users/$userId'
     | '/collection/'
+    | '/global-items/'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
     | '/login'
     | '/settings'
+    | '/global-items/$globalItemId'
     | '/setups/$setupId'
     | '/threads/$threadId'
+    | '/users/$userId'
     | '/collection'
+    | '/global-items'
   id:
     | '__root__'
     | '/'
     | '/login'
     | '/settings'
+    | '/global-items/$globalItemId'
     | '/setups/$setupId'
     | '/threads/$threadId'
+    | '/users/$userId'
     | '/collection/'
+    | '/global-items/'
   fileRoutesById: FileRoutesById
 }
 export interface RootRouteChildren {
   IndexRoute: typeof IndexRoute
   LoginRoute: typeof LoginRoute
   SettingsRoute: typeof SettingsRoute
+  GlobalItemsGlobalItemIdRoute: typeof GlobalItemsGlobalItemIdRoute
   SetupsSetupIdRoute: typeof SetupsSetupIdRoute
   ThreadsThreadIdRoute: typeof ThreadsThreadIdRoute
+  UsersUserIdRoute: typeof UsersUserIdRoute
   CollectionIndexRoute: typeof CollectionIndexRoute
+  GlobalItemsIndexRoute: typeof GlobalItemsIndexRoute
 }
 
 declare module '@tanstack/react-router' {
@@ -131,6 +170,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof IndexRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/global-items/': {
+      id: '/global-items/'
+      path: '/global-items'
+      fullPath: '/global-items/'
+      preLoaderRoute: typeof GlobalItemsIndexRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/collection/': {
       id: '/collection/'
       path: '/collection'
@@ -138,6 +184,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof CollectionIndexRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/users/$userId': {
+      id: '/users/$userId'
+      path: '/users/$userId'
+      fullPath: '/users/$userId'
+      preLoaderRoute: typeof UsersUserIdRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/threads/$threadId': {
       id: '/threads/$threadId'
       path: '/threads/$threadId'
@@ -152,6 +205,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof SetupsSetupIdRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/global-items/$globalItemId': {
+      id: '/global-items/$globalItemId'
+      path: '/global-items/$globalItemId'
+      fullPath: '/global-items/$globalItemId'
+      preLoaderRoute: typeof GlobalItemsGlobalItemIdRouteImport
+      parentRoute: typeof rootRouteImport
+    }
   }
 }
 
@@ -159,9 +219,12 @@ const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   LoginRoute: LoginRoute,
   SettingsRoute: SettingsRoute,
+  GlobalItemsGlobalItemIdRoute: GlobalItemsGlobalItemIdRoute,
   SetupsSetupIdRoute: SetupsSetupIdRoute,
   ThreadsThreadIdRoute: ThreadsThreadIdRoute,
+  UsersUserIdRoute: UsersUserIdRoute,
   CollectionIndexRoute: CollectionIndexRoute,
+  GlobalItemsIndexRoute: GlobalItemsIndexRoute,
 }
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)

src/client/routes/__root.tsx

@@ -2,6 +2,7 @@ import {
 	createRootRoute,
 	type ErrorComponentProps,
 	Outlet,
+	useLocation,
 	useMatchRoute,
 	useNavigate,
 	useRouter,
@@ -72,7 +73,8 @@ function RootErrorBoundary({ error, reset }: ErrorComponentProps) {
 
 function RootLayout() {
 	const navigate = useNavigate();
-	const { data: auth } = useAuth();
+	const location = useLocation();
+	const { data: auth, isLoading: authLoading } = useAuth();
 	const isAuthenticated = !!auth?.user;
 
 	// Item panel state
@@ -99,7 +101,7 @@ function RootLayout() {
 	const resolveCandidateId = useUIStore((s) => s.resolveCandidateId);
 	const closeResolveDialog = useUIStore((s) => s.closeResolveDialog);
 
-	// Onboarding
+	// Onboarding — only check when authenticated (endpoint requires auth)
 	const { data: onboardingComplete, isLoading: onboardingLoading } =
 		useOnboardingComplete();
 	const [wizardDismissed, setWizardDismissed] = useState(false);
@@ -152,7 +154,30 @@ function RootLayout() {
 			!(collectionSearch as Record<string, string>).tab ||
 			(collectionSearch as Record<string, string>).tab === "gear");
 
-	// Show a minimal loading state while checking onboarding status
+	// Show loading while checking auth
+	if (authLoading) {
+		return (
+			<div className="min-h-screen bg-gray-50 flex items-center justify-center">
+				<div className="w-6 h-6 border-2 border-gray-600 border-t-transparent rounded-full animate-spin" />
+			</div>
+		);
+	}
+
+	// Redirect unauthenticated users to login (server-side OIDC route)
+	// Allow public routes through without auth
+	const isPublicRoute =
+		location.pathname.startsWith("/users/") || location.pathname === "/login";
+
+	if (!isAuthenticated && !isPublicRoute) {
+		window.location.href = "/login";
+		return (
+			<div className="min-h-screen bg-gray-50 flex items-center justify-center">
+				<p className="text-sm text-gray-500">Redirecting to login...</p>
+			</div>
+		);
+	}
+
+	// Show loading while checking onboarding status
 	if (onboardingLoading) {
 		return (
 			<div className="min-h-screen bg-gray-50 flex items-center justify-center">

src/db/schema.ts

@@ -198,9 +198,7 @@ export const oauthCodes = pgTable("oauth_codes", {
 	code: text("code").notNull().unique(),
 	clientId: text("client_id").notNull(),
 	codeChallenge: text("code_challenge").notNull(),
-	codeChallengeMethod: text("code_challenge_method")
+	codeChallengeMethod: text("code_challenge_method").notNull().default("S256"),
-		.notNull()
-		.default("S256"),
 	redirectUri: text("redirect_uri").notNull(),
 	expiresAt: timestamp("expires_at").notNull(),
 	used: integer("used").notNull().default(0),

src/db/seed-global-items.ts

@@ -1,6 +1,6 @@
+import seedData from "./global-items-seed.json";
 import { db as prodDb } from "./index.ts";
 import { globalItems } from "./schema.ts";
-import seedData from "./global-items-seed.json";
 
 type Db = typeof prodDb;
 

src/server/index.ts

@@ -1,11 +1,11 @@
-import { Hono } from "hono";
-import { serveStatic } from "hono/bun";
-import { cors } from "hono/cors";
 import {
 	oidcAuthMiddleware,
 	processOAuthCallback,
 	revokeSession,
 } from "@hono/oidc-auth";
+import { Hono } from "hono";
+import { serveStatic } from "hono/bun";
+import { cors } from "hono/cors";
 import { db as prodDb } from "../db/index.ts";
 import { seedDefaults } from "../db/seed.ts";
 import { mcpRoutes } from "./mcp/index.ts";
@@ -15,8 +15,8 @@ import { categoryRoutes } from "./routes/categories.ts";
 import { imageRoutes } from "./routes/images.ts";
 import { itemRoutes } from "./routes/items.ts";
 import { oauthRoutes, wellKnownRoute } from "./routes/oauth.ts";
-import { settingsRoutes } from "./routes/settings.ts";
 import { profileRoutes } from "./routes/profiles.ts";
+import { settingsRoutes } from "./routes/settings.ts";
 import { setupRoutes } from "./routes/setups.ts";
 import { threadRoutes } from "./routes/threads.ts";
 import { totalRoutes } from "./routes/totals.ts";
@@ -42,6 +42,24 @@ app.get("/api/health", (c) => {
 });
 
 // ── OIDC Browser Auth (top-level, before /api/* middleware) ───────────
+
+// In dev mode, strip Secure flag from OIDC cookies so they work over HTTP
+if (process.env.NODE_ENV !== "production") {
+	app.use("*", async (c, next) => {
+		await next();
+		const setCookies = c.res.headers.getSetCookie?.() ?? [];
+		if (setCookies.length > 0) {
+			c.res.headers.delete("Set-Cookie");
+			for (const cookie of setCookies) {
+				c.res.headers.append(
+					"Set-Cookie",
+					cookie.replace(/;\s*Secure/gi, ""),
+				);
+			}
+		}
+	});
+}
+
 app.get("/login", oidcAuthMiddleware(), async (c) => c.redirect("/"));
 app.get("/callback", async (c) => processOAuthCallback(c));
 app.get("/logout", async (c) => {

src/server/middleware/auth.ts

@@ -39,7 +39,8 @@ export async function requireAuth(c: Context, next: Next) {
 			c.set("userId", user.id);
 			return next();
 		}
-	} catch {
+	} catch (err) {
+		console.error("[auth] OIDC auth failed:", err);
 		// OIDC not configured or session invalid — fall through
 	}
 

src/server/routes/auth.ts

@@ -1,7 +1,8 @@
-import { zValidator } from "@hono/zod-validator";
 import { getAuth } from "@hono/oidc-auth";
+import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
 import { z } from "zod";
+import { updateProfileSchema } from "../../shared/schemas.ts";
 import { parseId } from "../lib/params.ts";
 import { requireAuth } from "../middleware/auth.ts";
 import {
@@ -10,7 +11,6 @@ import {
 	listApiKeys,
 } from "../services/auth.service.ts";
 import { updateProfile } from "../services/profile.service.ts";
-import { updateProfileSchema } from "../../shared/schemas.ts";
 
 type Env = { Variables: { db?: any; userId?: number } };
 

src/server/routes/setups.ts

@@ -7,7 +7,6 @@ import {
 	updateSetupSchema,
 } from "../../shared/schemas.ts";
 import { parseId } from "../lib/params.ts";
-import { withImageUrls } from "../services/storage.service.ts";
 import { getPublicSetupWithItems } from "../services/profile.service.ts";
 import {
 	createSetup,
@@ -19,6 +18,7 @@ import {
 	updateItemClassification,
 	updateSetup,
 } from "../services/setup.service.ts";
+import { withImageUrls } from "../services/storage.service.ts";
 
 type Env = { Variables: { db?: any; userId?: number } };
 

src/server/routes/threads.ts

@@ -9,10 +9,7 @@ import {
 	updateThreadSchema,
 } from "../../shared/schemas.ts";
 import { parseId } from "../lib/params.ts";
-import {
+import { deleteImage, withImageUrls } from "../services/storage.service.ts";
-	deleteImage,
-	withImageUrls,
-} from "../services/storage.service.ts";
 import {
 	createCandidate,
 	createThread,

src/server/services/auth.service.ts

@@ -1,6 +1,6 @@
 import { randomBytes } from "node:crypto";
 import { and, eq } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import { apiKeys, users } from "../../db/schema.ts";
 
 type Db = typeof prodDb;
@@ -24,11 +24,7 @@ export async function getOrCreateUser(
 
 // ── API Key Management ───────────────────────────────────────────────
 
-export async function createApiKey(
+export async function createApiKey(db: Db, userId: number, name: string) {
-	db: Db,
-	userId: number,
-	name: string,
-) {
 	const rawKey = randomBytes(32).toString("hex");
 	const keyHash = await Bun.password.hash(rawKey);
 	const keyPrefix = rawKey.slice(0, 8);

src/server/services/category.service.ts

@@ -20,76 +20,85 @@ export async function getOrCreateUncategorized(db: Db, userId: number) {
 	return created;
 }
 
-export function getAllCategories(db: Db = prodDb) {
+export async function getAllCategories(db: Db, userId: number) {
-	return db.select().from(categories).orderBy(asc(categories.name)).all();
+	return db
+		.select()
+		.from(categories)
+		.where(eq(categories.userId, userId))
+		.orderBy(asc(categories.name));
 }
 
-export function createCategory(
+export async function createCategory(
-	db: Db = prodDb,
+	db: Db,
+	userId: number,
 	data: { name: string; icon?: string },
 ) {
-	return db
+	const [row] = await db
 		.insert(categories)
 		.values({
 			name: data.name,
+			userId,
 			...(data.icon ? { icon: data.icon } : {}),
 		})
-		.returning()
+		.returning();
-		.get();
+	return row;
 }
 
-export function updateCategory(
+export async function updateCategory(
-	db: Db = prodDb,
+	db: Db,
+	userId: number,
 	id: number,
 	data: { name?: string; icon?: string },
 ) {
-	const existing = db
+	const [existing] = await db
 		.select({ id: categories.id })
 		.from(categories)
-		.where(eq(categories.id, id))
+		.where(and(eq(categories.id, id), eq(categories.userId, userId)));
-		.get();
 
 	if (!existing) return null;
 
-	return db
+	const [row] = await db
 		.update(categories)
 		.set(data)
-		.where(eq(categories.id, id))
+		.where(and(eq(categories.id, id), eq(categories.userId, userId)))
-		.returning()
+		.returning();
-		.get();
+	return row;
 }
 
-export function deleteCategory(
+export async function deleteCategory(
-	db: Db = prodDb,
+	db: Db,
+	userId: number,
 	id: number,
-): { success: boolean; error?: string } {
+): Promise<{ success: boolean; error?: string }> {
-	// Guard: cannot delete Uncategorized (id=1)
+	// Check if category exists and belongs to user
-	if (id === 1) {
+	const [existing] = await db
+		.select({ id: categories.id, name: categories.name })
+		.from(categories)
+		.where(and(eq(categories.id, id), eq(categories.userId, userId)));
+
+	if (!existing) {
+		return { success: false, error: "Category not found" };
+	}
+
+	// Guard: cannot delete Uncategorized
+	if (existing.name === "Uncategorized") {
 		return {
 			success: false,
 			error: "Cannot delete the Uncategorized category",
 		};
 	}
 
-	// Check if category exists
+	// Get the user's Uncategorized category for reassignment
-	const existing = db
+	const uncategorized = await getOrCreateUncategorized(db, userId);
-		.select({ id: categories.id })
-		.from(categories)
-		.where(eq(categories.id, id))
-		.get();
 
-	if (!existing) {
+	// Reassign items to Uncategorized, then delete atomically
-		return { success: false, error: "Category not found" };
+	await db.transaction(async (tx) => {
-	}
+		await tx
+			.update(items)
+			.set({ categoryId: uncategorized.id })
+			.where(eq(items.categoryId, id));
 
-	// Reassign items to Uncategorized (id=1), then delete atomically
+		await tx.delete(categories).where(eq(categories.id, id));
-	db.transaction(() => {
-		db.update(items)
-			.set({ categoryId: 1 })
-			.where(eq(items.categoryId, id))
-			.run();
-
-		db.delete(categories).where(eq(categories.id, id)).run();
 	});
 
 	return { success: true };

src/server/services/csv.service.ts

@@ -1,5 +1,5 @@
 import { and, eq } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import { categories, items } from "../../db/schema.ts";
 import { getOrCreateUncategorized } from "./category.service.ts";
 

src/server/services/global-item.service.ts

@@ -5,12 +5,12 @@ import { globalItems, itemGlobalLinks } from "../../db/schema.ts";
 type Db = typeof prodDb;
 
 /**
- * Search global items by brand or model. SQLite LIKE is case-insensitive for ASCII.
+ * Search global items by brand or model. LIKE is case-insensitive for ASCII.
  * Escapes % and _ wildcard characters in user input.
  */
-export function searchGlobalItems(db: Db = prodDb, query?: string) {
+export async function searchGlobalItems(db: Db = prodDb, query?: string) {
 	if (!query) {
-		return db.select().from(globalItems).all();
+		return db.select().from(globalItems);
 	}
 
 	// Escape SQL LIKE wildcards
@@ -21,31 +21,28 @@ export function searchGlobalItems(db: Db = prodDb, query?: string) {
 		.select()
 		.from(globalItems)
 		.where(
-			or(
+			or(like(globalItems.brand, pattern), like(globalItems.model, pattern)),
-				like(globalItems.brand, pattern),
+		);
-				like(globalItems.model, pattern),
-			),
-		)
-		.all();
 }
 
 /**
  * Get a single global item by ID with the count of user items linked to it.
  */
-export function getGlobalItemWithOwnerCount(db: Db = prodDb, id: number) {
+export async function getGlobalItemWithOwnerCount(
-	const item = db
+	db: Db = prodDb,
+	id: number,
+) {
+	const [item] = await db
 		.select()
 		.from(globalItems)
-		.where(eq(globalItems.id, id))
+		.where(eq(globalItems.id, id));
-		.get();
 
 	if (!item) return null;
 
-	const result = db
+	const [result] = await db
 		.select({ ownerCount: count() })
 		.from(itemGlobalLinks)
-		.where(eq(itemGlobalLinks.globalItemId, id))
+		.where(eq(itemGlobalLinks.globalItemId, id));
-		.get();
 
 	return { ...item, ownerCount: result?.ownerCount ?? 0 };
 }
@@ -53,27 +50,26 @@ export function getGlobalItemWithOwnerCount(db: Db = prodDb, id: number) {
 /**
  * Link a user's item to a global item. Throws on duplicate (unique constraint on itemId).
  */
-export function linkItemToGlobal(
+export async function linkItemToGlobal(
 	db: Db = prodDb,
 	itemId: number,
 	globalItemId: number,
 ) {
-	return db
+	const [row] = await db
 		.insert(itemGlobalLinks)
 		.values({ itemId, globalItemId })
-		.returning()
+		.returning();
-		.get();
+	return row;
 }
 
 /**
  * Remove the link between a user's item and any global item.
  */
-export function unlinkItemFromGlobal(db: Db = prodDb, itemId: number) {
+export async function unlinkItemFromGlobal(db: Db = prodDb, itemId: number) {
-	const result = db
+	const result = await db
 		.delete(itemGlobalLinks)
 		.where(eq(itemGlobalLinks.itemId, itemId))
-		.returning()
+		.returning();
-		.all();
 
 	return result.length;
 }

src/server/services/item.service.ts

@@ -1,5 +1,5 @@
 import { and, eq } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import { categories, items } from "../../db/schema.ts";
 import type { CreateItem } from "../../shared/types.ts";
 
@@ -146,9 +146,7 @@ export async function deleteItem(db: Db, userId: number, id: number) {
 
 	if (!item) return null;
 
-	await db
+	await db.delete(items).where(and(eq(items.id, id), eq(items.userId, userId)));
-		.delete(items)
-		.where(and(eq(items.id, id), eq(items.userId, userId)));
 
 	return item;
 }

src/server/services/oauth.service.ts

@@ -86,10 +86,7 @@ export async function exchangeCode(
 	if (computedChallenge !== record.codeChallenge) return null;
 
 	// Mark code as used
-	await db
+	await db.update(oauthCodes).set({ used: 1 }).where(eq(oauthCodes.code, code));
-		.update(oauthCodes)
-		.set({ used: 1 })
-		.where(eq(oauthCodes.code, code));
 
 	return generateTokens(db, clientId, userId);
 }

src/server/services/profile.service.ts

@@ -1,5 +1,5 @@
 import { and, eq, sql } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import {
 	categories,
 	items,
@@ -16,10 +16,7 @@ export async function updateProfile(
 	userId: number,
 	data: UpdateProfile,
 ) {
-	const [existing] = await db
+	const [existing] = await db.select().from(users).where(eq(users.id, userId));
-		.select()
-		.from(users)
-		.where(eq(users.id, userId));
 	if (!existing) return null;
 
 	// If no fields to update, return existing user

src/server/services/setup.service.ts

@@ -1,15 +1,11 @@
 import { and, eq, inArray, sql } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import { categories, items, setupItems, setups } from "../../db/schema.ts";
 import type { CreateSetup, UpdateSetup } from "../../shared/types.ts";
 
 type Db = typeof prodDb;
 
-export async function createSetup(
+export async function createSetup(db: Db, userId: number, data: CreateSetup) {
-	db: Db,
-	userId: number,
-	data: CreateSetup,
-) {
 	const [row] = await db
 		.insert(setups)
 		.values({ name: data.name, userId, isPublic: data.isPublic ?? false })
@@ -110,11 +106,7 @@ export async function updateSetup(
 	return row;
 }
 
-export async function deleteSetup(
+export async function deleteSetup(db: Db, userId: number, setupId: number) {
-	db: Db,
-	userId: number,
-	setupId: number,
-) {
 	const [existing] = await db
 		.select({ id: setups.id })
 		.from(setups)
@@ -197,9 +189,7 @@ export async function updateItemClassification(
 	await db
 		.update(setupItems)
 		.set({ classification })
-		.where(
+		.where(and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)));
-			and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)),
-		);
 }
 
 export async function removeSetupItem(
@@ -217,7 +207,5 @@ export async function removeSetupItem(
 
 	await db
 		.delete(setupItems)
-		.where(
+		.where(and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)));
-			and(eq(setupItems.setupId, setupId), eq(setupItems.itemId, itemId)),
-		);
 }

src/server/services/storage.service.ts

@@ -62,9 +62,9 @@ export async function getImageUrl(filename: string): Promise<string> {
  * Enrich a record that has an imageFilename with a presigned imageUrl.
  * Returns null imageUrl when imageFilename is null.
  */
-export async function withImageUrl<
+export async function withImageUrl<T extends { imageFilename: string | null }>(
-	T extends { imageFilename: string | null },
+	record: T,
->(record: T): Promise<T & { imageUrl: string | null }> {
+): Promise<T & { imageUrl: string | null }> {
 	return {
 		...record,
 		imageUrl: record.imageFilename
@@ -76,8 +76,8 @@ export async function withImageUrl<
 /**
  * Batch version of withImageUrl. Uses Promise.all for parallelism.
  */
-export async function withImageUrls<
+export async function withImageUrls<T extends { imageFilename: string | null }>(
-	T extends { imageFilename: string | null },
+	records: T[],
->(records: T[]): Promise<(T & { imageUrl: string | null })[]> {
+): Promise<(T & { imageUrl: string | null })[]> {
 	return Promise.all(records.map((record) => withImageUrl(record)));
 }

src/server/services/thread.service.ts

@@ -1,5 +1,5 @@
 import { and, asc, desc, eq, max, sql } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import {
 	categories,
 	items,
@@ -15,11 +15,7 @@ import { getOrCreateUncategorized } from "./category.service.ts";
 
 type Db = typeof prodDb;
 
-export async function createThread(
+export async function createThread(db: Db, userId: number, data: CreateThread) {
-	db: Db,
-	userId: number,
-	data: CreateThread,
-) {
 	const [row] = await db
 		.insert(threads)
 		.values({ name: data.name, categoryId: data.categoryId, userId })
@@ -258,9 +254,7 @@ export async function deleteCandidate(
 	const [thread] = await db
 		.select({ id: threads.id })
 		.from(threads)
-		.where(
+		.where(and(eq(threads.id, candidate.threadId), eq(threads.userId, userId)));
-			and(eq(threads.id, candidate.threadId), eq(threads.userId, userId)),
-		);
 	if (!thread) return null;
 
 	await db.delete(threadCandidates).where(eq(threadCandidates.id, candidateId));

src/server/services/totals.service.ts

@@ -1,5 +1,5 @@
 import { and, eq, sql } from "drizzle-orm";
-import { db as prodDb } from "../../db/index.ts";
+import type { db as prodDb } from "../../db/index.ts";
 import { categories, items } from "../../db/schema.ts";
 
 type Db = typeof prodDb;

tests/routes/global-items.test.ts

@@ -30,11 +30,7 @@ function insertGlobalItem(db: TestDb, brand: string, model: string) {
 }
 
 function insertItem(db: TestDb, name: string) {
-	return db
+	return db.insert(items).values({ name, categoryId: 1 }).returning().get();
-		.insert(items)
-		.values({ name, categoryId: 1 })
-		.returning()
-		.get();
 }
 
 describe("Global Item Routes", () => {

tests/routes/images.test.ts

@@ -16,7 +16,10 @@ mock.module("../../src/server/services/storage.service", () => ({
 
 // Also mock image service for from-url test
 const mockFetchImageFromUrl = mock(() =>
-	Promise.resolve({ filename: "test.png", sourceUrl: "https://example.com/img.png" }),
+	Promise.resolve({
+		filename: "test.png",
+		sourceUrl: "https://example.com/img.png",
+	}),
 );
 mock.module("../../src/server/services/image.service", () => ({
 	fetchImageFromUrl: mockFetchImageFromUrl,

tests/routes/oauth.test.ts

@@ -45,7 +45,10 @@ describe("OAuth Routes", () => {
 		userId = testApp.userId;
 		mockGetAuth.mockReset();
 		// Default: user is authenticated via OIDC
-		mockGetAuth.mockReturnValue({ sub: "test-user-logto-sub", email: "admin@example.com" });
+		mockGetAuth.mockReturnValue({
+			sub: "test-user-logto-sub",
+			email: "admin@example.com",
+		});
 	});
 
 	describe("GET /.well-known/oauth-authorization-server", () => {

tests/routes/profiles.test.ts

@@ -1,15 +1,17 @@
 import { beforeEach, describe, expect, it } from "bun:test";
+import { zValidator } from "@hono/zod-validator";
 import { eq } from "drizzle-orm";
 import { Hono } from "hono";
 import * as schema from "../../src/db/schema.ts";
-import { updateProfileSchema } from "../../src/shared/schemas.ts";
+import { parseId } from "../../src/server/lib/params.ts";
 import { profileRoutes } from "../../src/server/routes/profiles.ts";
 import { setupRoutes } from "../../src/server/routes/setups.ts";
-import { getPublicSetupWithItems } from "../../src/server/services/profile.service.ts";
+import {
-import { updateProfile } from "../../src/server/services/profile.service.ts";
+	getPublicSetupWithItems,
+	updateProfile,
+} from "../../src/server/services/profile.service.ts";
+import { updateProfileSchema } from "../../src/shared/schemas.ts";
 import { createTestDb } from "../helpers/db.ts";
-import { zValidator } from "@hono/zod-validator";
-import { parseId } from "../../src/server/lib/params.ts";
 
 type Db = Awaited<ReturnType<typeof createTestDb>>["db"];
 
@@ -112,9 +114,7 @@ describe("Profile Routes", () => {
 
 		it("includes only public setups", async () => {
 			// Create public and private setups
-			await db
+			await db.insert(schema.setups).values([
-				.insert(schema.setups)
-				.values([
 				{ name: "Public Setup", userId, isPublic: true },
 				{ name: "Private Setup", userId, isPublic: false },
 			]);

tests/services/global-item.service.test.ts

@@ -1,12 +1,12 @@
 import { beforeEach, describe, expect, it } from "bun:test";
 import { globalItems, itemGlobalLinks, items } from "../../src/db/schema.ts";
+import { seedGlobalItems } from "../../src/db/seed-global-items.ts";
 import {
 	getGlobalItemWithOwnerCount,
 	linkItemToGlobal,
 	searchGlobalItems,
 	unlinkItemFromGlobal,
 } from "../../src/server/services/global-item.service.ts";
-import { seedGlobalItems } from "../../src/db/seed-global-items.ts";
 import { createTestDb } from "../helpers/db.ts";
 
 type TestDb = ReturnType<typeof createTestDb>;
@@ -35,11 +35,7 @@ function insertGlobalItem(
 }
 
 function insertItem(db: TestDb, name: string) {
-	return db
+	return db.insert(items).values({ name, categoryId: 1 }).returning().get();
-		.insert(items)
-		.values({ name, categoryId: 1 })
-		.returning()
-		.get();
 }
 
 describe("Global Item Service", () => {
@@ -51,7 +47,10 @@ describe("Global Item Service", () => {
 
 	describe("searchGlobalItems", () => {
 		it("returns all global items when no query provided", () => {
-			insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
+			insertGlobalItem(db, {
+				brand: "Revelate Designs",
+				model: "Terrapin System",
+			});
 			insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
 
 			const results = searchGlobalItems(db);
@@ -59,7 +58,10 @@ describe("Global Item Service", () => {
 		});
 
 		it("returns items matching brand (case-insensitive)", () => {
-			insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
+			insertGlobalItem(db, {
+				brand: "Revelate Designs",
+				model: "Terrapin System",
+			});
 			insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
 
 			const results = searchGlobalItems(db, "revelate");
@@ -68,7 +70,10 @@ describe("Global Item Service", () => {
 		});
 
 		it("returns items matching model (case-insensitive)", () => {
-			insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
+			insertGlobalItem(db, {
+				brand: "Revelate Designs",
+				model: "Terrapin System",
+			});
 			insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
 
 			const results = searchGlobalItems(db, "HANDLEBAR");
@@ -77,7 +82,10 @@ describe("Global Item Service", () => {
 		});
 
 		it("does not match everything with wildcard chars", () => {
-			insertGlobalItem(db, { brand: "Revelate Designs", model: "Terrapin System" });
+			insertGlobalItem(db, {
+				brand: "Revelate Designs",
+				model: "Terrapin System",
+			});
 			insertGlobalItem(db, { brand: "Apidura", model: "Handlebar Pack" });
 
 			const results = searchGlobalItems(db, "100%");
@@ -87,7 +95,10 @@ describe("Global Item Service", () => {
 
 	describe("getGlobalItemWithOwnerCount", () => {
 		it("returns item with ownerCount 0 when no links", () => {
-			const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
+			const gi = insertGlobalItem(db, {
+				brand: "MSR",
+				model: "PocketRocket 2",
+			});
 
 			const result = getGlobalItemWithOwnerCount(db, gi.id);
 			expect(result).not.toBeNull();
@@ -96,7 +107,10 @@ describe("Global Item Service", () => {
 		});
 
 		it("returns ownerCount matching number of linked items", () => {
-			const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
+			const gi = insertGlobalItem(db, {
+				brand: "MSR",
+				model: "PocketRocket 2",
+			});
 			const item1 = insertItem(db, "My Stove");
 			const item2 = insertItem(db, "Another Stove");
 
@@ -120,7 +134,10 @@ describe("Global Item Service", () => {
 
 	describe("linkItemToGlobal", () => {
 		it("creates link and returns link row", () => {
-			const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
+			const gi = insertGlobalItem(db, {
+				brand: "MSR",
+				model: "PocketRocket 2",
+			});
 			const item = insertItem(db, "My Stove");
 
 			const link = linkItemToGlobal(db, item.id, gi.id);
@@ -129,7 +146,10 @@ describe("Global Item Service", () => {
 		});
 
 		it("throws when item already linked", () => {
-			const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
+			const gi = insertGlobalItem(db, {
+				brand: "MSR",
+				model: "PocketRocket 2",
+			});
 			const item = insertItem(db, "My Stove");
 
 			linkItemToGlobal(db, item.id, gi.id);
@@ -139,7 +159,10 @@ describe("Global Item Service", () => {
 
 	describe("unlinkItemFromGlobal", () => {
 		it("removes the link", () => {
-			const gi = insertGlobalItem(db, { brand: "MSR", model: "PocketRocket 2" });
+			const gi = insertGlobalItem(db, {
+				brand: "MSR",
+				model: "PocketRocket 2",
+			});
 			const item = insertItem(db, "My Stove");
 
 			linkItemToGlobal(db, item.id, gi.id);

tests/services/image.service.test.ts

@@ -21,12 +21,12 @@ const { fetchImageFromUrl } = await import(
 
 // 1x1 transparent PNG (smallest valid PNG)
 const TINY_PNG = new Uint8Array([
-	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49,
-	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
+	0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06,
-	0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0x15, 0xc4, 0x89, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x15, 0xc4, 0x89, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44,
-	0x0a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x62, 0x00, 0x00, 0x00, 0x02,
+	0x41, 0x54, 0x78, 0x9c, 0x62, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0xe2, 0x21,
-	0x00, 0x01, 0xe2, 0x21, 0xbc, 0x33, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+	0xbc, 0x33, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
-	0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+	0x82,
 ]);
 
 let server: Server;
@@ -72,17 +72,17 @@ describe("Image Service", () => {
 
 			// Verify uploadImage was called with correct args
 			expect(mockUploadImage).toHaveBeenCalledTimes(1);
-			const [buffer, filename, contentType] =
+			const [buffer, filename, contentType] = mockUploadImage.mock
-				mockUploadImage.mock.calls[0] as unknown[];
+				.calls[0] as unknown[];
 			expect(buffer).toBeInstanceOf(Buffer);
 			expect(filename).toBe(result.filename);
 			expect(contentType).toBe("image/png");
 		});
 
 		it("rejects non-image content type", async () => {
-			await expect(
+			await expect(fetchImageFromUrl(`${baseUrl}/page.html`)).rejects.toThrow(
-				fetchImageFromUrl(`${baseUrl}/page.html`),
+				"Invalid content type",
-			).rejects.toThrow("Invalid content type");
+			);
 		});
 
 		it("rejects invalid URL format", async () => {
@@ -98,9 +98,9 @@ describe("Image Service", () => {
 		});
 
 		it("rejects 404 responses", async () => {
-			await expect(
+			await expect(fetchImageFromUrl(`${baseUrl}/missing.jpg`)).rejects.toThrow(
-				fetchImageFromUrl(`${baseUrl}/missing.jpg`),
+				"HTTP 404",
-			).rejects.toThrow("HTTP 404");
+			);
 		});
 	});
 });

tests/services/profile.service.test.ts

@@ -72,7 +72,10 @@ describe("Profile Service", () => {
 
 		it("returns only public setups, not private ones", async () => {
 			// Create one public and one private setup
-			const pub = await createSetup(db, userId, { name: "Public Setup", isPublic: true });
+			const pub = await createSetup(db, userId, {
+				name: "Public Setup",
+				isPublic: true,
+			});
 			const priv = await createSetup(db, userId, { name: "Private Setup" });
 
 			const profile = await getPublicProfile(db, userId);

tests/services/setup.service.test.ts

@@ -240,13 +240,7 @@ describe("Setup Service", () => {
 			await syncSetupItems(db, userId, setup.id, [item1.id, item2.id]);
 
 			// Change classifications
-			await updateItemClassification(
+			await updateItemClassification(db, userId, setup.id, item1.id, "worn");
-				db,
-				userId,
-				setup.id,
-				item1.id,
-				"worn",
-			);
 			await updateItemClassification(
 				db,
 				userId,
@@ -261,12 +255,8 @@ describe("Setup Service", () => {
 			const result = await getSetupWithItems(db, userId, setup.id);
 			expect(result?.items).toHaveLength(2);
 
-			const item2Result = result?.items.find(
+			const item2Result = result?.items.find((i: any) => i.name === "Jacket");
-				(i: any) => i.name === "Jacket",
+			const item3Result = result?.items.find((i: any) => i.name === "Stove");
-			);
-			const item3Result = result?.items.find(
-				(i: any) => i.name === "Stove",
-			);
 			expect(item2Result?.classification).toBe("consumable");
 			expect(item3Result?.classification).toBe("base");
 		});
@@ -293,13 +283,7 @@ describe("Setup Service", () => {
 			});
 			await syncSetupItems(db, userId, setup.id, [item.id]);
 
-			await updateItemClassification(
+			await updateItemClassification(db, userId, setup.id, item.id, "worn");
-				db,
-				userId,
-				setup.id,
-				item.id,
-				"worn",
-			);
 
 			const result = await getSetupWithItems(db, userId, setup.id);
 			expect(result?.items[0].classification).toBe("worn");
@@ -318,13 +302,7 @@ describe("Setup Service", () => {
 			expect(result?.items[0].classification).toBe("base");
 
 			// Update
-			await updateItemClassification(
+			await updateItemClassification(db, userId, setup.id, item.id, "worn");
-				db,
-				userId,
-				setup.id,
-				item.id,
-				"worn",
-			);
 
 			result = await getSetupWithItems(db, userId, setup.id);
 			expect(result?.items[0].classification).toBe("worn");
@@ -341,20 +319,8 @@ describe("Setup Service", () => {
 			await syncSetupItems(db, userId, setup1.id, [item.id]);
 			await syncSetupItems(db, userId, setup2.id, [item.id]);
 
-			await updateItemClassification(
+			await updateItemClassification(db, userId, setup1.id, item.id, "worn");
-				db,
+			await updateItemClassification(db, userId, setup2.id, item.id, "base");
-				userId,
-				setup1.id,
-				item.id,
-				"worn",
-			);
-			await updateItemClassification(
-				db,
-				userId,
-				setup2.id,
-				item.id,
-				"base",
-			);
 
 			const result1 = await getSetupWithItems(db, userId, setup1.id);
 			const result2 = await getSetupWithItems(db, userId, setup2.id);

tests/services/storage.service.test.ts

@@ -43,13 +43,8 @@ process.env.S3_BUCKET = "gearbox-images";
 process.env.S3_REGION = "us-east-1";
 
 // Import after mocking
-const {
+const { uploadImage, deleteImage, getImageUrl, withImageUrl, withImageUrls } =
-	uploadImage,
+	await import("@/server/services/storage.service");
-	deleteImage,
-	getImageUrl,
-	withImageUrl,
-	withImageUrls,
-} = await import("@/server/services/storage.service");
 
 describe("storage.service", () => {
 	beforeEach(() => {
@@ -66,7 +61,9 @@ describe("storage.service", () => {
 			await uploadImage(buffer, "test-image.jpg", "image/jpeg");
 
 			expect(mockSend).toHaveBeenCalledTimes(1);
-			const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
+			const command = mockSend.mock.calls[0][0] as {
+				input: Record<string, unknown>;
+			};
 			expect(command.input.Bucket).toBe("gearbox-images");
 			expect(command.input.Key).toBe("test-image.jpg");
 			expect(command.input.ContentType).toBe("image/jpeg");
@@ -78,7 +75,9 @@ describe("storage.service", () => {
 			await uploadImage(arrayBuffer, "test.png", "image/png");
 
 			expect(mockSend).toHaveBeenCalledTimes(1);
-			const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
+			const command = mockSend.mock.calls[0][0] as {
+				input: Record<string, unknown>;
+			};
 			expect(Buffer.isBuffer(command.input.Body)).toBe(true);
 		});
 	});
@@ -88,7 +87,9 @@ describe("storage.service", () => {
 			await deleteImage("test-image.jpg");
 
 			expect(mockSend).toHaveBeenCalledTimes(1);
-			const command = mockSend.mock.calls[0][0] as { input: Record<string, unknown> };
+			const command = mockSend.mock.calls[0][0] as {
+				input: Record<string, unknown>;
+			};
 			expect(command.input.Bucket).toBe("gearbox-images");
 			expect(command.input.Key).toBe("test-image.jpg");
 		});
@@ -99,9 +100,7 @@ describe("storage.service", () => {
 			const url = await getImageUrl("test-image.jpg");
 
 			expect(mockGetSignedUrl).toHaveBeenCalledTimes(1);
-			expect(url).toBe(
+			expect(url).toBe("https://minio:9000/gearbox-images/test.jpg?signed=1");
-				"https://minio:9000/gearbox-images/test.jpg?signed=1",
-			);
 		});
 	});
 

tests/services/thread.service.test.ts

@@ -564,11 +564,7 @@ describe("Thread Service", () => {
 			expect(result.item?.productUrl).toBe("https://example.com/tent");
 
 			// Thread should be resolved
-			const resolved = await getThreadWithCandidates(
+			const resolved = await getThreadWithCandidates(db, userId, thread.id);
-				db,
-				userId,
-				thread.id,
-			);
 			expect(resolved?.status).toBe("resolved");
 			expect(resolved?.resolvedCandidateId).toBe(candidate.id);
 		});
@@ -585,12 +581,7 @@ describe("Thread Service", () => {
 			await resolveThread(db, userId, thread.id, candidate.id);
 
 			// Try to resolve again
-			const result = await resolveThread(
+			const result = await resolveThread(db, userId, thread.id, candidate.id);
-				db,
-				userId,
-				thread.id,
-				candidate.id,
-			);
 			expect(result.success).toBe(false);
 			expect(result.error).toBeDefined();
 		});
@@ -609,12 +600,7 @@ describe("Thread Service", () => {
 				categoryId: 1,
 			});
 
-			const result = await resolveThread(
+			const result = await resolveThread(db, userId, thread1.id, candidate.id);
-				db,
-				userId,
-				thread1.id,
-				candidate.id,
-			);
 			expect(result.success).toBe(false);
 			expect(result.error).toBeDefined();
 		});

vite.config.ts

@@ -18,6 +18,11 @@ export default defineConfig({
 		proxy: {
 			"/api": "http://localhost:3000",
 			"/uploads": "http://localhost:3000",
+			"/login": { target: "http://localhost:3000", changeOrigin: false },
+			"/callback": { target: "http://localhost:3000", changeOrigin: false },
+			"/logout": { target: "http://localhost:3000", changeOrigin: false },
+			"/.well-known": "http://localhost:3000",
+			"/oauth": "http://localhost:3000",
 		},
 	},
 	build: {