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:
@@ -36,7 +36,7 @@ export const createDocumentWizardSchema = z
|
||||
notes: z.string().optional(),
|
||||
|
||||
interestId: z.string().optional(),
|
||||
reservationId: z.string().optional(),
|
||||
tenancyId: z.string().optional(),
|
||||
clientId: z.string().optional(),
|
||||
companyId: z.string().optional(),
|
||||
yachtId: z.string().optional(),
|
||||
@@ -55,9 +55,8 @@ export const createDocumentWizardSchema = z
|
||||
})
|
||||
.refine(
|
||||
(d) =>
|
||||
[d.interestId, d.reservationId, d.clientId, d.companyId, d.yachtId].filter(Boolean).length ===
|
||||
1,
|
||||
{ message: 'Exactly one subject (interest/reservation/client/company/yacht) is required' },
|
||||
[d.interestId, d.tenancyId, d.clientId, d.companyId, d.yachtId].filter(Boolean).length === 1,
|
||||
{ message: 'Exactly one subject (interest/tenancy/client/company/yacht) is required' },
|
||||
)
|
||||
.refine((d) => d.source !== 'template' || Boolean(d.templateId), {
|
||||
path: ['templateId'],
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { z } from 'zod';
|
||||
import { baseListQuerySchema } from '@/lib/api/list-query';
|
||||
|
||||
export const RESERVATION_STATUSES = ['pending', 'active', 'ended', 'cancelled'] as const;
|
||||
export const TENANCY_STATUSES = ['pending', 'active', 'ended', 'cancelled'] as const;
|
||||
export const TENURE_TYPES = ['permanent', 'fixed_term', 'seasonal'] as const;
|
||||
|
||||
export const createPendingSchema = z.object({
|
||||
@@ -19,7 +19,7 @@ export const activateSchema = z.object({
|
||||
effectiveDate: z.coerce.date().optional(),
|
||||
});
|
||||
|
||||
export const endReservationSchema = z.object({
|
||||
export const endTenancySchema = z.object({
|
||||
endDate: z.coerce.date(),
|
||||
notes: z.string().optional(),
|
||||
});
|
||||
@@ -28,8 +28,8 @@ export const cancelSchema = z.object({
|
||||
reason: z.string().optional(),
|
||||
});
|
||||
|
||||
export const listReservationsSchema = baseListQuerySchema.extend({
|
||||
status: z.enum(RESERVATION_STATUSES).optional(),
|
||||
export const listTenanciesSchema = baseListQuerySchema.extend({
|
||||
status: z.enum(TENANCY_STATUSES).optional(),
|
||||
berthId: z.string().optional(),
|
||||
clientId: z.string().optional(),
|
||||
yachtId: z.string().optional(),
|
||||
@@ -37,6 +37,6 @@ export const listReservationsSchema = baseListQuerySchema.extend({
|
||||
|
||||
export type CreatePendingInput = z.infer<typeof createPendingSchema>;
|
||||
export type ActivateInput = z.infer<typeof activateSchema>;
|
||||
export type EndReservationInput = z.infer<typeof endReservationSchema>;
|
||||
export type EndTenancyInput = z.infer<typeof endTenancySchema>;
|
||||
export type CancelInput = z.infer<typeof cancelSchema>;
|
||||
export type ListReservationsInput = z.infer<typeof listReservationsSchema>;
|
||||
export type ListTenanciesInput = z.infer<typeof listTenanciesSchema>;
|
||||
Reference in New Issue
Block a user