fixes

Author: oscartbeaumont

apps/web/app/api/upload/[...route]/multipart.ts

@@ -50,7 +50,7 @@ app.post(
 
 		const videoIdFromFileKey = fileKey.split("/")[1];
 		const videoIdRaw = "videoId" in body ? body.videoId : videoIdFromFileKey;
-		if (!videoIdRaw) throw new Error("Video ID is required");
+		if (!videoIdRaw) return c.text("Video id not found", 400);
 		const videoId = Video.VideoId.make(videoIdRaw);
 
 		const resp = await Effect.gen(function* () {
@@ -76,9 +76,6 @@ app.post(
 				if (e._tag === "VideoNotFoundError")
 					return Effect.succeed<Response>(c.text("Video not found", 404));
 
-				// if (e._tag === "DatabaseError")
-				// 	return Effect.succeed<Response>(c.text("Video not found", 404));
-
 				return Effect.succeed<Response>(
 					c.json({ error: "Error initiating multipart upload" }, 500),
 				);
@@ -245,7 +242,8 @@ app.post(
 		const user = c.get("user");
 
 		return Effect.gen(function* () {
-			const videos = yield* Videos;
+			const repo = yield* VideosRepo;
+			const policy = yield* VideosPolicy;
 			const db = yield* Database;
 
 			const fileKey = parseVideoIdOrFileKey(user.id, {
@@ -254,12 +252,13 @@ app.post(
 			});
 
 			const videoIdFromFileKey = fileKey.split("/")[1];
-			const videoId = "videoId" in body ? body.videoId : videoIdFromFileKey;
-			if (!videoId) throw new Error("Video ID is required");
+			const videoIdRaw = "videoId" in body ? body.videoId : videoIdFromFileKey;
+			if (!videoIdRaw) return c.text("Video id not found", 400);
+			const videoId = Video.VideoId.make(videoIdRaw);
 
-			const maybeVideo = yield* videos.getByIdForOwner(
-				Video.VideoId.make(videoId),
-			);
+			const maybeVideo = yield* repo
+				.getById(videoId)
+				.pipe(Policy.withPolicy(policy.isOwner(videoId)));
 			if (Option.isNone(maybeVideo)) {
 				c.status(404);
 				return c.text(`Video '${encodeURIComponent(videoId)}' not found`);

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

@@ -24,14 +24,6 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 					Effect.withSpan("Videos.getById"),
 				);
 
-		const getByIdForOwner = (id: Video.VideoId) =>
-			repo
-				.getById(id)
-				.pipe(
-					Policy.withPublicPolicy(policy.isOwner(id)),
-					Effect.withSpan("Videos.getByIdForOwner"),
-				);
-
 		return {
 			/*
 			 * Get a video by ID. Will fail if the user does not have access.
@@ -40,11 +32,6 @@ export class Videos extends Effect.Service<Videos>()("Videos", {
 			// internal use should prefer the repo directly
 			getByIdForViewing,
 
-			/*
-			 * Get a video by ID. Will fail if the user isn't the owner.
-			 */
-			getByIdForOwner,
-
 			/*
 			 * Delete a video. Will fail if the user does not have access.
 			 */