Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ This project uses a user-facing changelog format.
### Added

- Ylläpitäjä voi avata ajokoetapahtuman omalle sivulleen tarkastelua ja nykyisiä muokkaustoimintoja varten.
- Ylläpitäjä voi luoda ajokoetapahtuman perustietoineen ja avata sen omalle sivulleen ennen koetulosten lisäämistä.
- Ylläpitäjä voi poistaa tyhjän ajokoetapahtuman sen omalta sivulta.

### Changed

- Viimeisen koetuloksen poistaminen säilyttää ajokoetapahtuman tyhjänä, kunnes ylläpitäjä poistaa tapahtuman erikseen.

### Fixed

### Removed
Expand Down
32 changes: 32 additions & 0 deletions apps/web/app/(admin)/admin/trials/new/__tests__/page.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import React from "react";
import { renderToStaticMarkup } from "react-dom/server";
import { describe, expect, it, vi } from "vitest";
import AdminTrialEventCreatePage from "../page";

const { clientPropsRef, toBusinessDateInputValueMock } = vi.hoisted(() => ({
clientPropsRef: { current: null as { initialEventDate: string } | null },
toBusinessDateInputValueMock: vi.fn(() => "2026-07-21"),
}));

vi.mock("@/components/admin/trials", () => ({
AdminTrialEventCreatePageClient: (props: { initialEventDate: string }) => {
clientPropsRef.current = props;
return React.createElement("div", null, "create-trial-event");
},
}));

vi.mock("@/lib/admin/core/date", () => ({
toBusinessDateInputValue: toBusinessDateInputValueMock,
}));

describe("AdminTrialEventCreatePage", () => {
it("renders the event creation client", () => {
expect(renderToStaticMarkup(<AdminTrialEventCreatePage />)).toContain(
"create-trial-event",
);
expect(toBusinessDateInputValueMock).toHaveBeenCalledWith(expect.any(Date));
expect(clientPropsRef.current).toEqual({
initialEventDate: "2026-07-21",
});
});
});
10 changes: 10 additions & 0 deletions apps/web/app/(admin)/admin/trials/new/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { AdminTrialEventCreatePageClient } from "@/components/admin/trials";
import { toBusinessDateInputValue } from "@/lib/admin/core/date";

