feat(reservations): service + validators + exclusivity tests
Adds the berth_reservations service covering the full lifecycle
(pending -> active -> ended/cancelled) with tenant scoping, DB-enforced
exclusivity on the idx_br_active partial unique index, and
client-or-company-member cross-checks for yacht ownership.
- validators: createPending / activate / end / cancel / list schemas
- service: createPending, activate, endReservation, cancel, getById,
listReservations — with narrow 23505/idx_br_active catch that
re-queries the conflicting active reservation
- socket events: berth_reservation:{created,activated,ended,cancelled}
- tests: unit (lifecycle, tenant, membership cross-check),
integration (concurrent-activate ConflictError + re-activate after end)
This commit is contained in:
Matt Ciaccio
93
tests/integration/reservation-exclusivity.test.ts
Normal file
93
tests/integration/reservation-exclusivity.test.ts
Normal file
@@ -0,0 +1,93 @@
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { createPending, activate, endReservation } from '@/lib/services/berth-reservations.service';
|
||||
import { makeBerth, makeClient, makePort, makeYacht, makeAuditMeta } from '../helpers/factories';
|
||||
import { ConflictError } from '@/lib/errors';
|
||||
|
||||
describe('reservation 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 reservation 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 endReservation(
|
||||
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();
|
||||
});
|
||||
});
|
||||
438
tests/unit/services/berth-reservations.test.ts
Normal file
438
tests/unit/services/berth-reservations.test.ts
Normal file
@@ -0,0 +1,438 @@
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import { eq } from 'drizzle-orm';
|
||||
import {
|
||||
createPending,
|
||||
activate,
|
||||
endReservation,
|
||||
cancel,
|
||||
listReservations,
|
||||
} from '@/lib/services/berth-reservations.service';
|
||||
import {
|
||||
makePort,
|
||||
makeClient,
|
||||
makeBerth,
|
||||
makeYacht,
|
||||
makeCompany,
|
||||
makeAuditMeta,
|
||||
} from '../../helpers/factories';
|
||||
import { db } from '@/lib/db';
|
||||
import { companyMemberships } from '@/lib/db/schema/companies';
|
||||
|
||||
// ─── createPending ───────────────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service — createPending', () => {
|
||||
it('creates pending reservation for client-owned yacht', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'client',
|
||||
ownerId: client.id,
|
||||
});
|
||||
|
||||
const reservation = await createPending(
|
||||
port.id,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
|
||||
expect(reservation.status).toBe('pending');
|
||||
expect(reservation.berthId).toBe(berth.id);
|
||||
expect(reservation.clientId).toBe(client.id);
|
||||
expect(reservation.yachtId).toBe(yacht.id);
|
||||
expect(reservation.portId).toBe(port.id);
|
||||
expect(reservation.tenureType).toBe('permanent');
|
||||
});
|
||||
|
||||
it('creates pending for company-owned yacht when client is a company member', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const company = await makeCompany({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'company',
|
||||
ownerId: company.id,
|
||||
});
|
||||
|
||||
// Active membership (no endDate).
|
||||
await db.insert(companyMemberships).values({
|
||||
companyId: company.id,
|
||||
clientId: client.id,
|
||||
role: 'director',
|
||||
startDate: new Date(),
|
||||
});
|
||||
|
||||
const reservation = await createPending(
|
||||
port.id,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
|
||||
expect(reservation.status).toBe('pending');
|
||||
expect(reservation.clientId).toBe(client.id);
|
||||
});
|
||||
|
||||
it('rejects when yacht does not belong to client (no membership)', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const ownerClient = await makeClient({ portId: port.id });
|
||||
const otherClient = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'client',
|
||||
ownerId: ownerClient.id,
|
||||
});
|
||||
|
||||
await expect(
|
||||
createPending(
|
||||
port.id,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: otherClient.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
),
|
||||
).rejects.toThrow(/yacht does not belong/i);
|
||||
});
|
||||
|
||||
it('rejects when company-owned yacht client has an ended membership', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const company = await makeCompany({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'company',
|
||||
ownerId: company.id,
|
||||
});
|
||||
|
||||
// Membership ended → should not authorise.
|
||||
await db.insert(companyMemberships).values({
|
||||
companyId: company.id,
|
||||
clientId: client.id,
|
||||
role: 'director',
|
||||
startDate: new Date('2024-01-01'),
|
||||
endDate: new Date('2024-12-31'),
|
||||
});
|
||||
|
||||
await expect(
|
||||
createPending(
|
||||
port.id,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
),
|
||||
).rejects.toThrow(/yacht does not belong/i);
|
||||
});
|
||||
|
||||
it('rejects berth from a different port (tenant)', async () => {
|
||||
const portA = await makePort();
|
||||
const portB = await makePort();
|
||||
const berthInB = await makeBerth({ portId: portB.id });
|
||||
const clientInA = await makeClient({ portId: portA.id });
|
||||
const yachtInA = await makeYacht({
|
||||
portId: portA.id,
|
||||
ownerType: 'client',
|
||||
ownerId: clientInA.id,
|
||||
});
|
||||
|
||||
await expect(
|
||||
createPending(
|
||||
portA.id,
|
||||
{
|
||||
berthId: berthInB.id,
|
||||
clientId: clientInA.id,
|
||||
yachtId: yachtInA.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: portA.id }),
|
||||
),
|
||||
).rejects.toThrow(/berth not found/i);
|
||||
});
|
||||
|
||||
it('rejects yacht from a different port (tenant)', async () => {
|
||||
const portA = await makePort();
|
||||
const portB = await makePort();
|
||||
const berthInA = await makeBerth({ portId: portA.id });
|
||||
const clientInA = await makeClient({ portId: portA.id });
|
||||
const clientInB = await makeClient({ portId: portB.id });
|
||||
const yachtInB = await makeYacht({
|
||||
portId: portB.id,
|
||||
ownerType: 'client',
|
||||
ownerId: clientInB.id,
|
||||
});
|
||||
|
||||
await expect(
|
||||
createPending(
|
||||
portA.id,
|
||||
{
|
||||
berthId: berthInA.id,
|
||||
clientId: clientInA.id,
|
||||
yachtId: yachtInB.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: portA.id }),
|
||||
),
|
||||
).rejects.toThrow(/yacht not found/i);
|
||||
});
|
||||
});
|
||||
|
||||
// ─── Lifecycle transitions ───────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service — lifecycle transitions', () => {
|
||||
async function setup() {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'client',
|
||||
ownerId: client.id,
|
||||
});
|
||||
const reservation = await createPending(
|
||||
port.id,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
return { port, berth, client, yacht, reservation };
|
||||
}
|
||||
|
||||
it('pending → active (activate)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
const activated = await activate(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{},
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
expect(activated.status).toBe('active');
|
||||
});
|
||||
|
||||
it('active → ended (endReservation)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
const ended = await endReservation(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
expect(ended.status).toBe('ended');
|
||||
expect(ended.endDate).not.toBeNull();
|
||||
});
|
||||
|
||||
it('pending → cancelled (cancel)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
const cancelled = await cancel(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ reason: 'client withdrew' },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
expect(cancelled.status).toBe('cancelled');
|
||||
});
|
||||
|
||||
it('active → cancelled (cancel)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
const cancelled = await cancel(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ reason: 'contract terminated' },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
expect(cancelled.status).toBe('cancelled');
|
||||
});
|
||||
|
||||
it('rejects ended → active (invalid transition)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
await endReservation(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
await expect(
|
||||
activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
||||
).rejects.toThrow(/invalid transition/i);
|
||||
});
|
||||
|
||||
it('rejects cancelled → active (invalid transition)', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await cancel(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ reason: 'changed mind' },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
await expect(
|
||||
activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
||||
).rejects.toThrow(/invalid transition/i);
|
||||
});
|
||||
|
||||
it('rejects cancel from ended state', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await activate(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
await endReservation(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
await expect(
|
||||
cancel(reservation.id, port.id, {}, makeAuditMeta({ portId: port.id })),
|
||||
).rejects.toThrow(/invalid transition/i);
|
||||
});
|
||||
|
||||
it('rejects endReservation on a pending reservation', async () => {
|
||||
const { port, reservation } = await setup();
|
||||
await expect(
|
||||
endReservation(
|
||||
reservation.id,
|
||||
port.id,
|
||||
{ endDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
),
|
||||
).rejects.toThrow(/invalid transition/i);
|
||||
});
|
||||
});
|
||||
|
||||
// ─── listReservations ────────────────────────────────────────────────────────
|
||||
|
||||
describe('berth-reservations.service — listReservations', () => {
|
||||
async function makeReservation(portId: string, opts?: { berthId?: string }) {
|
||||
const berth = opts?.berthId ? { id: opts.berthId } : await makeBerth({ portId });
|
||||
const client = await makeClient({ portId });
|
||||
const yacht = await makeYacht({ portId, ownerType: 'client', ownerId: client.id });
|
||||
return createPending(
|
||||
portId,
|
||||
{
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
startDate: new Date(),
|
||||
tenureType: 'permanent',
|
||||
},
|
||||
makeAuditMeta({ portId }),
|
||||
);
|
||||
}
|
||||
|
||||
it('is tenant-scoped', async () => {
|
||||
const portA = await makePort();
|
||||
const portB = await makePort();
|
||||
const resA = await makeReservation(portA.id);
|
||||
await makeReservation(portB.id);
|
||||
|
||||
const result = await listReservations(portA.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
includeArchived: false,
|
||||
});
|
||||
const ids = result.data.map((r) => r.id);
|
||||
expect(ids).toContain(resA.id);
|
||||
expect(result.data.every((r) => r.portId === portA.id)).toBe(true);
|
||||
});
|
||||
|
||||
it('filters by status', async () => {
|
||||
const port = await makePort();
|
||||
const resPending = await makeReservation(port.id);
|
||||
const resActive = await makeReservation(port.id);
|
||||
await activate(resActive.id, port.id, {}, makeAuditMeta({ portId: port.id }));
|
||||
|
||||
const activeList = await listReservations(port.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
includeArchived: false,
|
||||
status: 'active',
|
||||
});
|
||||
expect(activeList.data.map((r) => r.id)).toContain(resActive.id);
|
||||
expect(activeList.data.map((r) => r.id)).not.toContain(resPending.id);
|
||||
});
|
||||
|
||||
it('filters by berthId', async () => {
|
||||
const port = await makePort();
|
||||
const berth1 = await makeBerth({ portId: port.id });
|
||||
const berth2 = await makeBerth({ portId: port.id });
|
||||
|
||||
const client1 = await makeClient({ portId: port.id });
|
||||
const yacht1 = await makeYacht({ portId: port.id, ownerType: 'client', ownerId: client1.id });
|
||||
const res1 = await createPending(
|
||||
port.id,
|
||||
{ berthId: berth1.id, clientId: client1.id, yachtId: yacht1.id, startDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
|
||||
const client2 = await makeClient({ portId: port.id });
|
||||
const yacht2 = await makeYacht({ portId: port.id, ownerType: 'client', ownerId: client2.id });
|
||||
const res2 = await createPending(
|
||||
port.id,
|
||||
{ berthId: berth2.id, clientId: client2.id, yachtId: yacht2.id, startDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
|
||||
const result = await listReservations(port.id, {
|
||||
page: 1,
|
||||
limit: 50,
|
||||
order: 'desc',
|
||||
includeArchived: false,
|
||||
berthId: berth1.id,
|
||||
});
|
||||
const ids = result.data.map((r) => r.id);
|
||||
expect(ids).toContain(res1.id);
|
||||
expect(ids).not.toContain(res2.id);
|
||||
});
|
||||
});
|
||||
|
||||
// ─── Self-check: DB state is as expected after cancel ────────────────────────
|
||||
|
||||
describe('berth-reservations.service — DB state', () => {
|
||||
it('cancel persists status=cancelled in the database', async () => {
|
||||
const port = await makePort();
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({ portId: port.id, ownerType: 'client', ownerId: client.id });
|
||||
const res = await createPending(
|
||||
port.id,
|
||||
{ berthId: berth.id, clientId: client.id, yachtId: yacht.id, startDate: new Date() },
|
||||
makeAuditMeta({ portId: port.id }),
|
||||
);
|
||||
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));
|
||||
expect(row!.status).toBe('cancelled');
|
||||
});
|
||||
});
|
||||
@@ -8,6 +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';
|
||||
|
||||
// ─── Client schemas ───────────────────────────────────────────────────────────
|
||||
|
||||
@@ -483,3 +484,49 @@ describe('addMembershipSchema', () => {
|
||||
expect(result.success).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// ─── Reservation schemas ─────────────────────────────────────────────────────
|
||||
|
||||
describe('createPendingSchema', () => {
|
||||
const validInput = {
|
||||
berthId: 'berth-1',
|
||||
clientId: 'client-1',
|
||||
yachtId: 'yacht-1',
|
||||
startDate: '2026-05-01',
|
||||
};
|
||||
|
||||
it('rejects missing berthId', () => {
|
||||
const result = createPendingSchema.safeParse({
|
||||
clientId: validInput.clientId,
|
||||
yachtId: validInput.yachtId,
|
||||
startDate: validInput.startDate,
|
||||
});
|
||||
expect(result.success).toBe(false);
|
||||
});
|
||||
|
||||
it('rejects missing clientId', () => {
|
||||
const result = createPendingSchema.safeParse({
|
||||
berthId: validInput.berthId,
|
||||
yachtId: validInput.yachtId,
|
||||
startDate: validInput.startDate,
|
||||
});
|
||||
expect(result.success).toBe(false);
|
||||
});
|
||||
|
||||
it('rejects missing yachtId', () => {
|
||||
const result = createPendingSchema.safeParse({
|
||||
berthId: validInput.berthId,
|
||||
clientId: validInput.clientId,
|
||||
startDate: validInput.startDate,
|
||||
});
|
||||
expect(result.success).toBe(false);
|
||||
});
|
||||
|
||||
it('accepts minimal valid input with default tenureType', () => {
|
||||
const result = createPendingSchema.safeParse(validInput);
|
||||
expect(result.success).toBe(true);
|
||||
if (result.success) {
|
||||
expect(result.data.tenureType).toBe('permanent');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user