Delete orphan art tags routine

app/features/art/ArtRepository.server.test.ts

@@ -303,6 +303,54 @@ describe("deleteById", () => {
 	});
 });
 
+describe("deleteOrphanTags", () => {
+	beforeEach(async () => {
+		imageCounter = 0;
+		await dbInsertUsers(1);
+	});
+
+	afterEach(() => {
+		dbReset();
+	});
+
+	test("deletes tags with no associated art", async () => {
+		const art = await ArtRepository.insert({
+			authorId: 1,
+			url: "https://example.com/image-1.png",
+			validatedAt: Date.now(),
+			description: null,
+			linkedUsers: [],
+			tags: [{ name: "Orphan1" }, { name: "Orphan2" }],
+		});
+
+		await ArtRepository.deleteById(art.id);
+
+		const deletedCount = await ArtRepository.deleteOrphanTags();
+		expect(deletedCount).toBe(2);
+
+		const tags = await ArtRepository.findAllTags();
+		expect(tags).toHaveLength(0);
+	});
+
+	test("does not delete tags that are still linked to art", async () => {
+		await ArtRepository.insert({
+			authorId: 1,
+			url: "https://example.com/image-1.png",
+			validatedAt: Date.now(),
+			description: null,
+			linkedUsers: [],
+			tags: [{ name: "InUse" }],
+		});
+
+		const deletedCount = await ArtRepository.deleteOrphanTags();
+		expect(deletedCount).toBe(0);
+
+		const tags = await ArtRepository.findAllTags();
+		expect(tags).toHaveLength(1);
+		expect(tags[0].name).toBe("InUse");
+	});
+});
+
 describe("insert", () => {
 	beforeEach(async () => {
 		imageCounter = 0;

app/features/art/ArtRepository.server.ts

@@ -171,6 +171,15 @@ export async function findAllTags() {
 	return db.selectFrom("ArtTag").select(["id", "name"]).execute();
 }
 
+export async function deleteOrphanTags() {
+	const result = await db
+		.deleteFrom("ArtTag")
+		.where("id", "not in", db.selectFrom("TaggedArt").select("TaggedArt.tagId"))
+		.executeTakeFirst();
+
+	return Number(result.numDeletedRows);
+}
+
 export async function findArtsByUserId(
 	userId: number,
 	{ includeAuthored = true, includeTagged = true } = {},

app/features/art/loaders/art.server.ts

@@ -27,9 +27,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 		: null;
 
 	if (!filteredTag) {
-		return filteredTagName
+		return filteredTagName ? { ...cachedArts, showcaseArts: [] } : cachedArts;
-			? { ...cachedArts, showcaseArts: [] }
-			: cachedArts;
 	}
 
 	return {

app/routines/deleteOrphanArtTags.ts

@@ -0,0 +1,11 @@
+import * as ArtRepository from "../features/art/ArtRepository.server";
+import { logger } from "../utils/logger";
+import { Routine } from "./routine.server";
+
+export const DeleteOrphanArtTagsRoutine = new Routine({
+	name: "DeleteOrphanArtTags",
+	func: async () => {
+		const deletedCount = await ArtRepository.deleteOrphanTags();
+		logger.info(`Deleted ${deletedCount} orphan art tags`);
+	},
+});

app/routines/list.server.ts

@@ -1,5 +1,6 @@
 import { CloseExpiredCommissionsRoutine } from "./closeExpiredCommissions";
 import { DeleteOldNotificationsRoutine } from "./deleteOldNotifications";
+import { DeleteOrphanArtTagsRoutine } from "./deleteOrphanArtTags";
 import { NotifyCheckInStartRoutine } from "./notifyCheckInStart";
 import { NotifyPlusServerVotingRoutine } from "./notifyPlusServerVoting";
 import { NotifyScrimStartingSoonRoutine } from "./notifyScrimStartingSoon";
@@ -28,6 +29,7 @@ export const everyHourAt30 = [
 export const daily = [
 	DeleteOldNotificationsRoutine,
 	CloseExpiredCommissionsRoutine,
+	DeleteOrphanArtTagsRoutine,
 ];
 
 /** List of Routines that should occur every 2 minutes */