k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-10-18 21:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(dayplan): a day can be added with the next date, which extends the trip by one

Browse Source 
On a trip with dates the reorder dialog and the days sheet on a phone now offer two ways to add a day: a day without a date at the end as before, or the calendar day after the last date, named on its button, which extends the trip by one day. The new day goes right behind the last dated day, so the days without a date move one place back with their plans, and no existing day or booking changes its date.

The server does it in one transaction behind a new dated flag on the day create contract, used by REST, the create_day tool and the plugin RPC alike. It moves the road trip boundaries of the days behind the new one, and announces the day with day:reordered and the grown trip with trip:updated; an insert at a position announces its trip now as well. The next date and the day limit come from one shared rule, so the button never promises a date the server would not give.

On the client the add is online only and runs one at a time, so a double click cannot grow the trip by two days. A wiring test that picked the stay question by its position now finds it by its handler, since the delete question sits in front of it.
This commit is contained in:
Maurice
2026-09-23 19:16:04 +02:00
parent 2f6f921aef
commit b56f335978
64 changed files with 1745 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/tests/unit/mcp/tools-days.test.ts
+110 -1
View File
@@ -1,6 +1,6 @@
/**
* Unit tests for the DI-discovered DaysMcp: the update_day and reorder_days
* tools, create_day's mid-trip insert, and the trek://trips/{tripId}/days
* tools, create_day's mid-trip insert and dated append, and the trek://trips/{tripId}/days
* resource (moved from resources.test.ts when the legacy registrar was ported).
* create_day's plain append is covered in tools-days-accommodations.test.ts.
*/
@@ -42,6 +42,7 @@ import {
createUser, createTrip, createDay, createPlace, createDayAssignment, createDayAccommodation,
} from '../../helpers/factories';
import { createMcpHarness, parseToolResult, parseResourceResult, type McpHarness } from '../../helpers/mcp-harness';
import { DaysService } from '../../../src/nest/days/days.service';
beforeAll(() => {
createTables(testDb);
@@ -376,6 +377,114 @@ describe('Tool: create_day (position)', () => {
});
});
// ---------------------------------------------------------------------------
// create_day (dated)
// ---------------------------------------------------------------------------
describe('Tool: create_day (dated)', () => {
const endDate = (tripId: number) =>
(testDb.prepare('SELECT end_date FROM trips WHERE id = ?').get(tripId) as { end_date: string | null }).end_date;
it('appends the next date behind the dated days, extends the trip and answers with both', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id, { start_date: '2025-06-01', end_date: '2025-06-02' });
const [d1, d2] = dayIdsInOrder(trip.id);
const spare = createDay(testDb, trip.id);
let data = {} as { day: { id: number; date: string; notes: string | null }; trip: { end_date: string; day_count: number } };
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'create_day',
arguments: { tripId: trip.id, dated: true, notes: 'Late checkout' },
});
data = parseToolResult(result) as typeof data;
});
expect(data.day).toMatchObject({ date: '2025-06-03', notes: 'Late checkout' });
expect(data.trip).toMatchObject({ end_date: '2025-06-03', day_count: 4 });
expect(dayIdsInOrder(trip.id)).toEqual([d1, d2, data.day.id, spare.id]);
expect(dayDatesInOrder(trip.id)).toEqual(['2025-06-01', '2025-06-02', '2025-06-03', null]);
expect(endDate(trip.id)).toBe('2025-06-03');
// The insert shape of day:reordered, so collaborators refetch, then the trip.
expect(broadcastMock).toHaveBeenCalledWith(trip.id, 'day:reordered', expect.objectContaining({ day: expect.objectContaining({ id: data.day.id }) }));
expect(broadcastMock).toHaveBeenCalledWith(trip.id, 'trip:updated', expect.objectContaining({ trip: expect.objectContaining({ end_date: '2025-06-03' }) }));
expect(broadcastMock).not.toHaveBeenCalledWith(trip.id, 'day:created', expect.any(Object));
});
it('refuses dated next to a position or a date, the way the REST contract does', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id, { start_date: '2025-06-01', end_date: '2025-06-02' });
await withHarness(user.id, async (h) => {
for (const extra of [{ position: 1 }, { date: '2025-07-01' }]) {
const result = await h.client.callTool({ name: 'create_day', arguments: { tripId: trip.id, dated: true, ...extra } });
expect(result.isError).toBe(true);
expect((result.content as { text: string }[])[0].text).toContain('dated cannot be combined with date or position');
}
});
expect(dayIdsInOrder(trip.id)).toHaveLength(2);
expect(endDate(trip.id)).toBe('2025-06-02');
expect(broadcastMock).not.toHaveBeenCalled();
});
it('refuses a trip without dates and writes nothing', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
createDay(testDb, trip.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'create_day', arguments: { tripId: trip.id, dated: true } });
expect(result.isError).toBe(true);
expect((result.content as { text: string }[])[0].text).toContain('This trip has no dates');
});
expect(dayDatesInOrder(trip.id)).toEqual([null]);
expect(broadcastMock).not.toHaveBeenCalled();
});
it('lets an unexpected failure surface as one, not as a refusal of the trip', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id, { start_date: '2025-06-01', end_date: '2025-06-02' });
const boom = vi.spyOn(DaysService.prototype, 'appendDated').mockImplementation(() => { throw new Error('disk full'); });
try {
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'create_day', arguments: { tripId: trip.id, dated: true } });
expect(result.isError).toBe(true);
expect(JSON.stringify(result.content)).not.toContain('This trip has no dates');
});
} finally {
boom.mockRestore();
}
expect(broadcastMock).not.toHaveBeenCalled();
});
it('blocks a demo user', async () => {
process.env.DEMO_MODE = 'true';
const { user } = createUser(testDb, { email: 'demo@nomad.app' });
const trip = createTrip(testDb, user.id, { start_date: '2025-06-01', end_date: '2025-06-02' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'create_day', arguments: { tripId: trip.id, dated: true } });
expect(result.isError).toBe(true);
});
expect(dayIdsInOrder(trip.id)).toHaveLength(2);
expect(endDate(trip.id)).toBe('2025-06-02');
});
it('an insert at a position announces the grown trip as well', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id, { start_date: '2025-06-01', end_date: '2025-06-02' });
await withHarness(user.id, async (h) => {
await h.client.callTool({ name: 'create_day', arguments: { tripId: trip.id, position: 1 } });
});
expect(broadcastMock).toHaveBeenCalledWith(trip.id, 'trip:updated', expect.objectContaining({ trip: expect.objectContaining({ end_date: '2025-06-03', day_count: 3 }) }));
});
});
// ---------------------------------------------------------------------------
// reorder_days
// ---------------------------------------------------------------------------