Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(web): remove shares when deleting a video

Aditya Garud6dc1ff923cef
diff --git a/apps/web/__tests__/unit/recording-storage-lifecycle.test.ts b/apps/web/__tests__/unit/recording-storage-lifecycle.test.ts
index ee7e21f39..440b89e24 100644
--- a/apps/web/__tests__/unit/recording-storage-lifecycle.test.ts
+++ b/apps/web/__tests__/unit/recording-storage-lifecycle.test.ts
@@ -156,6 +156,16 @@ function databaseFixture(video = recording(), password?: string | null) {
],
]);
const uploads = new Map<string, typeof Db.videoUploads.$inferSelect>();
+ const shares = new Map<unknown, Map<string, { videoId: string }>>(
+ [Db.sharedVideos, Db.spaceVideos].map((table) => [
+ table,
+ new Map([
+ ["root-share", { videoId }],
+ ["folder-share", { videoId }],
+ ["other-share", { videoId: "other-video" }],
+ ]),
+ ]),
+ );
const mutations: DatabaseMutation[] = [];
const events: string[] = [];
const objectDeleteConditions: SQL[] = [];
@@ -248,6 +258,12 @@ function databaseFixture(video = recording(), password?: string | null) {
: mutation.table === Db.videoProcessingJobs
? jobs
: null;
+ const shareRows = shares.get(mutation.table);
+ if (shareRows && mutation.operation === "delete") {
+ for (const [id, row] of shareRows) {
+ if (row.videoId === mutation.id) shareRows.delete(id);
+ }
+ }
if (!table) continue;
if (mutation.operation === "delete" && mutation.id)
table.delete(mutation.id);
@@ -304,6 +320,7 @@ function databaseFixture(video = recording(), password?: string | null) {
rows,
jobs,
uploads,
+ shares,
mutations,
events,
objectDeleteConditions,
@@ -1082,6 +1099,19 @@ describe("recording storage lifecycle", () => {
},
);
+ it("removes organization and space shares only for the deleted recording", async () => {
+ const database = databaseFixture();
+ await storageFixture([[outputKey, "verified-video"]]);
+
+ expect(Exit.isSuccess(await runVideoOperation("delete"))).toBe(true);
+ expect(database.rows.has(videoId)).toBe(false);
+ for (const table of [Db.sharedVideos, Db.spaceVideos]) {
+ expect(database.shares.get(table)).toEqual(
+ new Map([["other-share", { videoId: "other-video" }]]),
+ );
+ }
+ });
+
it("waits for job deletion before deleting any dependent database row", async () => {
const database = databaseFixture();
let release: (() => void) | undefined;
@@ -1137,6 +1167,13 @@ describe("recording storage lifecycle", () => {
state: "source-blocked",
errorCode: "video-deleting",
});
+ for (const shares of database.shares.values()) {
+ expect([...shares.values()].map((share) => share.videoId)).toEqual([
+ videoId,
+ videoId,
+ "other-video",
+ ]);
+ }
storage.deniedDeletes.clear();
expect(Exit.isSuccess(await runVideoOperation("delete"))).toBe(true);
expect(database.rows.has(videoId)).toBe(false);
diff --git a/packages/web-backend/src/Videos/VideosRepo.ts b/packages/web-backend/src/Videos/VideosRepo.ts
index 5832c41eb..99ae49674 100644
--- a/packages/web-backend/src/Videos/VideosRepo.ts
+++ b/packages/web-backend/src/Videos/VideosRepo.ts
@@ -109,6 +109,10 @@ export class VideosRepo extends Effect.Service<VideosRepo>()("VideosRepo", {
}
}
await Promise.all([
+ db
+ .delete(Db.sharedVideos)
+ .where(Dz.eq(Db.sharedVideos.videoId, id)),
+ db.delete(Db.spaceVideos).where(Dz.eq(Db.spaceVideos.videoId, id)),
db.delete(Db.importedVideos).where(Dz.eq(Db.importedVideos.id, id)),
db.delete(Db.videos).where(Dz.eq(Db.videos.id, id)),
db