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

@@ -0,0 +1,129 @@
-- 0085_rename_reservations_to_tenancies.sql
-- Rename berth_reservations → berth_tenancies (table + indexes + FK constraints +
-- documents.reservation_id column) and migrate jsonb permission maps (rename
-- the `reservations` resource key → `tenancies`, collapse the create/activate
-- actions into a single `manage`). See docs/tenancies-design.md.
--
-- The data is preserved verbatim; this is a pure rename at the storage
-- layer. Permission shape change: { view, create, activate, cancel }
-- collapses to { view, manage, cancel } (manage = old create OR activate).
-- 1. Rename the table.
ALTER TABLE berth_reservations RENAME TO berth_tenancies;
-- 2. Rename indexes (idx_br_* / idx_brr_* → idx_bt_*).
ALTER INDEX idx_br_berth RENAME TO idx_bt_berth;
ALTER INDEX idx_br_client RENAME TO idx_bt_client;
ALTER INDEX idx_br_yacht RENAME TO idx_bt_yacht;
ALTER INDEX idx_br_port RENAME TO idx_bt_port;
ALTER INDEX idx_brr_interest RENAME TO idx_bt_interest;
ALTER INDEX idx_brr_contract_file RENAME TO idx_bt_contract_file;
ALTER INDEX idx_br_active RENAME TO idx_bt_active;
-- 3. Rename FK constraints so Drizzle-derived names match the new table.
-- Wrapped in DO-blocks so dev DBs that pre-date 0042 (and therefore
-- are missing some FKs) don't abort the migration.
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_berth_id_berths_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_berth_id_berths_id_fk TO berth_tenancies_berth_id_berths_id_fk;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_port_id_ports_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_port_id_ports_id_fk TO berth_tenancies_port_id_ports_id_fk;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_client_id_clients_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_client_id_clients_id_fk TO berth_tenancies_client_id_clients_id_fk;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_yacht_id_yachts_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_yacht_id_yachts_id_fk TO berth_tenancies_yacht_id_yachts_id_fk;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_interest_id_interests_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_interest_id_interests_id_fk TO berth_tenancies_interest_id_interests_id_fk;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid='berth_tenancies'::regclass AND conname='berth_reservations_contract_file_id_files_id_fk') THEN
ALTER TABLE berth_tenancies RENAME CONSTRAINT berth_reservations_contract_file_id_files_id_fk TO berth_tenancies_contract_file_id_files_id_fk;
END IF;
END $$;
-- 4. Rename the FK column on documents from reservation_id → tenancy_id.
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='documents' AND column_name='reservation_id') THEN
ALTER TABLE documents RENAME COLUMN reservation_id TO tenancy_id;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (SELECT 1 FROM pg_indexes WHERE tablename='documents' AND indexname='idx_docs_reservation') THEN
ALTER INDEX idx_docs_reservation RENAME TO idx_docs_tenancy;
END IF;
END $$;
DO $$ BEGIN
IF EXISTS (
SELECT 1 FROM pg_constraint
WHERE conrelid = 'documents'::regclass
AND conname = 'documents_reservation_id_berth_reservations_id_fk'
) THEN
ALTER TABLE documents RENAME CONSTRAINT documents_reservation_id_berth_reservations_id_fk TO documents_tenancy_id_berth_tenancies_id_fk;
END IF;
END $$;
-- 5. Migrate jsonb permission maps: rename the resource key + collapse actions.
UPDATE roles
SET permissions = (
(permissions - 'reservations') ||
jsonb_build_object(
'tenancies',
jsonb_build_object(
'view', COALESCE((permissions -> 'reservations' ->> 'view')::boolean, false),
'manage', (COALESCE((permissions -> 'reservations' ->> 'create')::boolean, false)
OR COALESCE((permissions -> 'reservations' ->> 'activate')::boolean, false)),
'cancel', COALESCE((permissions -> 'reservations' ->> 'cancel')::boolean, false)
)
)
)
WHERE permissions ? 'reservations';
UPDATE port_role_overrides
SET permission_overrides = (
(permission_overrides - 'reservations') ||
jsonb_build_object(
'tenancies',
jsonb_build_object(
'view', COALESCE((permission_overrides -> 'reservations' ->> 'view')::boolean, false),
'manage', (COALESCE((permission_overrides -> 'reservations' ->> 'create')::boolean, false)
OR COALESCE((permission_overrides -> 'reservations' ->> 'activate')::boolean, false)),
'cancel', COALESCE((permission_overrides -> 'reservations' ->> 'cancel')::boolean, false)
)
)
)
WHERE permission_overrides ? 'reservations';
UPDATE user_permission_overrides
SET permission_overrides = (
(permission_overrides - 'reservations') ||
jsonb_build_object(
'tenancies',
jsonb_build_object(
'view', COALESCE((permission_overrides -> 'reservations' ->> 'view')::boolean, false),
'manage', (COALESCE((permission_overrides -> 'reservations' ->> 'create')::boolean, false)
OR COALESCE((permission_overrides -> 'reservations' ->> 'activate')::boolean, false)),
'cancel', COALESCE((permission_overrides -> 'reservations' ->> 'cancel')::boolean, false)
)
)
)
WHERE permission_overrides ? 'reservations';
-- 6. Migrate historical audit-log entity_type strings so the dashboard
-- activity feed groups old + new events under the same label.
UPDATE audit_logs SET entity_type = 'berth_tenancy'
WHERE entity_type = 'berth_reservation';

