2 files changed, 17 insertions, 23 deletions
diff --git a/apps/web/app/api/assets/[assetId]/route.ts b/apps/web/app/api/assets/[assetId]/route.ts
index 6b583e51..f3cf1ab4 100644
--- a/apps/web/app/api/assets/[assetId]/route.ts
+++ b/apps/web/app/api/assets/[assetId]/route.ts
@@ -1,8 +1,6 @@
 import { createContextFromRequest } from "@/server/api/client";
-import { and, eq } from "drizzle-orm";
 
-import { db } from "@hoarder/db";
-import { assets } from "@hoarder/db/schema";
+import { readAsset } from "@hoarder/shared/assetdb";
 
 export const dynamic = "force-dynamic";
 export async function GET(
@@ -13,17 +11,15 @@ export async function GET(
   if (!ctx.user) {
     return Response.json({ error: "Unauthorized" }, { status: 401 });
   }
-  const asset = await db.query.assets.findFirst({
-    where: and(eq(assets.id, params.assetId), eq(assets.userId, ctx.user.id)),
+  const { asset, metadata } = await readAsset({
+    userId: ctx.user.id,
+    assetId: params.assetId,
   });
 
-  if (!asset) {
-    return Response.json({ error: "Asset not found" }, { status: 404 });
-  }
-  return new Response(asset.blob as string, {
+  return new Response(asset, {
     status: 200,
     headers: {
-      "Content-type": asset.contentType,
+      "Content-type": metadata.contentType,
     },
   });
 }
diff --git a/apps/web/app/api/assets/route.ts b/apps/web/app/api/assets/route.ts
index 2caa4d4c..4e1746b3 100644
--- a/apps/web/app/api/assets/route.ts
+++ b/apps/web/app/api/assets/route.ts
@@ -1,8 +1,7 @@
 import { createContextFromRequest } from "@/server/api/client";
 
 import type { ZUploadResponse } from "@hoarder/trpc/types/uploads";
-import { db } from "@hoarder/db";
-import { assets } from "@hoarder/db/schema";
+import { saveAsset } from "@hoarder/shared/assetdb";
 
 const SUPPORTED_ASSET_TYPES = new Set(["image/jpeg", "image/png"]);
 
@@ -34,19 +33,18 @@ export async function POST(request: Request) {
     return Response.json({ error: "Bad request" }, { status: 400 });
   }
 
-  const [dbRes] = await db
-    .insert(assets)
-    .values({
-      encoding: "binary",
-      contentType: contentType,
-      blob: buffer,
-      userId: ctx.user.id,
-    })
-    .returning();
+  const assetId = crypto.randomUUID();
+
+  await saveAsset({
+    userId: ctx.user.id,
+    assetId,
+    metadata: { contentType },
+    asset: buffer,
+  });
 
   return Response.json({
-    assetId: dbRes.id,
-    contentType: dbRes.contentType,
+    assetId,
+    contentType,
     size: buffer.byteLength,
   } satisfies ZUploadResponse);
 }