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-vpn.test.ts

@@ -1,70 +1,60 @@
-import { revalidatePath } from "next/cache";
 import { redirect } from "next/navigation";
-import { beforeEach, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { requirePermission } from "@/lib/admin/guard";
+import { siteSettings } from "@/lib/services/site-settings";
 import { saveVpn } from "./admin-vpn";
 
-const { execute } = vi.hoisted(() => ({ execute: vi.fn() }));
-vi.mock("@/features/housekeeping/domains/people/services/mutations", () => ({
-	createPeopleMutationInvocation: vi.fn((staff, correlationId) => ({
-		expectedActorId: staff.id,
-		correlationId,
-		legacy: true,
-	})),
-	peopleMutationService: { execute },
-}));
+const { mockValues, mockOnDuplicateKeyUpdate } = vi.hoisted(() => {
+	const mockOnDuplicateKeyUpdate = vi.fn().mockResolvedValue(undefined);
+	const mockValues = vi.fn(() => ({
+		onDuplicateKeyUpdate: mockOnDuplicateKeyUpdate,
+	}));
+	return { mockValues, mockOnDuplicateKeyUpdate };
+});
+
 vi.mock("@/lib/admin/guard", () => ({ requirePermission: vi.fn() }));
 vi.mock("@/lib/permissions", () => ({
-	PERMS: { SETTINGS_EDIT: "admin.settings.edit" },
+	PERMS: { SETTINGS_EDIT: "settings.edit" },
 }));
+vi.mock("@/lib/db", () => ({
+	db: {
+		insert: vi.fn(() => ({ values: mockValues })),
+	},
+	WebsiteSetting: { key: "key", value: "value" },
+}));
+vi.mock("@/lib/services/site-settings", () => ({
+	siteSettings: { reload: vi.fn() },
+}));
+vi.mock("@/lib/services/staff-activity", () => ({ logStaffActivity: vi.fn() }));
 vi.mock("next/cache", () => ({ revalidatePath: vi.fn() }));
 vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
 
-const form = (data: Record<string, string>) =>
-	({ get: (key: string) => data[key] ?? null }) as FormData;
+const staff = { id: 1, rank: 7, username: "admin" };
+const fakeForm = (data: Record<string, string | null>) => ({
+	get: (key: string) => (key in data ? data[key] : null),
+});
 
 beforeEach(() => {
 	vi.clearAllMocks();
-	vi.mocked(requirePermission).mockResolvedValue({
-		id: 1,
-		rank: 7,
-		username: "admin",
-	});
-	execute.mockResolvedValue({
-		ok: true,
-		data: { before: {}, after: {} },
-		correlationId: "vpn",
+	vi.mocked(requirePermission).mockResolvedValue(staff as never);
+	mockValues.mockReturnValue({
+		onDuplicateKeyUpdate: mockOnDuplicateKeyUpdate,
 	});
+	mockOnDuplicateKeyUpdate.mockResolvedValue(undefined);
 });
 
-it("preserves VPN payload, ASE revalidation, and redirect", async () => {
-	await saveVpn(
-		form({
-			vpn_block_enabled: "1",
-			vpn_provider: "proxycheck",
-			vpn_api_key: "abc123",
-		}),
-	);
-	expect(execute).toHaveBeenCalledWith(expect.anything(), "vpn.configure", {
-		enabled: true,
-		provider: "proxycheck",
-		apiKey: "abc123",
-		blockMessage: "",
+describe("saveVpn", () => {
+	it("saves VPN settings and redirects", async () => {
+		await saveVpn(
+			fakeForm({
+				vpn_block_enabled: "1",
+				vpn_provider: "proxycheck",
+				vpn_api_key: "abc123",
+			}) as unknown as FormData,
+		);
+		expect(mockValues).toHaveBeenCalledTimes(4);
+		expect(mockOnDuplicateKeyUpdate).toHaveBeenCalledTimes(4);
+		expect(siteSettings.reload).toHaveBeenCalled();
+		expect(redirect).toHaveBeenCalledWith("/admin/vpn?saved=1");
 	});
-	expect(revalidatePath).toHaveBeenCalledWith("/ase/people/moderation/vpn");
-	expect(redirect).toHaveBeenCalledWith("/ase/people/moderation/vpn?saved=1");
-});
-
-it("preserves fail-soft redirect without claiming a saved revalidation", async () => {
-	execute.mockResolvedValue({
-		ok: false,
-		error: {
-			code: "DEPENDENCY_UNAVAILABLE",
-			messageKey: "errors.housekeeping.dependencyUnavailable",
-		},
-		correlationId: "vpn-fail",
-	});
-	await saveVpn(form({ vpn_provider: "none" }));
-	expect(revalidatePath).not.toHaveBeenCalled();
-	expect(redirect).toHaveBeenCalledWith("/ase/people/moderation/vpn?saved=1");
 });