View File

@@ -17,7 +17,7 @@ import { clients } from './clients';
import { yachts } from './yachts';
import { companies } from './companies';
import { interests } from './interests';
import { berthReservations } from './reservations';
import { berthTenancies } from './tenancies';
export const files = pgTable(
'files',
@@ -90,7 +90,7 @@ export const documents = pgTable(
clientId: text('client_id').references(() => clients.id, { onDelete: 'set null' }),
yachtId: text('yacht_id').references(() => yachts.id, { onDelete: 'set null' }),
companyId: text('company_id').references(() => companies.id, { onDelete: 'set null' }),
reservationId: text('reservation_id').references(() => berthReservations.id, {
tenancyId: text('tenancy_id').references(() => berthTenancies.id, {
onDelete: 'set null',
}),
folderId: text('folder_id').references((): AnyPgColumn => documentFolders.id, {
@@ -155,7 +155,7 @@ export const documents = pgTable(
index('idx_docs_client').on(table.clientId),
index('idx_documents_yacht').on(table.yachtId),
index('idx_documents_company').on(table.companyId),
index('idx_docs_reservation').on(table.reservationId),
index('idx_docs_tenancy').on(table.tenancyId),
index('idx_docs_type').on(table.portId, table.documentType),
index('idx_docs_status_port').on(table.portId, table.status),
// Cover the file FKs Postgres doesn't auto-index. Without these,

View File

@@ -19,8 +19,8 @@ export * from './interests';
// Berths
export * from './berths';
// Reservations
export * from './reservations';
// Tenancies (formerly berth_reservations)
export * from './tenancies';
// Documents & Files
export * from './documents';

View File

@@ -43,8 +43,8 @@ import {
berthPdfVersions,
} from './berths';
// Reservations
import { berthReservations } from './reservations';
// Tenancies (formerly berth_reservations)
import { berthTenancies } from './tenancies';
// Documents
import {
@@ -104,7 +104,7 @@ export const portsRelations = relations(ports, ({ many }) => ({
yachts: many(yachts),
companies: many(companies),
berths: many(berths),
berthReservations: many(berthReservations),
berthTenancies: many(berthTenancies),
documents: many(documents),
documentTemplates: many(documentTemplates),
formTemplates: many(formTemplates),
@@ -187,7 +187,7 @@ export const clientsRelations = relations(clients, ({ one, many }) => ({
formSubmissions: many(formSubmissions),
addresses: many(clientAddresses),
companyMemberships: many(companyMemberships),
berthReservations: many(berthReservations),
berthTenancies: many(berthTenancies),
}));
export const clientContactsRelations = relations(clientContacts, ({ one }) => ({
@@ -318,7 +318,7 @@ export const yachtsRelations = relations(yachts, ({ one, many }) => ({
notes: many(yachtNotes),
tags: many(yachtTags),
interests: many(interests),
reservations: many(berthReservations),
tenancies: many(berthTenancies),
documents: many(documents),
}));
@@ -482,31 +482,31 @@ export const berthTagsRelations = relations(berthTags, ({ one }) => ({
}),
}));
// ─── Berth Reservations ───────────────────────────────────────────────────────
// ─── Berth Tenancies ──────────────────────────────────────────────────────────
export const berthReservationsRelations = relations(berthReservations, ({ one, many }) => ({
export const berthTenanciesRelations = relations(berthTenancies, ({ one, many }) => ({
berth: one(berths, {
fields: [berthReservations.berthId],
fields: [berthTenancies.berthId],
references: [berths.id],
}),
port: one(ports, {
fields: [berthReservations.portId],
fields: [berthTenancies.portId],
references: [ports.id],
}),
client: one(clients, {
fields: [berthReservations.clientId],
fields: [berthTenancies.clientId],
references: [clients.id],
}),
yacht: one(yachts, {
fields: [berthReservations.yachtId],
fields: [berthTenancies.yachtId],
references: [yachts.id],
}),
interest: one(interests, {
fields: [berthReservations.interestId],
fields: [berthTenancies.interestId],
references: [interests.id],
}),
contractFile: one(files, {
fields: [berthReservations.contractFileId],
fields: [berthTenancies.contractFileId],
references: [files.id],
}),
documents: many(documents),
@@ -566,9 +566,9 @@ export const documentsRelations = relations(documents, ({ one, many }) => ({
fields: [documents.companyId],
references: [companies.id],
}),
reservation: one(berthReservations, {
fields: [documents.reservationId],
references: [berthReservations.id],
tenancy: one(berthTenancies, {
fields: [documents.tenancyId],
references: [berthTenancies.id],
}),
folder: one(documentFolders, {
fields: [documents.folderId],

View File

@@ -7,17 +7,17 @@ import { yachts } from './yachts';
import { interests } from './interests';
import { files } from './documents';
export const berthReservations = pgTable(
'berth_reservations',
export const berthTenancies = pgTable(
'berth_tenancies',
{
id: text('id')
.primaryKey()
.$defaultFn(() => crypto.randomUUID()),
// H-01: reservations are the canonical "who occupies a berth right
// H-01: tenancies are the canonical "who occupies a berth right
// now" record; RESTRICT on every parent FK keeps an ad-hoc DB-side
// hard-delete from leaving a reservation pointing at a missing
// hard-delete from leaving a tenancy pointing at a missing
// berth/client/yacht. Interest is nullable + SET NULL because a
// reservation legitimately outlives the originating deal.
// tenancy legitimately outlives the originating deal.
berthId: text('berth_id')
.notNull()
.references(() => berths.id, { onDelete: 'restrict' }),
@@ -36,7 +36,7 @@ export const berthReservations = pgTable(
endDate: timestamp('end_date', { withTimezone: true, mode: 'date' }),
// M-L01: canonical tenure_type union is
// `permanent | fixed_term | fee_simple | strata_lot | seasonal`
// (kept in sync with berths.tenure_type). 'seasonal' is reservation-
// (kept in sync with berths.tenure_type). 'seasonal' is tenancy-
// specific (winter haul-out etc.); the others mirror the berth's
// own tenure shape. Configurable via the per-port vocabulary at
// /admin/vocabularies (key: berth_tenure_types).
@@ -48,21 +48,17 @@ export const berthReservations = pgTable(
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
},
(table) => [
index('idx_br_berth').on(table.berthId),
index('idx_br_client').on(table.clientId),
index('idx_br_yacht').on(table.yachtId),
index('idx_br_port').on(table.portId),
// Cover the FKs Postgres doesn't auto-index. Without these, deleting
// (or restrict-checking) the parent interest / contract file row
// requires a full scan of berth_reservations. (idx_br_interest is
// already used by berth_recommendations - namespace this one.)
index('idx_brr_interest').on(table.interestId),
index('idx_brr_contract_file').on(table.contractFileId),
uniqueIndex('idx_br_active')
index('idx_bt_berth').on(table.berthId),
index('idx_bt_client').on(table.clientId),
index('idx_bt_yacht').on(table.yachtId),
index('idx_bt_port').on(table.portId),
index('idx_bt_interest').on(table.interestId),
index('idx_bt_contract_file').on(table.contractFileId),
uniqueIndex('idx_bt_active')
.on(table.berthId)
.where(sql`${table.status} = 'active'`),
],
);
export type BerthReservation = typeof berthReservations.$inferSelect;
export type NewBerthReservation = typeof berthReservations.$inferInsert;
export type BerthTenancy = typeof berthTenancies.$inferSelect;
export type NewBerthTenancy = typeof berthTenancies.$inferInsert;

View File

@@ -130,10 +130,9 @@ export type RolePermissions = {
view: boolean;
manage: boolean;
};
reservations: {
tenancies: {
view: boolean;
create: boolean;
activate: boolean;
manage: boolean;
cancel: boolean;
};
admin: {

View File

@@ -37,7 +37,7 @@ import {
yachts,
yachtOwnershipHistory,
berths,
berthReservations,
berthTenancies,
interests,
interestBerths,
documentTemplates,
@@ -115,7 +115,7 @@ export interface SeedSummary {
companies: number;
yachts: number;
interests: number;
reservations: number;
tenancies: number;
}
// ─── Main ────────────────────────────────────────────────────────────────────
@@ -1049,7 +1049,7 @@ export async function seedPortData(portId: string, portSlug: string): Promise<Se
const cancelledAssignment = { berthIdx: 0, clientIdx: 2, yachtIdx: 2, startDaysAgo: 30 };
const reservationValues: Array<typeof berthReservations.$inferInsert> = [];
const reservationValues: Array<typeof berthTenancies.$inferInsert> = [];
for (const a of activeAssignments) {
reservationValues.push({
@@ -1090,7 +1090,7 @@ export async function seedPortData(portId: string, portSlug: string): Promise<Se
notes: 'Cancelled by client before activation.',
});
await tx.insert(berthReservations).values(reservationValues);
await tx.insert(berthTenancies).values(reservationValues);
return {
berths: berthRows.length,
@@ -1098,7 +1098,7 @@ export async function seedPortData(portId: string, portSlug: string): Promise<Se
companies: companyRows.length,
yachts: yachtRows.length,
interests: interestPlan.length,
reservations: reservationValues.length,
tenancies: reservationValues.length,
};
});
}

View File

@@ -67,7 +67,7 @@ export const ALL_PERMISSIONS: RolePermissions = {
yachts: { view: true, create: true, edit: true, delete: true, transfer: true },
companies: { view: true, create: true, edit: true, delete: true },
memberships: { view: true, manage: true },
reservations: { view: true, create: true, activate: true, cancel: true },
tenancies: { view: true, manage: true, cancel: true },
admin: {
manage_users: true,
view_audit_log: true,
@@ -146,7 +146,7 @@ export const DIRECTOR_PERMISSIONS: RolePermissions = {
yachts: { view: true, create: true, edit: true, delete: true, transfer: true },
companies: { view: true, create: true, edit: true, delete: true },
memberships: { view: true, manage: true },
reservations: { view: true, create: true, activate: true, cancel: true },
tenancies: { view: true, manage: true, cancel: true },
admin: {
manage_users: true,
view_audit_log: true,
@@ -225,7 +225,7 @@ export const SALES_MANAGER_PERMISSIONS: RolePermissions = {
yachts: { view: true, create: true, edit: true, delete: false, transfer: true },
companies: { view: true, create: true, edit: true, delete: false },
memberships: { view: true, manage: true },
reservations: { view: true, create: true, activate: true, cancel: true },
tenancies: { view: true, manage: true, cancel: true },
admin: {
manage_users: false,
view_audit_log: false,
@@ -304,7 +304,7 @@ export const SALES_AGENT_PERMISSIONS: RolePermissions = {
yachts: { view: true, create: true, edit: true, delete: false, transfer: false },
companies: { view: true, create: true, edit: false, delete: false },
memberships: { view: true, manage: false },
reservations: { view: true, create: true, activate: true, cancel: false },
tenancies: { view: true, manage: true, cancel: false },
admin: {
manage_users: false,
view_audit_log: false,
@@ -389,7 +389,7 @@ export const VIEWER_PERMISSIONS: RolePermissions = {
yachts: { view: true, create: false, edit: false, delete: false, transfer: false },
companies: { view: true, create: false, edit: false, delete: false },
memberships: { view: true, manage: false },
reservations: { view: true, create: false, activate: false, cancel: false },
tenancies: { view: true, manage: false, cancel: false },
admin: {
manage_users: false,
view_audit_log: false,
@@ -477,7 +477,7 @@ export const RESIDENTIAL_PARTNER_PERMISSIONS: RolePermissions = {
yachts: { view: false, create: false, edit: false, delete: false, transfer: false },
companies: { view: false, create: false, edit: false, delete: false },
memberships: { view: false, manage: false },
reservations: { view: false, create: false, activate: false, cancel: false },
tenancies: { view: false, manage: false, cancel: false },
admin: {
manage_users: false,
view_audit_log: false,

View File

@@ -30,7 +30,7 @@ import {
yachts,
yachtOwnershipHistory,
berths,
berthReservations,
berthTenancies,
interests,
interestBerths,
} from './schema';
@@ -700,10 +700,10 @@ export async function seedSyntheticPortData(
// ── 9. Reservations ─────────────────────────────────────────────────────
// One active reservation on the under_offer berth held by Carla,
// one cancelled on an available berth.
// berthReservations requires a yacht - wire both to the charter co.
// berthTenancies requires a yacht - wire both to the charter co.
// flagship since Carla / Olivia don't own yachts yet.
const sharedYachtId = charterYachtRow[1]!.id;
await tx.insert(berthReservations).values([
await tx.insert(berthTenancies).values([
{
portId,
berthId: berthRows[5]!.id,

View File

@@ -39,7 +39,7 @@ async function seed() {
} else {
const x = s.summary;
console.log(
` ✓ Port "${s.name}" - ${x.berths} berths, ${x.clients} clients, ${x.companies} companies, ${x.yachts} yachts, ${x.interests} interests, ${x.reservations} reservations`,
` ✓ Port "${s.name}" - ${x.berths} berths, ${x.clients} clients, ${x.companies} companies, ${x.yachts} yachts, ${x.interests} interests, ${x.tenancies} tenancies`,
);
}
}