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:
@@ -3,10 +3,10 @@ import { eq } from 'drizzle-orm';
|
||||
import {
|
||||
createPending,
|
||||
activate,
|
||||
endReservation,
|
||||
endTenancy,
|
||||
cancel,
|
||||
listReservations,
|
||||
} from '@/lib/services/berth-reservations.service';
|
||||
listTenancies,
|
||||
} from '@/lib/services/berth-tenancies.service';
|
||||
import {
|
||||
makePort,
|
||||
makeClient,
|
||||
@@ -20,7 +20,7 @@ import { companyMemberships } from '@/lib/db/schema/companies';
|
||||
|
||||
// ─── createPending ───────────────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service - createPending', () => {
|
||||
describe('berth-tenancies.service - createPending', () => {
|
||||
it('creates pending reservation for client-owned yacht', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
@@ -203,7 +203,7 @@ describe('berth-reservations.service - createPending', () => {
|
||||
|
||||
// ─── Lifecycle transitions ───────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
describe('berth-tenancies.service - lifecycle transitions', () => {
|
||||
async function setup() {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
@@ -238,10 +238,10 @@ describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
expect(activated.status).toBe('active');
|
||||
});
|
||||
|
||||
it('active → ended (endReservation)', async () => {
|
||||
it('active → ended (endTenancy)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
const ended = await endReservation(
|
||||
const ended = await endTenancy(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
@@ -277,7 +277,7 @@ describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
it('rejects ended → active (invalid transition)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
await endReservation(
|
||||
await endTenancy(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
@@ -304,7 +304,7 @@ describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
it('rejects cancel from ended state', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
await endReservation(
|
||||
await endTenancy(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
@@ -315,10 +315,10 @@ describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
).rejects.toThrow(/invalid transition/i);
|
||||
});
|
||||
|
||||
it('rejects endReservation on a pending reservation', async () => {
|
||||
it('rejects endTenancy on a pending reservation', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await expect(
|
||||
endReservation(
|
||||
endTenancy(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
@@ -328,9 +328,9 @@ describe('berth-reservations.service - lifecycle transitions', () => {
|
||||
});
|
||||
});
|
||||
|
||||
// ─── listReservations ────────────────────────────────────────────────────────
|
||||
// ─── listTenancies ────────────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service - listReservations', () => {
|
||||
describe('berth-tenancies.service - listTenancies', () => {
|
||||
async function makeReservation(portId: string, opts?: { berthId?: string }) {
|
||||
const berth = opts?.berthId ? { id: opts.berthId } : await makeBerth({ portId });
|
||||
const client = await makeClient({ portId });
|
||||
@@ -354,7 +354,7 @@ describe('berth-reservations.service - listReservations', () => {
|
||||
const resA = await makeReservation(portA.id);
|
||||
await makeReservation(portB.id);
|
||||
|
||||
const result = await listReservations(portA.id, {
|
||||
const result = await listTenancies(portA.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
@@ -371,7 +371,7 @@ describe('berth-reservations.service - listReservations', () => {
|
||||
const resActive = await makeReservation(port.id);
|
||||
await activate(resActive.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
|
||||
const activeList = await listReservations(port.id, {
|
||||
const activeList = await listTenancies(port.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
@@ -403,7 +403,7 @@ describe('berth-reservations.service - listReservations', () => {
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
|
||||
const result = await listReservations(port.id, {
|
||||
const result = await listTenancies(port.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
@@ -418,7 +418,7 @@ describe('berth-reservations.service - listReservations', () => {
|
||||
|
||||
// ─── Self-check: DB state is as expected after cancel ────────────────────────
|
||||
|
||||
describe('berth-reservations.service - DB state', () => {
|
||||
describe('berth-tenancies.service - DB state', () => {
|
||||
it('cancel persists status=cancelled in the database', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
@@ -431,8 +431,8 @@ describe('berth-reservations.service - DB state', () => {
|
||||
);
|
||||
await cancel(res.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
|
||||
const { berthReservations } = await import('@/lib/db/schema');
|
||||
const [row] = await db.select().from(berthReservations).where(eq(berthReservations.id, res.id));
|
||||
const { berthTenancies } = await import('@/lib/db/schema');
|
||||
const [row] = await db.select().from(berthTenancies).where(eq(berthTenancies.id, res.id));
|
||||
expect(row!.status).toBe('cancelled');
|
||||
});
|
||||
});
|
||||
@@ -238,8 +238,8 @@ describe('portal.service - getPortalUserMemberships', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('portal.service - getPortalUserReservations', () => {
|
||||
let getPortalUserReservations: (clientId: string, portId: string) => Promise<Array<any>>;
|
||||
describe('portal.service - getPortalUserTenancies', () => {
|
||||
let getPortalUserTenancies: (clientId: string, portId: string) => Promise<Array<any>>;
|
||||
|
||||
let makeClient: typeof import('../../helpers/factories').makeClient;
|
||||
|
||||
@@ -249,20 +249,20 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
|
||||
let makeBerth: typeof import('../../helpers/factories').makeBerth;
|
||||
|
||||
let makeReservation: typeof import('../../helpers/factories').makeReservation;
|
||||
let makeTenancy: typeof import('../../helpers/factories').makeTenancy;
|
||||
|
||||
beforeAll(async () => {
|
||||
const portalMod = await import('@/lib/services/portal.service');
|
||||
getPortalUserReservations = portalMod.getPortalUserReservations;
|
||||
getPortalUserTenancies = portalMod.getPortalUserTenancies;
|
||||
const factoriesMod = await import('../../helpers/factories');
|
||||
makeClient = factoriesMod.makeClient;
|
||||
makePort = factoriesMod.makePort;
|
||||
makeYacht = factoriesMod.makeYacht;
|
||||
makeBerth = factoriesMod.makeBerth;
|
||||
makeReservation = factoriesMod.makeReservation;
|
||||
makeTenancy = factoriesMod.makeTenancy;
|
||||
});
|
||||
|
||||
it('returns active + pending reservations', async () => {
|
||||
it('returns active + pending tenancies', async () => {
|
||||
const port = await makePort();
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
@@ -272,14 +272,14 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
});
|
||||
const berth1 = await makeBerth({ portId: port.id });
|
||||
const berth2 = await makeBerth({ portId: port.id });
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berth1.id,
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
status: 'active',
|
||||
});
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berth2.id,
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
@@ -287,7 +287,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
status: 'pending',
|
||||
});
|
||||
|
||||
const result = await getPortalUserReservations(client.id, port.id);
|
||||
const result = await getPortalUserTenancies(client.id, port.id);
|
||||
expect(result).toHaveLength(2);
|
||||
const statuses = result.map((r) => r.status).sort();
|
||||
expect(statuses).toEqual(['active', 'pending']);
|
||||
@@ -303,14 +303,14 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
});
|
||||
const berth1 = await makeBerth({ portId: port.id });
|
||||
const berth2 = await makeBerth({ portId: port.id });
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berth1.id,
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
status: 'ended',
|
||||
});
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berth2.id,
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
@@ -318,7 +318,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
status: 'cancelled',
|
||||
});
|
||||
|
||||
const result = await getPortalUserReservations(client.id, port.id);
|
||||
const result = await getPortalUserTenancies(client.id, port.id);
|
||||
expect(result).toHaveLength(0);
|
||||
});
|
||||
|
||||
@@ -332,7 +332,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
ownerId: client.id,
|
||||
});
|
||||
const berthB = await makeBerth({ portId: portB.id });
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berthB.id,
|
||||
portId: portB.id,
|
||||
clientId: client.id,
|
||||
@@ -340,7 +340,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
status: 'active',
|
||||
});
|
||||
|
||||
const resultA = await getPortalUserReservations(client.id, portA.id);
|
||||
const resultA = await getPortalUserTenancies(client.id, portA.id);
|
||||
expect(resultA).toHaveLength(0);
|
||||
});
|
||||
|
||||
@@ -357,7 +357,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
portId: port.id,
|
||||
overrides: { mooringNumber: 'M-42' },
|
||||
});
|
||||
await makeReservation({
|
||||
await makeTenancy({
|
||||
berthId: berth.id,
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
@@ -365,7 +365,7 @@ describe('portal.service - getPortalUserReservations', () => {
|
||||
status: 'active',
|
||||
});
|
||||
|
||||
const result = await getPortalUserReservations(client.id, port.id);
|
||||
const result = await getPortalUserTenancies(client.id, port.id);
|
||||
expect(result).toHaveLength(1);
|
||||
expect(result[0]!.yachtName).toBe('Test Vessel');
|
||||
expect(result[0]!.berthMooringNumber).toBe('M-42');
|
||||
|
||||
@@ -8,7 +8,7 @@ import { createFieldSchema, updateFieldSchema } from '@/lib/validators/custom-fi
|
||||
import { createYachtSchema, transferOwnershipSchema } from '@/lib/validators/yachts';
|
||||
import { createCompanySchema } from '@/lib/validators/companies';
|
||||
import { addMembershipSchema } from '@/lib/validators/company-memberships';
|
||||
import { createPendingSchema } from '@/lib/validators/reservations';
|
||||
import { createPendingSchema } from '@/lib/validators/tenancies';
|
||||
|
||||
// ─── Client schemas ───────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -103,13 +103,13 @@ describe('new resource events (yachts, companies, memberships, reservations)', (
|
||||
);
|
||||
});
|
||||
|
||||
it('includes all berth reservation lifecycle events', () => {
|
||||
it('includes all berth tenancy lifecycle events', () => {
|
||||
const events = new Set<string>(WEBHOOK_EVENTS);
|
||||
[
|
||||
'berth_reservation.created',
|
||||
'berth_reservation.activated',
|
||||
'berth_reservation.ended',
|
||||
'berth_reservation.cancelled',
|
||||
'berth_tenancy.created',
|
||||
'berth_tenancy.activated',
|
||||
'berth_tenancy.ended',
|
||||
'berth_tenancy.cancelled',
|
||||
].forEach((e) => {
|
||||
expect(events.has(e)).toBe(true);
|
||||
});
|
||||
@@ -121,9 +121,7 @@ describe('new resource events (yachts, companies, memberships, reservations)', (
|
||||
);
|
||||
});
|
||||
|
||||
it('berth_reservation:activated maps to berth_reservation.activated', () => {
|
||||
expect(INTERNAL_TO_WEBHOOK_MAP['berth_reservation:activated']).toBe(
|
||||
'berth_reservation.activated',
|
||||
);
|
||||
it('berth_tenancy:activated maps to berth_tenancy.activated', () => {
|
||||
expect(INTERNAL_TO_WEBHOOK_MAP['berth_tenancy:activated']).toBe('berth_tenancy.activated');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user