somewhat improve video deletion maybe

Author: Brendonovich

apps/web/app/(org)/dashboard/folder/[id]/page.tsx

@@ -1,6 +1,6 @@
 import { getCurrentUser } from "@cap/database/auth/session";
 import { serverEnv } from "@cap/env";
-import { CurrentUser, type Folder } from "@cap/web-domain";
+import { CurrentUser, Folder } from "@cap/web-domain";
 import { Effect } from "effect";
 import { notFound } from "next/navigation";
 import {
@@ -18,24 +18,27 @@ import {
 } from "./components";
 import FolderVideosSection from "./components/FolderVideosSection";
 
-const FolderPage = async ({ params }: { params: { id: Folder.FolderId } }) => {
+const FolderPage = async (props: PageProps<"/dashboard/folder/[id]">) => {
+	const params = await props.params;
+	const folderId = Folder.FolderId.make(params.id);
+
 	const user = await getCurrentUser();
 	if (!user || !user.activeOrganizationId) return notFound();
 
 	return Effect.gen(function* () {
 		const [childFolders, breadcrumb, videosData] = yield* Effect.all([
-			getChildFolders(params.id, { variant: "user" }),
-			getFolderBreadcrumb(params.id),
-			getVideosByFolderId(params.id, {
+			getChildFolders(folderId, { variant: "user" }),
+			getFolderBreadcrumb(folderId),
+			getVideosByFolderId(folderId, {
 				variant: "user",
 			}),
 		]);
 
 		return (
 			<div>
 				<div className="flex gap-2 items-center mb-10">
-					<NewSubfolderButton parentFolderId={params.id} />
-					<UploadCapButton size="sm" folderId={params.id} />
+					<NewSubfolderButton parentFolderId={folderId} />
+					<UploadCapButton size="sm" folderId={folderId} />
 				</div>
 				<div className="flex justify-between items-center mb-6 w-full">
 					<div className="flex overflow-x-auto items-center font-medium">

packages/web-backend/src/Database.ts

@@ -1,14 +1,11 @@
 import { db } from "@cap/database";
 import { DatabaseError } from "@cap/web-domain";
-import type { Query } from "drizzle-orm";
 import { Effect } from "effect";
 
 export class Database extends Effect.Service<Database>()("Database", {
 	effect: Effect.gen(function* () {
 		return {
-			use: <T>(
-				cb: (_: ReturnType<typeof db>) => Promise<T> & { toSQL?(): Query },
-			) =>
+			use: <T>(cb: (_: ReturnType<typeof db>) => Promise<T>) =>
 				Effect.tryPromise({
 					try: () => cb(db()),
 					catch: (cause) => new DatabaseError({ cause }),

packages/web-backend/src/Videos/VideosRepo.ts

@@ -45,16 +45,16 @@ export class VideosRepo extends Effect.Service<VideosRepo>()("VideosRepo", {
 			});
 
 		const delete_ = (id: Video.VideoId) =>
-			db.use(async (db) =>
-				db.transaction((db) =>
-					Promise.all([
+			db.use(async (db) => {
+				await db.transaction(async (db) => {
+					await Promise.all([
 						db.delete(Db.videos).where(Dz.eq(Db.videos.id, id)),
 						db
 							.delete(Db.videoUploads)
 							.where(Dz.eq(Db.videoUploads.videoId, id)),
-					]),
-				),
-			);
+					]);
+				});
+			});
 
 		const create = (data: CreateVideoInput) =>
 			Effect.gen(function* () {

packages/web-backend/src/Videos/index.ts

@@ -48,6 +48,8 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 					.delete(video.id)
 					.pipe(Policy.withPolicy(policy.isOwner(video.id)));
 
+				yield* Effect.log(`Deleted video ${video.id}`);
+
 				const user = yield* CurrentUser;
 
 				const prefix = `${user.id}/${video.id}/`;