Matt
ccc775dc66
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>
89 lines
3.0 KiB
TypeScript
89 lines
3.0 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import { createPending, activate, endTenancy } from '@/lib/services/berth-tenancies.service';
|
|
import { makeBerth, makeClient, makePort, makeYacht, makeAuditMeta } from '../helpers/factories';
|
|
import { ConflictError } from '@/lib/errors';
|
|
|
|
describe('tenancy exclusivity', () => {
|
|
it('two concurrent activates on same berth: one succeeds, one throws ConflictError', async () => {
|
|
const port = await makePort();
|
|
const berth = await makeBerth({ portId: port.id });
|
|
const clientA = await makeClient({ portId: port.id });
|
|
const clientB = await makeClient({ portId: port.id });
|
|
const yachtA = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: clientA.id,
|
|
});
|
|
const yachtB = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: clientB.id,
|
|
});
|
|
|
|
const resA = await createPending(
|
|
port.id,
|
|
{
|
|
berthId: berth.id,
|
|
clientId: clientA.id,
|
|
yachtId: yachtA.id,
|
|
startDate: new Date(),
|
|
},
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
const resB = await createPending(
|
|
port.id,
|
|
{
|
|
berthId: berth.id,
|
|
clientId: clientB.id,
|
|
yachtId: yachtB.id,
|
|
startDate: new Date(),
|
|
},
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
|
|
const results = await Promise.allSettled([
|
|
activate(resA.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
|
activate(resB.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
|
]);
|
|
const successes = results.filter((r) => r.status === 'fulfilled');
|
|
const failures = results.filter((r) => r.status === 'rejected');
|
|
expect(successes).toHaveLength(1);
|
|
expect(failures).toHaveLength(1);
|
|
expect((failures[0] as PromiseRejectedResult).reason).toBeInstanceOf(ConflictError);
|
|
});
|
|
|
|
it('activating a second tenancy after first is ended succeeds', async () => {
|
|
const port = await makePort();
|
|
const berth = await makeBerth({ portId: port.id });
|
|
const clientA = await makeClient({ portId: port.id });
|
|
const clientB = await makeClient({ portId: port.id });
|
|
const yachtA = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: clientA.id,
|
|
});
|
|
const yachtB = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: clientB.id,
|
|
});
|
|
|
|
const resA = await createPending(
|
|
port.id,
|
|
{ berthId: berth.id, clientId: clientA.id, yachtId: yachtA.id, startDate: new Date() },
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
await activate(resA.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
|
await endTenancy(resA.id, port.id, { endDate: new Date() }, makeAuditMeta({ portId: port.id }));
|
|
|
|
const resB = await createPending(
|
|
port.id,
|
|
{ berthId: berth.id, clientId: clientB.id, yachtId: yachtB.id, startDate: new Date() },
|
|
makeAuditMeta({ portId: port.id }),
|
|
);
|
|
await expect(
|
|
activate(resB.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
|
).resolves.toBeDefined();
|
|
});
|
|
});
|