refactor: Include userId in the assets table

hoarder-app · Oct 6, 2024 · db2d346 · db2d346
1 parent e6d4ff9
commit db2d346
Show file tree

Hide file tree

Showing 7 changed files with 1,235 additions and 0 deletions.
diff --git a/apps/workers/crawlerWorker.ts b/apps/workers/crawlerWorker.ts
@@ -556,13 +556,15 @@ async function crawlAndParseUrl(
       screenshotAssetId,
       oldScreenshotAssetId,
       bookmarkId,
+      userId,
       AssetTypes.LINK_SCREENSHOT,
       txn,
     );
     await updateAsset(
       imageAssetId,
       oldImageAssetId,
       bookmarkId,
+      userId,
       AssetTypes.LINK_BANNER_IMAGE,
       txn,
     );
@@ -592,6 +594,7 @@ async function crawlAndParseUrl(
           fullPageArchiveAssetId,
           oldFullPageArchiveAssetId,
           bookmarkId,
+          userId,
           AssetTypes.LINK_FULL_PAGE_ARCHIVE,
           txn,
         );
@@ -685,6 +688,7 @@ async function updateAsset(
   newAssetId: string | null,
   oldAssetId: string | undefined,
   bookmarkId: string,
+  userId: string,
   assetType: AssetTypes,
   txn: HoarderDBTransaction,
 ) {
@@ -696,6 +700,7 @@ async function updateAsset(
       id: newAssetId,
       assetType,
       bookmarkId,
+      userId,
     });
   }
 }
diff --git a/packages/db/drizzle/0029_short_gunslinger.sql b/packages/db/drizzle/0029_short_gunslinger.sql
@@ -0,0 +1,14 @@
+CREATE TABLE `assets_new` (
+        `id` text PRIMARY KEY NOT NULL,
+        `assetType` text NOT NULL,
+        `bookmarkId` text,
+		`userId` text NOT NULL,
+        FOREIGN KEY (`bookmarkId`) REFERENCES `bookmarks`(`id`) ON UPDATE no action ON DELETE cascade
+        FOREIGN KEY (`userId`) REFERENCES `user`(`id`) ON UPDATE no action ON DELETE cascade
+);--> statement-breakpoint
+INSERT INTO `assets_new` (`id`, `assetType`, `bookmarkId`, `userId`) SELECT `id`, `assetType`, `bookmarkId`, (select `bookmarks`.`userId` from `bookmarks` where `bookmarks`.`id` = `assets`.`bookmarkId`) FROM `assets`;--> statement-breakpoint
+DROP TABLE `assets`;--> statement-breakpoint
+ALTER TABLE `assets_new` RENAME TO `assets`;--> statement-breakpoint
+CREATE INDEX `assets_bookmarkId_idx` ON `assets` (`bookmarkId`);--> statement-breakpoint
+CREATE INDEX `assets_assetType_idx` ON `assets` (`assetType`);--> statement-breakpoint
+CREATE INDEX `assets_userId_idx` ON `assets` (`userId`);