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/nest/days.controller.test.ts
+69 -5
View File
@@ -3,7 +3,8 @@ import { HttpException } from '@nestjs/common';
import { DaysController } from '../../../src/nest/days/days.controller';
import { DayNotesController } from '../../../src/nest/day-notes/day-notes.controller';
import { DayNoteCreateDto, DayNoteUpdateDto } from '../../../src/nest/day-notes/day-notes.dto';
import { DayReorderError } from '../../../src/nest/days/days.service';
import { DayReorderError, DayAppendError, NO_DATES_MESSAGE, type DatedDayAppend } from '../../../src/nest/days/days.service';
import { DayCreateDto } from '../../../src/nest/days/days.dto';
import { DayDeleteError, type DayRemoval, type DayRemovalService } from '../../../src/nest/days/day-removal.service';
import type { DayReorderDto } from '../../../src/nest/days/days.dto';
import type { DaysService } from '../../../src/nest/days/days.service';
@@ -59,13 +60,76 @@ describe('DaysController (parity with the legacy /api/trips/:tripId/days route)'
});
it('POST / with a position inserts + broadcasts day:reordered', () => {
it('POST / with a position inserts, broadcasts day:reordered, then the grown trip', () => {
const insert = vi.fn().mockReturnValue({ id: 12 }); const create = vi.fn(); const broadcast = vi.fn();
const svc = daysSvc({ insert, create, broadcast } as Partial<DaysService>);
expect(new DaysController(svc, removalSvc()).create(user, '5', { position: 0 }, 'sock')).toEqual({ day: { id: 12 } });
const getTripForViewer = vi.fn().mockReturnValue({ id: 5, end_date: '2026-07-04' });
const svc = daysSvc({ insert, create, broadcast, getTripForViewer } as Partial<DaysService>);
expect(new DaysController(svc, removalSvc()).create(user, '5', { position: 0 }, 'sock'))
.toEqual({ day: { id: 12 }, trip: { id: 5, end_date: '2026-07-04' } });
expect(insert).toHaveBeenCalledWith('5', 0);
expect(create).not.toHaveBeenCalled();
expect(broadcast).toHaveBeenCalledWith('5', 'day:reordered', { day: { id: 12 } }, 'sock');
expect(getTripForViewer).toHaveBeenCalledWith('5', 1);
expect(broadcast.mock.calls).toEqual([
['5', 'day:reordered', { day: { id: 12 } }, 'sock'],
['5', 'trip:updated', { trip: { id: 5, end_date: '2026-07-04' } }, 'sock'],
]);
// A trip that is gone by the time it is re-read is not announced.
broadcast.mockClear();
getTripForViewer.mockReturnValue(undefined);
new DaysController(svc, removalSvc()).create(user, '5', { position: 1 }, 'sock');
expect(broadcast.mock.calls.map(call => call[1])).toEqual(['day:reordered']);
});
describe('POST / dated', () => {
const appended: DatedDayAppend = {
day: { id: 14, trip_id: 5, day_number: 4, date: '2026-07-04', assignments: [], notes_items: [] } as DatedDayAppend['day'],
endDate: '2026-07-04', boundaries: null, trip: { id: 5, end_date: '2026-07-04' },
};
it('appends as the caller, announces with and without the socket, and answers with the day and the trip', () => {
const appendDated = vi.fn().mockReturnValue(appended);
const announceDatedAppend = vi.fn();
const broadcast = vi.fn(); const insert = vi.fn(); const create = vi.fn();
const svc = daysSvc({ appendDated, announceDatedAppend, broadcast, insert, create } as Partial<DaysService>);
expect(new DaysController(svc, removalSvc()).create(user, '5', { dated: true, notes: 'Late checkout' }, 'sock'))
.toEqual({ day: appended.day, trip: appended.trip });
expect(appendDated).toHaveBeenCalledWith('5', 1, 'Late checkout');
expect(insert).not.toHaveBeenCalled();
expect(create).not.toHaveBeenCalled();
const [sent, senders] = announceDatedAppend.mock.calls[0];
expect(sent).toBe(appended);
senders.all('roadtripBoundary:changed', { boundaries: [] });
senders.others('day:reordered', { day: appended.day });
expect(broadcast.mock.calls).toEqual([
['5', 'roadtripBoundary:changed', { boundaries: [] }, undefined],
['5', 'day:reordered', { day: appended.day }, 'sock'],
]);
});
it('400 with the service sentence for a trip without dates, and nothing is announced', () => {
const announceDatedAppend = vi.fn();
const svc = daysSvc({
appendDated: vi.fn(() => { throw new DayAppendError(NO_DATES_MESSAGE); }), announceDatedAppend,
} as Partial<DaysService>);
expect(thrown(() => new DaysController(svc, removalSvc()).create(user, '5', { dated: true }, 'sock')))
.toEqual({ status: 400, body: { error: NO_DATES_MESSAGE } });
expect(announceDatedAppend).not.toHaveBeenCalled();
});
it('rethrows anything else unchanged', () => {
const boom = new Error('db is down');
const svc = daysSvc({ appendDated: vi.fn(() => { throw boom; }) } as Partial<DaysService>);
expect(() => new DaysController(svc, removalSvc()).create(user, '5', { dated: true })).toThrow(boom);
});
it('the DTO refuses dated next to a position or a date before the handler runs', () => {
expect(DayCreateDto.schema.safeParse({ dated: true, position: 2 }).success).toBe(false);
expect(DayCreateDto.schema.safeParse({ dated: true, date: '2026-07-04' }).success).toBe(false);
expect(DayCreateDto.schema.safeParse({ dated: true }).success).toBe(true);
});
});
describe('PUT /reorder', () => {