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:
@@ -14,7 +14,7 @@ import { companies } from '@/lib/db/schema/companies';
|
||||
import { yachts } from '@/lib/db/schema/yachts';
|
||||
import { berths } from '@/lib/db/schema/berths';
|
||||
import { formatBerthRange } from '@/lib/templates/berth-range';
|
||||
import { berthReservations } from '@/lib/db/schema/reservations';
|
||||
import { berthTenancies } from '@/lib/db/schema/tenancies';
|
||||
import { ports } from '@/lib/db/schema/ports';
|
||||
import { userProfiles, userPortRoles } from '@/lib/db/schema/users';
|
||||
import { buildListQuery } from '@/lib/db/query-builder';
|
||||
@@ -428,7 +428,7 @@ export async function getDocumentById(id: string, portId: string) {
|
||||
|
||||
/**
|
||||
* Reject any subject FK (clientId / interestId / companyId / yachtId /
|
||||
* reservationId) that points at a row outside the caller's port. Without
|
||||
* tenancyId) that points at a row outside the caller's port. Without
|
||||
* this guard, a port-A user could create a document whose subject is a
|
||||
* port-B client and then exfiltrate the foreign client's name + email
|
||||
* via sendForSigning's Documenso payload, or via the local watcher /
|
||||
@@ -441,7 +441,7 @@ async function assertSubjectFksInPort(
|
||||
interestId?: string | null;
|
||||
companyId?: string | null;
|
||||
yachtId?: string | null;
|
||||
reservationId?: string | null;
|
||||
tenancyId?: string | null;
|
||||
},
|
||||
): Promise<void> {
|
||||
const checks: Array<Promise<void>> = [];
|
||||
@@ -485,17 +485,14 @@ async function assertSubjectFksInPort(
|
||||
}),
|
||||
);
|
||||
}
|
||||
if (fks.reservationId) {
|
||||
if (fks.tenancyId) {
|
||||
checks.push(
|
||||
db.query.berthReservations
|
||||
db.query.berthTenancies
|
||||
.findFirst({
|
||||
where: and(
|
||||
eq(berthReservations.id, fks.reservationId),
|
||||
eq(berthReservations.portId, portId),
|
||||
),
|
||||
where: and(eq(berthTenancies.id, fks.tenancyId), eq(berthTenancies.portId, portId)),
|
||||
})
|
||||
.then((row) => {
|
||||
if (!row) throw new ValidationError('reservationId not found in this port');
|
||||
if (!row) throw new ValidationError('tenancyId not found in this port');
|
||||
}),
|
||||
);
|
||||
}
|
||||
@@ -1494,14 +1491,14 @@ export async function handleDocumentCompleted(eventData: { documentId: string; p
|
||||
.where(eq(documents.id, doc.id));
|
||||
|
||||
// Reservation agreements mirror their signed PDF onto
|
||||
// berth_reservations.contractFileId so the portal "My Reservations" view
|
||||
// berth_tenancies.contractFileId so the portal "My Tenancies" view
|
||||
// can resolve the contract without joining through documents.
|
||||
if (doc.documentType === 'reservation_agreement' && doc.reservationId) {
|
||||
const { berthReservations } = await import('@/lib/db/schema/reservations');
|
||||
if (doc.documentType === 'reservation_agreement' && doc.tenancyId) {
|
||||
const { berthTenancies } = await import('@/lib/db/schema/tenancies');
|
||||
await tx
|
||||
.update(berthReservations)
|
||||
.update(berthTenancies)
|
||||
.set({ contractFileId: inserted.id, updatedAt: new Date() })
|
||||
.where(eq(berthReservations.id, doc.reservationId));
|
||||
.where(eq(berthTenancies.id, doc.tenancyId));
|
||||
}
|
||||
|
||||
return inserted;
|
||||
@@ -2427,7 +2424,7 @@ export async function createFromWizard(
|
||||
interestId: data.interestId,
|
||||
companyId: data.companyId,
|
||||
yachtId: data.yachtId,
|
||||
reservationId: data.reservationId,
|
||||
tenancyId: data.tenancyId,
|
||||
});
|
||||
|
||||
const [doc] = await db
|
||||
@@ -2435,7 +2432,7 @@ export async function createFromWizard(
|
||||
.values({
|
||||
portId,
|
||||
interestId: data.interestId ?? null,
|
||||
reservationId: data.reservationId ?? null,
|
||||
tenancyId: data.tenancyId ?? null,
|
||||
clientId: data.clientId ?? null,
|
||||
companyId: data.companyId ?? null,
|
||||
yachtId: data.yachtId ?? null,
|
||||
@@ -2516,7 +2513,7 @@ export async function createFromUpload(
|
||||
interestId: data.interestId,
|
||||
companyId: data.companyId,
|
||||
yachtId: data.yachtId,
|
||||
reservationId: data.reservationId,
|
||||
tenancyId: data.tenancyId,
|
||||
});
|
||||
|
||||
const [doc] = await db
|
||||
@@ -2524,7 +2521,7 @@ export async function createFromUpload(
|
||||
.values({
|
||||
portId,
|
||||
interestId: data.interestId ?? null,
|
||||
reservationId: data.reservationId ?? null,
|
||||
tenancyId: data.tenancyId ?? null,
|
||||
clientId: data.clientId ?? null,
|
||||
companyId: data.companyId ?? null,
|
||||
yachtId: data.yachtId ?? null,
|
||||
|
||||
Reference in New Issue
Block a user