export default function AdminTrialEventCreatePage() {
return (
<AdminTrialEventCreatePageClient
initialEventDate={toBusinessDateInputValue(new Date())}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { createAdminTrialEventAction } from "../create-admin-trial-event";

const { guardMock, userMock, createMock } = vi.hoisted(() => ({
guardMock: vi.fn(),
userMock: vi.fn(),
createMock: vi.fn(),
}));

vi.mock("@/lib/server/admin-guard", () => ({
requireAdminLayoutAccess: guardMock,
}));
vi.mock("@/lib/server/current-user", () => ({
getSessionCurrentUser: userMock,
}));
vi.mock("@beagle/server", () => ({ createAdminTrialEvent: createMock }));

const input = {
eventDate: "2026-07-21",
eventPlace: "Helsinki",
jarjestaja: null,
ylituomari: null,
ylituomariNumero: null,
ytKertomus: null,
kennelpiiri: null,
kennelpiirinro: null,
sklKoeId: 123,
};

describe("createAdminTrialEventAction", () => {
beforeEach(() => {
guardMock.mockReset();
userMock.mockReset();
createMock.mockReset();
});

it("rejects missing admin access", async () => {
guardMock.mockResolvedValue({ ok: false, status: 403 });

await expect(createAdminTrialEventAction(input)).resolves.toMatchObject({
hasError: true,
errorCode: "FORBIDDEN",
});
expect(createMock).not.toHaveBeenCalled();
});

it("propagates service errors", async () => {
guardMock.mockResolvedValue({ ok: true });
userMock.mockResolvedValue({
id: "u_1",
email: "admin@example.com",
role: "ADMIN",
});
createMock.mockResolvedValue({
status: 409,
body: { ok: false, code: "SKL_KOE_ID_CONFLICT", error: "Conflict" },
});

await expect(createAdminTrialEventAction(input)).resolves.toEqual({
data: null,
hasError: true,
errorCode: "SKL_KOE_ID_CONFLICT",
message: "Conflict",
});
});

it("returns navigation data", async () => {
guardMock.mockResolvedValue({ ok: true });
userMock.mockResolvedValue({
id: "u_1",
email: "admin@example.com",
role: "ADMIN",
});
createMock.mockResolvedValue({
status: 201,
body: { ok: true, data: { trialEventId: "event-1" } },
});

await expect(createAdminTrialEventAction(input)).resolves.toEqual({
data: { trialEventId: "event-1" },
hasError: false,
});
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { deleteAdminTrialEventAction } from "../delete-admin-trial-event";

const { guardMock, userMock, deleteMock } = vi.hoisted(() => ({
guardMock: vi.fn(),
userMock: vi.fn(),
deleteMock: vi.fn(),
}));

vi.mock("@/lib/server/admin-guard", () => ({
requireAdminLayoutAccess: guardMock,
}));
vi.mock("@/lib/server/current-user", () => ({
getSessionCurrentUser: userMock,
}));
vi.mock("@beagle/server", () => ({ deleteAdminTrialEvent: deleteMock }));

describe("deleteAdminTrialEventAction", () => {
beforeEach(() => {
guardMock.mockReset();
userMock.mockReset();
deleteMock.mockReset();
guardMock.mockResolvedValue({ ok: true });
userMock.mockResolvedValue({
id: "u_1",
email: "admin@example.com",
role: "ADMIN",
});
});

it("propagates the non-empty conflict", async () => {
deleteMock.mockResolvedValue({
status: 409,
body: { ok: false, code: "TRIAL_EVENT_NOT_EMPTY", error: "Not empty" },
});

await expect(
deleteAdminTrialEventAction({ trialEventId: "event-1" }),
).resolves.toEqual({
data: null,
hasError: true,
errorCode: "TRIAL_EVENT_NOT_EMPTY",
message: "Not empty",
});
});

it("returns the deleted event id", async () => {
deleteMock.mockResolvedValue({
status: 200,
body: { ok: true, data: { deletedTrialEventId: "event-1" } },
});

await expect(
deleteAdminTrialEventAction({ trialEventId: "event-1" }),
).resolves.toEqual({
data: { deletedTrialEventId: "event-1" },
hasError: false,
});
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
"use server";

import type {
CreateAdminTrialEventRequest,
CreateAdminTrialEventResponse,
} from "@beagle/contracts";
import { createAdminTrialEvent } from "@beagle/server";
import { requireAdminLayoutAccess } from "@/lib/server/admin-guard";
import { getSessionCurrentUser } from "@/lib/server/current-user";

export type CreateAdminTrialEventActionResult = {
data: CreateAdminTrialEventResponse | null;
hasError: boolean;
errorCode?: string;
message?: string;
};

export async function createAdminTrialEventAction(
input: CreateAdminTrialEventRequest,
): Promise<CreateAdminTrialEventActionResult> {
const adminAccess = await requireAdminLayoutAccess();
if (!adminAccess.ok) {
return {
data: null,
hasError: true,
errorCode: adminAccess.status === 401 ? "UNAUTHENTICATED" : "FORBIDDEN",
message: "Admin access required.",
};
}

const currentUser = await getSessionCurrentUser();
if (!currentUser) {
return {
data: null,
hasError: true,
errorCode: "UNAUTHENTICATED",
message: "Admin access required.",
};
}

const result = await createAdminTrialEvent(
input,
{
id: currentUser.id,
email: currentUser.email,
username: null,
role: currentUser.role,
},
{ actorUserId: currentUser.id },
);

if (!result.body.ok) {
return {
data: null,
hasError: true,
errorCode: result.body.code,
message: result.body.error,
};
}

return { data: result.body.data, hasError: false };
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
"use server";

import type {
DeleteAdminTrialEventRequest,
DeleteAdminTrialEventResponse,
} from "@beagle/contracts";
import { deleteAdminTrialEvent } from "@beagle/server";
import { requireAdminLayoutAccess } from "@/lib/server/admin-guard";
import { getSessionCurrentUser } from "@/lib/server/current-user";

export type DeleteAdminTrialEventActionResult = {
data: DeleteAdminTrialEventResponse | null;
hasError: boolean;
errorCode?: string;
message?: string;
};

export async function deleteAdminTrialEventAction(
input: DeleteAdminTrialEventRequest,
): Promise<DeleteAdminTrialEventActionResult> {
const adminAccess = await requireAdminLayoutAccess();
if (!adminAccess.ok) {
return {
data: null,
hasError: true,
errorCode: adminAccess.status === 401 ? "UNAUTHENTICATED" : "FORBIDDEN",
message: "Admin access required.",
};
}

const currentUser = await getSessionCurrentUser();
if (!currentUser) {
return {
data: null,
hasError: true,
errorCode: "UNAUTHENTICATED",
message: "Admin access required.",
};
}

const result = await deleteAdminTrialEvent(
input,
{
id: currentUser.id,
email: currentUser.email,
username: null,
role: currentUser.role,
},
{ actorUserId: currentUser.id },
);

if (!result.body.ok) {
return {
data: null,
hasError: true,
errorCode: result.body.code,
message: result.body.error,
};
}

return { data: result.body.data, hasError: false };
}
2 changes: 2 additions & 0 deletions apps/web/app/actions/admin/trials/manage/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export { createAdminTrialEventAction } from "./create-admin-trial-event";
export { deleteAdminTrialEventAction } from "./delete-admin-trial-event";
export { deleteAdminTrialEntryAction } from "./delete-admin-trial-entry";
export { updateAdminTrialEventAction } from "./update-admin-trial-event";
export { updateAdminTrialEntryAction } from "./update-admin-trial-entry";
Loading
Loading