Revert "Merge pull request 'Complete Housekeeping migration and /ase cutover' (#52) from codex/housekeeping-complete into main"

This reverts commit 488b6e57c4, reversing
changes made to b506b4499a.

src/actions/admin-ads.test.ts

@@ -1,115 +1,98 @@
 // @ts-nocheck
+
 import { redirect } from "next/navigation";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { requirePermission } from "@/lib/admin/guard";
 import { logger } from "@/lib/logger";
 import { ActionError } from "@/lib/safe-action-shared";
+import { logStaffActivity } from "@/lib/services/staff-activity";
 import { createAd, deleteAd } from "./admin-ads";
 
-const { execute } = vi.hoisted(() => ({
-	execute: vi.fn(async () => ({
-		ok: true,
-		data: { before: null, after: { id: "1" }, output: { id: "1" } },
-		correlationId: "legacy",
-	})),
-}));
-vi.mock("@/features/housekeeping/domains/content/services/mutations", () => ({
-	contentMutationService: { execute },
-	createContentMutationInvocation: (actor, correlationId) => ({
-		expectedActorId: actor.id,
-		correlationId,
-		legacy: true,
-	}),
-}));
+const { insertValues, deleteWhere } = vi.hoisted(() => {
+	const insertValues = vi.fn().mockResolvedValue([{ insertId: 1 }]);
+	const deleteWhere = vi.fn().mockResolvedValue([{ affectedRows: 1 }]);
+	return { insertValues, deleteWhere };
+});
+
 vi.mock("@/lib/admin/guard", () => ({ requirePermission: vi.fn() }));
 vi.mock("@/lib/permissions", () => ({ PERMS: { PAGES_EDIT: "pages.edit" } }));
+vi.mock("@/lib/db", () => ({
+	db: {
+		insert: vi.fn(() => ({ values: insertValues })),
+		update: vi.fn(() => ({
+			set: vi.fn(() => ({
+				where: vi.fn().mockResolvedValue([{ affectedRows: 1 }]),
+			})),
+		})),
+		delete: vi.fn(() => ({ where: deleteWhere })),
+	},
+	WebsiteAds: { id: "id" },
+}));
 vi.mock("@/lib/logger", () => ({ logger: { error: vi.fn() } }));
 vi.mock("@/lib/safe-action", () => ({
-	adminAction: (_options, handler) => handler,
+	adminAction: vi.fn((_o: unknown, f: (...args: unknown[]) => unknown) => f),
 }));
 vi.mock("@/lib/safe-action-shared", () => ({
-	ActionError: class ActionError extends Error {},
-	actionOk: () => "ok",
+	ActionError: class extends Error {},
+	actionOk: vi.fn(() => "ok"),
 }));
+vi.mock("@/lib/services/staff-activity", () => ({ logStaffActivity: vi.fn() }));
 vi.mock("next/cache", () => ({ revalidatePath: vi.fn() }));
 vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
 
 const staff = { id: 1, rank: 7, username: "admin" };
-const fakeForm = (data) => ({ get: (key) => data[key] ?? null });
+const fakeForm = (data: Record<string, string>) => ({
+	get: (k: string) => data[k] ?? null,
+});
 
 beforeEach(() => {
 	vi.clearAllMocks();
-	vi.mocked(requirePermission).mockResolvedValue(staff);
-	execute.mockResolvedValue({
-		ok: true,
-		data: { before: null, after: { id: "1" }, output: { id: "1" } },
-		correlationId: "legacy",
+	vi.mocked(requirePermission).mockResolvedValue(staff as never);
+	insertValues.mockResolvedValue([{ insertId: 1 }]);
+	deleteWhere.mockResolvedValue([{ affectedRows: 1 }]);
+});
+
+describe("createAd", () => {
+	it("creates ad and redirects", async () => {
+		await createAd(
+			fakeForm({ image: "https://example.com/ad.png" }) as unknown as FormData,
+		);
+		expect(insertValues).toHaveBeenCalled();
+		expect(logStaffActivity).toHaveBeenCalled();
+		expect(redirect).toHaveBeenCalledWith("/admin/ads");
+	});
+
+	it("returns early when image empty", async () => {
+		await createAd(fakeForm({ image: "" }) as unknown as FormData);
+		expect(insertValues).not.toHaveBeenCalled();
+	});
+
+	it("logs error on db failure", async () => {
+		insertValues.mockRejectedValue(new Error("db"));
+		await createAd(fakeForm({ image: "x" }) as unknown as FormData);
+		expect(logger.error).toHaveBeenCalled();
 	});
 });
 
-describe("Content advertisement legacy wrappers", () => {
-	it("delegates creation and preserves redirect", async () => {
-		await createAd(fakeForm({ image: "https://example.com/ad.png" }));
-		expect(execute).toHaveBeenCalledWith(
-			expect.objectContaining({ expectedActorId: 1, legacy: true }),
-			"ad.change",
-			{ action: "create", image: "https://example.com/ad.png" },
-		);
-		expect(redirect).toHaveBeenCalledWith("/ase/content/media/ads");
+describe("deleteAd", () => {
+	it("deletes ad and returns ok", async () => {
+		const h = deleteAd as unknown as (ctx: {
+			data: { id: bigint };
+			session: { user: { id: string } };
+		}) => Promise<string>;
+		expect(
+			await h({ data: { id: BigInt(99) }, session: { user: { id: "1" } } }),
+		).toBe("ok");
 	});
 
-	it("returns early when image is empty", async () => {
-		await createAd(fakeForm({ image: "" }));
-		expect(execute).not.toHaveBeenCalled();
-	});
-
-	it("logs a redacted service failure", async () => {
-		execute.mockResolvedValue({
-			ok: false,
-			error: {
-				code: "DEPENDENCY_UNAVAILABLE",
-				messageKey: "errors.housekeeping.dependencyUnavailable",
-			},
-			correlationId: "legacy",
-		});
-		await createAd(fakeForm({ image: "x" }));
-		expect(logger.error).toHaveBeenCalledWith(
-			"Action failed: createAd",
-			expect.objectContaining({
-				error: "errors.housekeeping.dependencyUnavailable",
-			}),
-		);
-	});
-
-	it("delegates deletion and preserves action result", async () => {
-		const handler = deleteAd as unknown as (ctx: unknown) => Promise<string>;
+	it("throws ActionError when not found", async () => {
+		deleteWhere.mockResolvedValue([{ affectedRows: 0 }]);
+		const h = deleteAd as unknown as (ctx: {
+			data: { id: bigint };
+			session: { user: { id: string } };
+		}) => Promise<string>;
 		await expect(
-			handler({
-				data: { id: 99n },
-				session: { user: { id: "1" } },
-				requestId: "delete",
-			}),
-		).resolves.toBe("ok");
-		expect(execute).toHaveBeenCalledWith(
-			expect.objectContaining({ correlationId: "delete" }),
-			"ad.change",
-			{ action: "delete", id: "99" },
-		);
-	});
-
-	it("preserves not-found ActionError", async () => {
-		execute.mockResolvedValue({
-			ok: false,
-			error: { code: "NOT_FOUND", messageKey: "errors.housekeeping.notFound" },
-			correlationId: "legacy",
-		});
-		const handler = deleteAd as unknown as (ctx: unknown) => Promise<string>;
-		await expect(
-			handler({
-				data: { id: 999n },
-				session: { user: { id: "1" } },
-				requestId: "missing",
-			}),
+			h({ data: { id: BigInt(999) }, session: { user: { id: "1" } } }),
 		).rejects.toThrow(ActionError);
 	});
 });