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>
97 lines
3.4 KiB
TypeScript
97 lines
3.4 KiB
TypeScript
/**
|
|
* Port-scoped global tenancies list - locks in feat(marina): the
|
|
* `GET /api/v1/tenancies` endpoint that powers the
|
|
* `[portSlug]/tenancies` page. The route is thin (parseQuery →
|
|
* listTenancies); the test guarantees port scoping at the handler
|
|
* boundary so a future refactor of the service can't accidentally leak
|
|
* cross-port rows.
|
|
*/
|
|
import { describe, it, expect } from 'vitest';
|
|
|
|
import { listHandler } from '@/app/api/v1/tenancies/handlers';
|
|
import { createHandler as createTenancyHandler } from '@/app/api/v1/berths/[id]/tenancies/handlers';
|
|
import { makeMockCtx, makeMockRequest } from '../../helpers/route-tester';
|
|
import {
|
|
makeBerth,
|
|
makeClient,
|
|
makeFullPermissions,
|
|
makePort,
|
|
makeYacht,
|
|
} from '../../helpers/factories';
|
|
|
|
async function seedTenancy(portId: string) {
|
|
const berth = await makeBerth({ portId });
|
|
const client = await makeClient({ portId });
|
|
const yacht = await makeYacht({ portId, ownerType: 'client', ownerId: client.id });
|
|
const ctx = makeMockCtx({ portId, permissions: makeFullPermissions() });
|
|
const res = await createTenancyHandler(
|
|
makeMockRequest('POST', `http://localhost/api/v1/berths/${berth.id}/tenancies`, {
|
|
body: {
|
|
clientId: client.id,
|
|
yachtId: yacht.id,
|
|
startDate: new Date().toISOString(),
|
|
},
|
|
}),
|
|
ctx,
|
|
{ id: berth.id },
|
|
);
|
|
return ((await res.json()) as any).data as { id: string; berthId: string };
|
|
}
|
|
|
|
describe('GET /api/v1/tenancies', () => {
|
|
it('returns all tenancies for the requesting port', async () => {
|
|
const port = await makePort();
|
|
const r1 = await seedTenancy(port.id);
|
|
const r2 = await seedTenancy(port.id);
|
|
|
|
const ctx = makeMockCtx({ portId: port.id, permissions: makeFullPermissions() });
|
|
const res = await listHandler(makeMockRequest('GET', 'http://localhost/api/v1/tenancies'), ctx);
|
|
expect(res.status).toBe(200);
|
|
|
|
const body = (await res.json()) as any;
|
|
const ids = (body.data as Array<{ id: string }>).map((r) => r.id).sort();
|
|
expect(ids).toEqual([r1.id, r2.id].sort());
|
|
expect(body.pagination).toMatchObject({ page: 1, total: 2 });
|
|
});
|
|
|
|
it('does not leak tenancies from a different port', async () => {
|
|
const portA = await makePort();
|
|
const portB = await makePort();
|
|
const tenancyInB = await seedTenancy(portB.id);
|
|
|
|
// Caller is operating in portA; portB's tenancy must not appear.
|
|
const ctx = makeMockCtx({ portId: portA.id, permissions: makeFullPermissions() });
|
|
const res = await listHandler(makeMockRequest('GET', 'http://localhost/api/v1/tenancies'), ctx);
|
|
expect(res.status).toBe(200);
|
|
|
|
const body = (await res.json()) as any;
|
|
const ids = (body.data as Array<{ id: string }>).map((r) => r.id);
|
|
expect(ids).not.toContain(tenancyInB.id);
|
|
});
|
|
|
|
it('honors pagination via query params', async () => {
|
|
const port = await makePort();
|
|
await seedTenancy(port.id);
|
|
await seedTenancy(port.id);
|
|
await seedTenancy(port.id);
|
|
|
|
const ctx = makeMockCtx({ portId: port.id, permissions: makeFullPermissions() });
|
|
const res = await listHandler(
|
|
makeMockRequest('GET', 'http://localhost/api/v1/tenancies?page=1&limit=2'),
|
|
ctx,
|
|
);
|
|
expect(res.status).toBe(200);
|
|
|
|
const body = (await res.json()) as any;
|
|
expect(body.data).toHaveLength(2);
|
|
expect(body.pagination).toMatchObject({
|
|
page: 1,
|
|
pageSize: 2,
|
|
total: 3,
|
|
totalPages: 2,
|
|
hasNextPage: true,
|
|
hasPreviousPage: false,
|
|
});
|
|
});
|
|
});
|