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:
64
src/lib/db/schema/tenancies.ts
Normal file
64
src/lib/db/schema/tenancies.ts
Normal file
@@ -0,0 +1,64 @@
|
||||
import { pgTable, text, timestamp, index, uniqueIndex } from 'drizzle-orm/pg-core';
|
||||
import { sql } from 'drizzle-orm';
|
||||
import { ports } from './ports';
|
||||
import { berths } from './berths';
|
||||
import { clients } from './clients';
|
||||
import { yachts } from './yachts';
|
||||
import { interests } from './interests';
|
||||
import { files } from './documents';
|
||||
|
||||
export const berthTenancies = pgTable(
|
||||
'berth_tenancies',
|
||||
{
|
||||
id: text('id')
|
||||
.primaryKey()
|
||||
.$defaultFn(() => crypto.randomUUID()),
|
||||
// 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 tenancy pointing at a missing
|
||||
// berth/client/yacht. Interest is nullable + SET NULL because a
|
||||
// tenancy legitimately outlives the originating deal.
|
||||
berthId: text('berth_id')
|
||||
.notNull()
|
||||
.references(() => berths.id, { onDelete: 'restrict' }),
|
||||
portId: text('port_id')
|
||||
.notNull()
|
||||
.references(() => ports.id, { onDelete: 'restrict' }),
|
||||
clientId: text('client_id')
|
||||
.notNull()
|
||||
.references(() => clients.id, { onDelete: 'restrict' }),
|
||||
yachtId: text('yacht_id')
|
||||
.notNull()
|
||||
.references(() => yachts.id, { onDelete: 'restrict' }),
|
||||
interestId: text('interest_id').references(() => interests.id, { onDelete: 'set null' }),
|
||||
status: text('status').notNull(), // 'pending' | 'active' | 'ended' | 'cancelled'
|
||||
startDate: timestamp('start_date', { withTimezone: true, mode: 'date' }).notNull(),
|
||||
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 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).
|
||||
tenureType: text('tenure_type').notNull().default('permanent'),
|
||||
contractFileId: text('contract_file_id').references(() => files.id, { onDelete: 'set null' }),
|
||||
notes: text('notes'),
|
||||
createdBy: text('created_by').notNull(),
|
||||
createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
updatedAt: timestamp('updated_at', { withTimezone: true }).notNull().defaultNow(),
|
||||
},
|
||||
(table) => [
|
||||
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 BerthTenancy = typeof berthTenancies.$inferSelect;
|
||||
export type NewBerthTenancy = typeof berthTenancies.$inferInsert;
|
||||
Reference in New Issue
Block a user