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

@@ -1,5 +1,6 @@
+// @ts-nocheck
 import { revalidatePath } from "next/cache";
-import { beforeEach, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { requirePermission } from "@/lib/admin/guard";
 import {
 	addBlacklist,
@@ -8,65 +9,80 @@ import {
 	deleteWhitelist,
 } from "./admin-ip";
 
-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 { 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: { SETTINGS_EDIT: "admin.settings.edit" },
+	PERMS: { SETTINGS_EDIT: "settings.edit" },
+}));
+vi.mock("@/lib/db", () => ({
+	db: {
+		insert: vi.fn(() => ({ values: insertValues })),
+		delete: vi.fn(() => ({ where: deleteWhere })),
+	},
+	WebsiteIpWhitelist: { id: "id" },
+	WebsiteIpBlacklist: { id: "id" },
 }));
 vi.mock("next/cache", () => ({ revalidatePath: vi.fn() }));
 
 const staff = { id: 1, rank: 7, username: "admin" };
-const form = (data: Record<string, string>) =>
-	({ get: (key: string) => data[key] ?? null }) as FormData;
+const fakeForm = (data: Record<string, string>) => ({
+	get: (key: string) => data[key] ?? null,
+});
 
 beforeEach(() => {
 	vi.clearAllMocks();
 	vi.mocked(requirePermission).mockResolvedValue(staff as never);
-	execute.mockResolvedValue({
-		ok: true,
-		data: { before: null, after: {} },
-		correlationId: "ip",
+	insertValues.mockResolvedValue([{ insertId: 1 }]);
+	deleteWhere.mockResolvedValue([{ affectedRows: 1 }]);
+});
+
+describe("addWhitelist", () => {
+	it("creates whitelist entry", async () => {
+		await addWhitelist(
+			fakeForm({ ipAddress: "192.168.1.1" }) as unknown as FormData,
+		);
+		expect(insertValues).toHaveBeenCalledWith({
+			ipAddress: "192.168.1.1",
+			asn: null,
+			whitelistAsn: false,
+		});
+		expect(revalidatePath).toHaveBeenCalledWith("/admin/ip");
+	});
+
+	it("returns early when ip is empty", async () => {
+		await addWhitelist(fakeForm({ ipAddress: "" }) as unknown as FormData);
+		expect(insertValues).not.toHaveBeenCalled();
 	});
 });
 
-it("preserves all four IP actions and /admin revalidation", async () => {
-	await addWhitelist(form({ ipAddress: "192.0.2.1", asn: "AS1" }));
-	await addBlacklist(form({ ipAddress: "198.51.100.1" }));
-	await deleteWhitelist(form({ id: "42" }));
-	await deleteBlacklist(form({ id: "99" }));
-	expect(execute.mock.calls.map((call) => [call[1], call[2]])).toEqual([
-		[
-			"ip.action",
-			{ action: "add-whitelist", ipAddress: "192.0.2.1", asn: "AS1" },
-		],
-		[
-			"ip.action",
-			{ action: "add-blacklist", ipAddress: "198.51.100.1", asn: "" },
-		],
-		["ip.action", { action: "delete-whitelist", id: "42" }],
-		["ip.action", { action: "delete-blacklist", id: "99" }],
-	]);
-	expect(revalidatePath).toHaveBeenCalledTimes(4);
+describe("deleteWhitelist", () => {
+	it("deletes whitelist entry", async () => {
+		await deleteWhitelist(fakeForm({ id: "42" }) as unknown as FormData);
+		expect(deleteWhere).toHaveBeenCalled();
+	});
 });
 
-it("keeps empty IP input as a no-op after authorization", async () => {
-	await addWhitelist(form({ ipAddress: "" }));
-	expect(requirePermission).toHaveBeenCalledWith("admin.settings.edit");
-	expect(execute).not.toHaveBeenCalled();
+describe("addBlacklist", () => {
+	it("creates blacklist entry", async () => {
+		await addBlacklist(
+			fakeForm({ ipAddress: "203.0.113.1" }) as unknown as FormData,
+		);
+		expect(insertValues).toHaveBeenCalledWith({
+			ipAddress: "203.0.113.1",
+			asn: null,
+			blacklistAsn: false,
+		});
+	});
 });
 
-it("preserves an IP rule ID above Number.MAX_SAFE_INTEGER", async () => {
-	await deleteBlacklist(form({ id: "9007199254740993" }));
-	expect(execute).toHaveBeenCalledWith(expect.anything(), "ip.action", {
-		action: "delete-blacklist",
-		id: "9007199254740993",
+describe("deleteBlacklist", () => {
+	it("deletes blacklist entry", async () => {
+		await deleteBlacklist(fakeForm({ id: "99" }) as unknown as FormData);
+		expect(deleteWhere).toHaveBeenCalled();
 	});
 });