Stefan Lazic
ec5583f972
Owner Administration is complete. Summary of this final stretch of work: Seed data extended with an inactive staff member, a pending invitation, a redeemed-reward fixture, a service with no eligible staff, and a future-appointment fixture for conflict testing — all idempotent, verified against the dev DB. Testing brought to 179 unit / 86 integration / 27 E2E tests, all passing together on a freshly seeded, disposable Postgres: Unit tests for every new pure validator (business hours, categories/services, booking rules, loyalty config, staff creation). Integration tests covering opening-hours conflicts, last-owner protection, staff deactivation/eligibility conflicts, loyalty redemption's atomic race-guard, and owner-vs-barber/business-isolation authorization — all against a real Postgres. 12 new Playwright owner journeys, which surfaced and fixed two genuine issues along the way: a cookie-clearing race condition in the sign-out-mid-test flow (a real, reproducible timing bug, not just a test artifact), and confirmation that seed fixtures upserted by deterministic ID go stale once "today" has moved on — now handled defensively. Desktop responsiveness: converted the single-column Business Details, Booking Rules, and Loyalty Configuration forms to a genuine two-column layout at the lg: breakpoint (verified via measured element positions, not just screenshots), confirmed mobile stacking is unaffected. Final verification: clean tsc, eslint, and next build, plus the full three-suite run against one fresh database as the authoritative pass.
77 lines
2.7 KiB
TypeScript
77 lines
2.7 KiB
TypeScript
import type { Metadata } from "next";
|
||
import { notFound, redirect } from "next/navigation";
|
||
import { auth } from "@/auth";
|
||
import { TopNav } from "@/components/navigation/top-nav";
|
||
import { prisma } from "@/lib/db/prisma";
|
||
import { hasPermission } from "@/lib/auth/permissions";
|
||
import { Permission, Weekday } from "@/generated/prisma/enums";
|
||
import { getWorkingHours } from "@/services/staff/staff.service";
|
||
import { WorkingHoursForm } from "@/features/staff/components/working-hours-form";
|
||
import { updateStaffWorkingHoursAction } from "@/features/owner/actions/staff";
|
||
|
||
export const metadata: Metadata = { title: "Staff Working Hours" };
|
||
export const dynamic = "force-dynamic";
|
||
|
||
const DAY_ORDER: Weekday[] = [
|
||
Weekday.MONDAY,
|
||
Weekday.TUESDAY,
|
||
Weekday.WEDNESDAY,
|
||
Weekday.THURSDAY,
|
||
Weekday.FRIDAY,
|
||
Weekday.SATURDAY,
|
||
Weekday.SUNDAY,
|
||
];
|
||
|
||
function formatMinutes(m: number): string {
|
||
const h = Math.floor(m / 60);
|
||
const min = m % 60;
|
||
return `${String(h).padStart(2, "0")}:${String(min).padStart(2, "0")}`;
|
||
}
|
||
|
||
export default async function OwnerStaffWorkingHoursPage({ params }: { params: Promise<{ id: string }> }) {
|
||
const session = await auth();
|
||
if (!session?.user) redirect("/sign-in");
|
||
|
||
const canManage = await hasPermission(session.user.id, Permission.MANAGE_STAFF);
|
||
if (!canManage) redirect("/staff");
|
||
|
||
const owner = await prisma.staffProfile.findUnique({ where: { userId: session.user.id } });
|
||
if (!owner) redirect("/staff");
|
||
|
||
const { id } = await params;
|
||
const target = await prisma.staffProfile.findFirst({
|
||
where: { id, businessId: owner.businessId },
|
||
include: { user: { select: { name: true } } },
|
||
});
|
||
if (!target) notFound();
|
||
|
||
const [workingHours, businessHours] = await Promise.all([
|
||
getWorkingHours(prisma, id),
|
||
prisma.businessHours.findMany({ where: { businessId: owner.businessId } }),
|
||
]);
|
||
|
||
const businessHoursLabel = Object.fromEntries(
|
||
DAY_ORDER.map((day) => {
|
||
const hours = businessHours.find((h) => h.dayOfWeek === day);
|
||
const label =
|
||
!hours || hours.isClosed || hours.opensAtMinutes === null || hours.closesAtMinutes === null
|
||
? "Closed"
|
||
: `${formatMinutes(hours.opensAtMinutes)}–${formatMinutes(hours.closesAtMinutes)}`;
|
||
return [day, label];
|
||
}),
|
||
) as Record<Weekday, string>;
|
||
|
||
return (
|
||
<div className="pb-12">
|
||
<TopNav title={`${target.user.name ?? "Staff"} — Working Hours`} onBack sticky className="bg-stone" />
|
||
<main className="mx-auto max-w-2xl px-6 py-6">
|
||
<WorkingHoursForm
|
||
initialRows={workingHours}
|
||
businessHoursLabel={businessHoursLabel}
|
||
onSave={(days) => updateStaffWorkingHoursAction(id, days)}
|
||
/>
|
||
</main>
|
||
</div>
|
||
);
|
||
}
|