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>
138 lines
4.0 KiB
TypeScript
138 lines
4.0 KiB
TypeScript
import { and, eq } from 'drizzle-orm';
|
|
|
|
import { db } from '@/lib/db';
|
|
import { berths } from '@/lib/db/schema/berths';
|
|
import { berthTenancies } from '@/lib/db/schema/tenancies';
|
|
import { clients } from '@/lib/db/schema/clients';
|
|
import { ports } from '@/lib/db/schema/ports';
|
|
import { yachts } from '@/lib/db/schema/yachts';
|
|
import { getCountryName } from '@/lib/i18n/countries';
|
|
import { NotFoundError } from '@/lib/errors';
|
|
|
|
export type ReservationAgreementContext = {
|
|
client: {
|
|
id: string;
|
|
fullName: string;
|
|
nationality: string | null;
|
|
};
|
|
yacht: {
|
|
id: string;
|
|
name: string;
|
|
lengthFt: string | null;
|
|
flag: string | null;
|
|
};
|
|
berth: {
|
|
id: string;
|
|
mooringNumber: string;
|
|
area: string | null;
|
|
lengthFt: string | null;
|
|
priceCurrency: string;
|
|
};
|
|
reservation: {
|
|
id: string;
|
|
status: string;
|
|
startDate: Date;
|
|
endDate: Date | null;
|
|
tenureType: string;
|
|
termSummary: string;
|
|
signedDate: string | null;
|
|
};
|
|
port: {
|
|
name: string;
|
|
defaultCurrency: string;
|
|
};
|
|
date: {
|
|
today: string;
|
|
year: string;
|
|
};
|
|
};
|
|
|
|
/**
|
|
* Build the merge-context shape used when generating a reservation agreement
|
|
* document. Mirrors `buildEoiContext` for consistency: pure read-only,
|
|
* tenant-scoped via `portId`, throws on missing rows.
|
|
*
|
|
* `termSummary` is a human-readable rendering of `tenureType` + dates that
|
|
* templates can use as `{{reservation.termSummary}}` without needing date
|
|
* formatting helpers in the template language.
|
|
*/
|
|
export async function buildReservationAgreementContext(
|
|
tenancyId: string,
|
|
portId: string,
|
|
): Promise<ReservationAgreementContext> {
|
|
const reservation = await db.query.berthTenancies.findFirst({
|
|
where: and(eq(berthTenancies.id, tenancyId), eq(berthTenancies.portId, portId)),
|
|
});
|
|
if (!reservation) throw new NotFoundError('Tenancy');
|
|
|
|
const [client, yacht, berth, port] = await Promise.all([
|
|
db.query.clients.findFirst({
|
|
where: and(eq(clients.id, reservation.clientId), eq(clients.portId, portId)),
|
|
}),
|
|
db.query.yachts.findFirst({
|
|
where: and(eq(yachts.id, reservation.yachtId), eq(yachts.portId, portId)),
|
|
}),
|
|
db.query.berths.findFirst({
|
|
where: and(eq(berths.id, reservation.berthId), eq(berths.portId, portId)),
|
|
}),
|
|
db.query.ports.findFirst({ where: eq(ports.id, portId) }),
|
|
]);
|
|
if (!client) throw new NotFoundError('Client');
|
|
if (!yacht) throw new NotFoundError('Yacht');
|
|
if (!berth) throw new NotFoundError('Berth');
|
|
if (!port) throw new NotFoundError('Port');
|
|
|
|
const start = reservation.startDate.toISOString().slice(0, 10);
|
|
const end = reservation.endDate ? reservation.endDate.toISOString().slice(0, 10) : null;
|
|
|
|
let termSummary: string;
|
|
if (reservation.tenureType === 'permanent') {
|
|
termSummary = `Permanent berth, commencing ${start}`;
|
|
} else if (reservation.tenureType === 'fixed_term' && end) {
|
|
termSummary = `Fixed term: ${start} to ${end}`;
|
|
} else if (reservation.tenureType === 'seasonal' && end) {
|
|
termSummary = `Seasonal: ${start} to ${end}`;
|
|
} else {
|
|
termSummary = `${reservation.tenureType} from ${start}`;
|
|
}
|
|
|
|
const now = new Date();
|
|
return {
|
|
client: {
|
|
id: client.id,
|
|
fullName: client.fullName,
|
|
nationality: client.nationalityIso ? getCountryName(client.nationalityIso, 'en') : null,
|
|
},
|
|
yacht: {
|
|
id: yacht.id,
|
|
name: yacht.name,
|
|
lengthFt: yacht.lengthFt,
|
|
flag: yacht.flag,
|
|
},
|
|
berth: {
|
|
id: berth.id,
|
|
mooringNumber: berth.mooringNumber,
|
|
area: berth.area,
|
|
lengthFt: berth.lengthFt,
|
|
priceCurrency: berth.priceCurrency,
|
|
},
|
|
reservation: {
|
|
id: reservation.id,
|
|
status: reservation.status,
|
|
startDate: reservation.startDate,
|
|
endDate: reservation.endDate,
|
|
tenureType: reservation.tenureType,
|
|
termSummary,
|
|
signedDate: null,
|
|
},
|
|
port: {
|
|
name: port.name,
|
|
defaultCurrency: port.defaultCurrency,
|
|
},
|
|
date: {
|
|
today: now.toISOString().slice(0, 10),
|
|
year: String(now.getFullYear()),
|
|
},
|
|
};
|
|
}
|