feat(tenancies-p2): rename berth_reservations → berth_tenancies (schema + perms + UI)

73-file atomic rename per docs/tenancies-design.md:

- Migration 0085: rename table + indexes + FK constraints; rename
  documents.reservation_id → tenancy_id; migrate jsonb permission maps
  (reservations resource → tenancies; collapse create+activate → manage);
  rewrite historical audit_logs.entity_type='berth_reservation' →
  'berth_tenancy'. FK renames wrapped in DO blocks so dev DBs that pre-date
  the FK additions don't abort.
- Schema: berthReservations → berthTenancies; BerthReservation type →
  BerthTenancy; indexes idx_br_* / idx_brr_* → idx_bt_*.
- RolePermissions: resource { view, create, activate, cancel } collapses to
  { view, manage, cancel }; all 8 default seed bundles + role-form + matrix
  updated.
- Service: berth-reservations.service.ts → berth-tenancies.service.ts;
  endReservation → endTenancy; listReservations → listTenancies.
- API: /api/v1/berth-reservations → /api/v1/tenancies (+ nested [id]);
  /api/v1/berths/[id]/reservations → /api/v1/berths/[id]/tenancies.
- Validators: reservations.ts → tenancies.ts; RESERVATION_STATUSES →
  TENANCY_STATUSES; endReservationSchema → endTenancySchema.
- Routes: /{portSlug}/berth-reservations → /{portSlug}/tenancies;
  /portal/my-reservations → /portal/my-tenancies.
- Components: src/components/reservations/* → src/components/tenancies/*;
  BerthReservationsTab → BerthTenanciesTab; ClientReservationsTab →
  ClientTenanciesTab; ReservationList → TenancyList.
- Socket events: berth_reservation:* → berth_tenancy:*; payload
  reservationId → tenancyId.
- Webhook events: berth_reservation.* → berth_tenancy.*.
- Portal: getPortalUserReservations → getPortalUserTenancies;
  PortalReservation → PortalTenancy; PortalDashboard.counts.activeReservations
  → activeTenancies; PortalNav label "Reservations" → "Tenancies".
- Dossier: DossierReservation → DossierTenancy; reservationDecisions →
  tenancyDecisions across smart-archive-dialog + bulk-archive routes.
- Documents schema: documents.reservationId → documents.tenancyId
  (TS + DB column + index + FK constraint).
- Activity feed label berth_reservation → berth_tenancy (matched against
  migrated historical audit rows).

KEPT (separate concepts):
- Reservation Agreement document type (the contract sent to clients).
- "Reservation" pipeline stage name.
- {{reservation.*}} merge tokens in template authoring.
- interest.reservationStatus / reservationDocStatus / dateReservationSent
  fields (track agreement signing on the deal).
- reservation-agreement-context.ts service (builds merge context for the
  Reservation Agreement doc; only its DB imports were renamed).

Verified: tsc clean, 1480/1480 vitest passing, migration applied.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-05-25 15:09:35 +02:00
parent 4f350d1fbd
commit ccc775dc66
77 changed files with 818 additions and 742 deletions

View File

@@ -1,6 +0,0 @@
import { withAuth, withPermission } from '@/lib/api/helpers';
import { listHandler, createHandler } from './handlers';
export const GET = withAuth(withPermission('reservations', 'view', listHandler));
export const POST = withAuth(withPermission('reservations', 'create', createHandler));

View File

@@ -6,8 +6,8 @@ import { parseBody, parseQuery } from '@/lib/api/route-helpers';
import { db } from '@/lib/db';
import { berths } from '@/lib/db/schema/berths';
import { NotFoundError, errorResponse } from '@/lib/errors';
import { createPending, listReservations } from '@/lib/services/berth-reservations.service';
import { createPendingSchema, listReservationsSchema } from '@/lib/validators/reservations';
import { createPending, listTenancies } from '@/lib/services/berth-tenancies.service';
import { createPendingSchema, listTenanciesSchema } from '@/lib/validators/tenancies';
// URL berthId is authoritative; make body berthId optional (ignored anyway).
const createPendingBodySchema = createPendingSchema
@@ -24,8 +24,8 @@ async function assertBerthInPort(berthId: string, portId: string): Promise<void>
export const listHandler: RouteHandler = async (req, ctx, params) => {
try {
await assertBerthInPort(params.id!, ctx.portId);
const query = parseQuery(req, listReservationsSchema);
const result = await listReservations(ctx.portId, { ...query, berthId: params.id! });
const query = parseQuery(req, listTenanciesSchema);
const result = await listTenancies(ctx.portId, { ...query, berthId: params.id! });
const { page, limit } = query;
const totalPages = Math.ceil(result.total / limit);
return NextResponse.json({
@@ -48,7 +48,7 @@ export const createHandler: RouteHandler = async (req, ctx, params) => {
try {
await assertBerthInPort(params.id!, ctx.portId);
const body = await parseBody(req, createPendingBodySchema);
const reservation = await createPending(
const tenancy = await createPending(
ctx.portId,
{ ...body, berthId: params.id! },
{
@@ -58,7 +58,7 @@ export const createHandler: RouteHandler = async (req, ctx, params) => {
userAgent: ctx.userAgent,
},
);
return NextResponse.json({ data: reservation }, { status: 201 });
return NextResponse.json({ data: tenancy }, { status: 201 });
} catch (error) {
return errorResponse(error);
}

View File

@@ -0,0 +1,6 @@
import { withAuth, withPermission } from '@/lib/api/helpers';
import { listHandler, createHandler } from './handlers';
export const GET = withAuth(withPermission('tenancies', 'view', listHandler));
export const POST = withAuth(withPermission('tenancies', 'manage', createHandler));

View File

@@ -35,10 +35,10 @@ const decisionsSchema = z.object({
}),
)
.default([]),
reservationDecisions: z
tenancyDecisions: z
.array(
z.object({
reservationId: z.string().min(1),
tenancyId: z.string().min(1),
action: z.enum(['cancel', 'transfer']),
transferToClientId: z.string().min(1).optional(),
}),

View File

@@ -16,7 +16,7 @@ interface PreflightItem {
stakeLevel: 'low' | 'high';
highStakesStage: string | null;
blockers: string[];
summary: { berths: number; yachts: number; reservations: number; signedDocs: number };
summary: { berths: number; yachts: number; tenancies: number; signedDocs: number };
}
/**
@@ -43,7 +43,7 @@ export const POST = withAuth(
summary: {
berths: d.berths.length,
yachts: d.yachts.length,
reservations: d.reservations.length,
tenancies: d.tenancies.length,
signedDocs: d.documents.filter(
(doc) => doc.status === 'completed' || doc.status === 'signed',
).length,
@@ -60,7 +60,7 @@ export const POST = withAuth(
stakeLevel: 'low',
highStakesStage: null,
blockers: ['Could not load dossier - client may have been removed'],
summary: { berths: 0, yachts: 0, reservations: 0, signedDocs: 0 },
summary: { berths: 0, yachts: 0, tenancies: 0, signedDocs: 0 },
});
}
}

View File

@@ -135,8 +135,8 @@ export const POST = withAuth(async (req, ctx) => {
acknowledgedSignedDocuments: hasSignedDocs,
berthDecisions,
yachtDecisions: dossier.yachts.map((y) => ({ yachtId: y.yachtId, action: 'retain' })),
reservationDecisions: dossier.reservations.map((r) => ({
reservationId: r.reservationId,
tenancyDecisions: dossier.tenancies.map((r) => ({
tenancyId: r.tenancyId,
action: 'cancel',
})),
invoiceDecisions: dossier.invoices.map((i) => ({

View File

@@ -5,12 +5,7 @@ import { type RouteHandler } from '@/lib/api/helpers';
import { parseBody } from '@/lib/api/route-helpers';
import { requirePermission } from '@/lib/auth/permissions';
import { errorResponse } from '@/lib/errors';
import {
activate,
cancel,
endReservation,
getById,
} from '@/lib/services/berth-reservations.service';
import { activate, cancel, endTenancy, getById } from '@/lib/services/berth-tenancies.service';
// ─── PATCH body schema (action-based discriminated union) ────────────────────
@@ -35,8 +30,8 @@ const patchBodySchema = z.discriminatedUnion('action', [
export const getHandler: RouteHandler = async (_req, ctx, params) => {
try {
const reservation = await getById(params.id!, ctx.portId);
return NextResponse.json({ data: reservation });
const tenancy = await getById(params.id!, ctx.portId);
return NextResponse.json({ data: tenancy });
} catch (error) {
return errorResponse(error);
}
@@ -53,7 +48,7 @@ export const patchHandler: RouteHandler = async (req, ctx, params) => {
};
if (body.action === 'activate') {
requirePermission(ctx, 'reservations', 'activate');
requirePermission(ctx, 'tenancies', 'manage');
const result = await activate(
params.id!,
ctx.portId,
@@ -68,8 +63,8 @@ export const patchHandler: RouteHandler = async (req, ctx, params) => {
if (body.action === 'end') {
// `end` is lifecycle progression; same privilege as activate.
requirePermission(ctx, 'reservations', 'activate');
const result = await endReservation(
requirePermission(ctx, 'tenancies', 'manage');
const result = await endTenancy(
params.id!,
ctx.portId,
{ endDate: body.endDate, notes: body.notes },
@@ -79,7 +74,7 @@ export const patchHandler: RouteHandler = async (req, ctx, params) => {
}
// action === 'cancel'
requirePermission(ctx, 'reservations', 'cancel');
requirePermission(ctx, 'tenancies', 'cancel');
const result = await cancel(params.id!, ctx.portId, { reason: body.reason }, meta);
return NextResponse.json({ data: result });
} catch (error) {

View File

@@ -2,9 +2,9 @@ import { withAuth, withPermission } from '@/lib/api/helpers';
import { getHandler, patchHandler, deleteHandler } from './handlers';
export const GET = withAuth(withPermission('reservations', 'view', getHandler));
export const GET = withAuth(withPermission('tenancies', 'view', getHandler));
// PATCH cannot use `withPermission` wrapper - the required permission depends
// on the `action` field in the body. `requirePermission` is called inside the
// handler after the body is parsed.
export const PATCH = withAuth(patchHandler);
export const DELETE = withAuth(withPermission('reservations', 'cancel', deleteHandler));
export const DELETE = withAuth(withPermission('tenancies', 'cancel', deleteHandler));

View File

@@ -3,19 +3,19 @@ import { NextResponse } from 'next/server';
import type { AuthContext } from '@/lib/api/helpers';
import { parseQuery } from '@/lib/api/route-helpers';
import { errorResponse } from '@/lib/errors';
import { listReservations } from '@/lib/services/berth-reservations.service';
import { listReservationsSchema } from '@/lib/validators/reservations';
import { listTenancies } from '@/lib/services/berth-tenancies.service';
import { listTenanciesSchema } from '@/lib/validators/tenancies';
/**
* Port-scoped global list of reservations across all berths. Inner handler
* Port-scoped global list of tenancies across all berths. Inner handler
* lives here so it can be invoked directly from integration tests without
* the `withAuth(withPermission(...))` wrappers (matches the convention
* used throughout `src/app/api/v1/*`).
*/
export async function listHandler(req: Request, ctx: AuthContext): Promise<NextResponse> {
try {
const query = parseQuery(req as never, listReservationsSchema);
const result = await listReservations(ctx.portId, query);
const query = parseQuery(req as never, listTenanciesSchema);
const result = await listTenancies(ctx.portId, query);
const { page, limit } = query;
const totalPages = Math.ceil(result.total / limit);
return NextResponse.json({

View File

@@ -1,4 +1,4 @@
import { withAuth, withPermission } from '@/lib/api/helpers';
import { listHandler } from './handlers';
export const GET = withAuth(withPermission('reservations', 'view', listHandler));
export const GET = withAuth(withPermission('tenancies', 'view', listHandler));