mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-23 15:36:33 +00:00
Maurice
8fa75b3c4e
A multi-day tour in the planner's list of the trip's tours now unfolds into its stages (MDT-02), so the stages can be seen together and fitted into the trip without leaving the one route they are cut from. - The fold beside a multi-day tour lists its stages in route order, each from stop to stop with its distance, climb, descent and moving time, read off the saved tour the way the planner reads them, and below them what the whole tour adds up to. A value no stage tells is left out, a total some stages do not tell is marked as at least that much and says for how many, and a stage whose route is not planned yet says so. - Each stage has its own day: a pill opens the trip's days, moves the stage to another one or takes it off again. A stage without a day shows a dashed "No day" pill. A day holds a tour, or one of its stages, once, and a stage is on one day at most; the plan's own offline path writes it. - A stage opens in the planner: the tour opens as any tour does and the stage is shown once its points are in. - The day plan names the stage a day holds with its own figures, and the day's route runs to that stage's start and on from its end; the trip map draws that stretch only. The tour list still counts a tour once, however many days hold it or its stages. - A saved change that takes a stage away (its stage end gone, the tour a day tour again, back to the recorded track) takes it off its day in the same write and tells every client; the planner says so before the save. - REST and the assign_place_to_day tool take the stage by the key of the stop it starts at, with the same checks; list_tours names the stops between the stages and the stage each day holds. A day assignment remembers its stage by that key (migration 046010); every assignment made before holds the whole tour, as it did.
653 lines
28 KiB
TypeScript
653 lines
28 KiB
TypeScript
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
import { http, HttpResponse } from 'msw';
|
|
import { useTripStore } from '../../../src/store/tripStore';
|
|
import { resetAllStores, seedStore } from '../../helpers/store';
|
|
import { buildPlace, buildAssignment } from '../../helpers/factories';
|
|
import { server } from '../../helpers/msw/server';
|
|
import { clearAll, offlineDb } from '../../../src/db/offlineDb';
|
|
|
|
vi.mock('../../../src/api/websocket', () => ({
|
|
connect: vi.fn(),
|
|
disconnect: vi.fn(),
|
|
getSocketId: vi.fn(() => null),
|
|
joinTrip: vi.fn(),
|
|
leaveTrip: vi.fn(),
|
|
addListener: vi.fn(),
|
|
removeListener: vi.fn(),
|
|
setRefetchCallback: vi.fn(),
|
|
setPreReconnectHook: vi.fn(),
|
|
}));
|
|
|
|
beforeEach(() => {
|
|
resetAllStores();
|
|
});
|
|
|
|
describe('assignmentsSlice', () => {
|
|
describe('assignPlaceToDay', () => {
|
|
it('FE-ASSIGN-001: assignPlaceToDay adds optimistic temp ID (negative) immediately', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, {
|
|
places: [place],
|
|
assignments: { '1': [] },
|
|
});
|
|
|
|
// Don't await — check state mid-flight
|
|
let tempAdded = false;
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', async () => {
|
|
const state = useTripStore.getState();
|
|
const dayAssignments = state.assignments['1'];
|
|
if (dayAssignments.some(a => a.id < 0)) {
|
|
tempAdded = true;
|
|
}
|
|
const result = buildAssignment({ day_id: 1, place_id: 10, place });
|
|
return HttpResponse.json({ assignment: result });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10);
|
|
expect(tempAdded).toBe(true);
|
|
});
|
|
|
|
it('FE-ASSIGN-002: after API success, temp ID is replaced with real assignment', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, {
|
|
places: [place],
|
|
assignments: { '1': [] },
|
|
});
|
|
|
|
const realAssignment = buildAssignment({ id: 999, day_id: 1, place_id: 10, place });
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: realAssignment })
|
|
),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10);
|
|
|
|
const dayAssignments = useTripStore.getState().assignments['1'];
|
|
expect(dayAssignments).toHaveLength(1);
|
|
expect(dayAssignments[0].id).toBe(999);
|
|
expect(dayAssignments.every(a => a.id > 0)).toBe(true);
|
|
});
|
|
|
|
it('FE-ASSIGN-033: a stage of a multi-day tour goes on the day with its key, at once and in the request (MDT-02)', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [] } });
|
|
let sent: unknown = null;
|
|
let optimistic: unknown = null;
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', async ({ request }) => {
|
|
sent = await request.json();
|
|
optimistic = useTripStore.getState().assignments['1'][0]?.tour_stage_key;
|
|
return HttpResponse.json({
|
|
assignment: buildAssignment({ id: 998, day_id: 1, place_id: 10, place, tour_stage_key: 'stop-hut' }),
|
|
});
|
|
})
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10, null, 'stop-hut');
|
|
|
|
expect(sent).toEqual({ place_id: 10, tour_stage_key: 'stop-hut' });
|
|
expect(optimistic).toBe('stop-hut');
|
|
expect(useTripStore.getState().assignments['1'][0]).toMatchObject({ id: 998, tour_stage_key: 'stop-hut' });
|
|
});
|
|
|
|
it('FE-ASSIGN-003: on API failure, temp assignment is removed (rollback)', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, {
|
|
places: [place],
|
|
assignments: { '1': [] },
|
|
});
|
|
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ message: 'Error' }, { status: 500 })
|
|
),
|
|
);
|
|
|
|
await expect(useTripStore.getState().assignPlaceToDay(1, 1, 10)).rejects.toThrow();
|
|
|
|
const dayAssignments = useTripStore.getState().assignments['1'];
|
|
expect(dayAssignments).toHaveLength(0);
|
|
});
|
|
|
|
it('FE-ASSIGN-001b: returns undefined if place not found in store', async () => {
|
|
seedStore(useTripStore, {
|
|
places: [], // no places seeded
|
|
assignments: { '1': [] },
|
|
});
|
|
|
|
const result = await useTripStore.getState().assignPlaceToDay(1, 1, 999);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
it('FE-ASSIGN-008: a day with no assignments entry yet is seeded from scratch', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { places: [place], assignments: {} });
|
|
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: buildAssignment({ id: 999, day_id: 1, place_id: 10, place }) })
|
|
),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10);
|
|
expect(useTripStore.getState().assignments['1'].map(a => a.id)).toEqual([999]);
|
|
});
|
|
|
|
it('FE-ASSIGN-009: a response without a nested place falls back to the store place', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1, name: 'Louvre' });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [] } });
|
|
|
|
const bare = { ...buildAssignment({ id: 999, day_id: 1, place_id: 10 }), place: undefined };
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () => HttpResponse.json({ assignment: bare })),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10);
|
|
expect(useTripStore.getState().assignments['1'][0].place?.name).toBe('Louvre');
|
|
});
|
|
|
|
it('FE-ASSIGN-010: inserting at a position keeps the other rows and reorders server-side', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
const existing = buildAssignment({ id: 1, day_id: 1, order_index: 0 });
|
|
const other = buildAssignment({ id: 2, day_id: 1, order_index: 1 });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [existing, other] } });
|
|
|
|
let reorderBody: number[] | undefined;
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: buildAssignment({ id: 999, day_id: 1, place_id: 10, place, order_index: 7 }) })
|
|
),
|
|
http.put('/api/trips/1/days/1/assignments/reorder', async ({ request }) => {
|
|
const body = await request.json() as { orderedIds: number[] };
|
|
reorderBody = body.orderedIds;
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10, 1);
|
|
|
|
const items = useTripStore.getState().assignments['1'];
|
|
expect(items.map(a => a.id)).toEqual([1, 999, 2]);
|
|
expect(items.map(a => a.order_index)).toEqual([0, 1, 2]);
|
|
expect(reorderBody).toEqual([1, 999, 2]);
|
|
});
|
|
|
|
it('FE-ASSIGN-011: a failing follow-up reorder keeps the optimistic order', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, {
|
|
places: [place],
|
|
assignments: { '1': [buildAssignment({ id: 1, day_id: 1, order_index: 0 })] },
|
|
});
|
|
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: buildAssignment({ id: 999, day_id: 1, place_id: 10, place }) })
|
|
),
|
|
http.put('/api/trips/1/days/1/assignments/reorder', () =>
|
|
HttpResponse.json({ message: 'Error' }, { status: 500 })
|
|
),
|
|
);
|
|
|
|
// The reorder failure is swallowed — the create itself already succeeded.
|
|
await expect(useTripStore.getState().assignPlaceToDay(1, 1, 10, 0)).resolves.toBeDefined();
|
|
expect(useTripStore.getState().assignments['1'].map(a => a.id)).toEqual([999, 1]);
|
|
});
|
|
|
|
it('FE-ASSIGN-023: the position counts in the day as sorted, not as the store happens to hold it', async () => {
|
|
// A row that came in over the socket sits at the end of the stored list whatever
|
|
// its order_index says, so the day the planner shows and the list the splice
|
|
// ran on disagreed and the new row landed behind the wrong neighbour.
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
const later = buildAssignment({ id: 2, day_id: 1, order_index: 1 });
|
|
const first = buildAssignment({ id: 1, day_id: 1, order_index: 0 });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [later, first] } });
|
|
|
|
let reorderBody: number[] | undefined;
|
|
server.use(
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: buildAssignment({ id: 999, day_id: 1, place_id: 10, place, order_index: 7 }) })
|
|
),
|
|
http.put('/api/trips/1/days/1/assignments/reorder', async ({ request }) => {
|
|
const body = await request.json() as { orderedIds: number[] };
|
|
reorderBody = body.orderedIds;
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10, 1);
|
|
|
|
const items = useTripStore.getState().assignments['1'];
|
|
expect(items.map(a => a.id)).toEqual([1, 999, 2]);
|
|
expect(items.map(a => a.order_index)).toEqual([0, 1, 2]);
|
|
expect(reorderBody).toEqual([1, 999, 2]);
|
|
});
|
|
|
|
it('FE-ASSIGN-012: no reorder call when the day holds no server-side ids', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [] } });
|
|
|
|
let reorderCalls = 0;
|
|
server.use(
|
|
// An unsynced (still negative) id echoed back by the offline replay path.
|
|
http.post('/api/trips/1/days/1/assignments', () =>
|
|
HttpResponse.json({ assignment: buildAssignment({ id: -42, day_id: 1, place_id: 10, place }) })
|
|
),
|
|
http.put('/api/trips/1/days/1/assignments/reorder', () => {
|
|
reorderCalls += 1;
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().assignPlaceToDay(1, 1, 10, 0);
|
|
expect(reorderCalls).toBe(0);
|
|
expect(useTripStore.getState().assignments['1'].map(a => a.id)).toEqual([-42]);
|
|
});
|
|
});
|
|
|
|
describe('removeAssignment', () => {
|
|
it('FE-ASSIGN-004: removeAssignment is optimistically removed, re-added on failure', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
const assignment = buildAssignment({ id: 100, day_id: 1, place });
|
|
seedStore(useTripStore, {
|
|
assignments: { '1': [assignment] },
|
|
});
|
|
|
|
server.use(
|
|
http.delete('/api/trips/1/days/1/assignments/100', () =>
|
|
HttpResponse.json({ message: 'Error' }, { status: 500 })
|
|
),
|
|
);
|
|
|
|
await expect(useTripStore.getState().removeAssignment(1, 1, 100)).rejects.toThrow();
|
|
|
|
// Should be rolled back
|
|
const dayAssignments = useTripStore.getState().assignments['1'];
|
|
expect(dayAssignments).toHaveLength(1);
|
|
expect(dayAssignments[0].id).toBe(100);
|
|
});
|
|
|
|
it('FE-ASSIGN-004b: removeAssignment success removes from store', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1, tour_place_id: 10, route_geometry: '[[1,2],[3,4]]' });
|
|
const assignment = buildAssignment({ id: 100, day_id: 1, place });
|
|
const otherDayAssignment = buildAssignment({ id: 101, day_id: 2, place });
|
|
seedStore(useTripStore, {
|
|
places: [place],
|
|
assignments: { '1': [assignment], '2': [otherDayAssignment] },
|
|
});
|
|
|
|
await useTripStore.getState().removeAssignment(1, 1, 100);
|
|
|
|
expect(useTripStore.getState().assignments['1']).toHaveLength(0);
|
|
expect(useTripStore.getState().places).toContainEqual(expect.objectContaining({ id: place.id, route_geometry: place.route_geometry }));
|
|
expect(useTripStore.getState().assignments['2']).toEqual([otherDayAssignment]);
|
|
});
|
|
});
|
|
|
|
describe('reorderAssignments', () => {
|
|
it('FE-ASSIGN-005: reorderAssignments updates order_index of assignments', async () => {
|
|
const place1 = buildPlace({ id: 10 });
|
|
const place2 = buildPlace({ id: 20 });
|
|
const a1 = buildAssignment({ id: 1, day_id: 5, order_index: 0, place: place1 });
|
|
const a2 = buildAssignment({ id: 2, day_id: 5, order_index: 1, place: place2 });
|
|
seedStore(useTripStore, {
|
|
assignments: { '5': [a1, a2] },
|
|
});
|
|
|
|
await useTripStore.getState().reorderAssignments(1, 5, [2, 1]);
|
|
|
|
const dayAssignments = useTripStore.getState().assignments['5'];
|
|
const reorderedA2 = dayAssignments.find(a => a.id === 2);
|
|
const reorderedA1 = dayAssignments.find(a => a.id === 1);
|
|
expect(reorderedA2?.order_index).toBe(0);
|
|
expect(reorderedA1?.order_index).toBe(1);
|
|
});
|
|
|
|
it('FE-ASSIGN-005b: reorderAssignments rolls back on failure', async () => {
|
|
const place1 = buildPlace({ id: 10 });
|
|
const place2 = buildPlace({ id: 20 });
|
|
const a1 = buildAssignment({ id: 1, day_id: 5, order_index: 0, place: place1 });
|
|
const a2 = buildAssignment({ id: 2, day_id: 5, order_index: 1, place: place2 });
|
|
seedStore(useTripStore, {
|
|
assignments: { '5': [a1, a2] },
|
|
});
|
|
|
|
server.use(
|
|
http.put('/api/trips/1/days/5/assignments/reorder', () =>
|
|
HttpResponse.json({ message: 'Error' }, { status: 500 })
|
|
),
|
|
);
|
|
|
|
await expect(useTripStore.getState().reorderAssignments(1, 5, [2, 1])).rejects.toThrow();
|
|
|
|
const dayAssignments = useTripStore.getState().assignments['5'];
|
|
expect(dayAssignments.find(a => a.id === 1)?.order_index).toBe(0);
|
|
expect(dayAssignments.find(a => a.id === 2)?.order_index).toBe(1);
|
|
});
|
|
|
|
it('FE-ASSIGN-013: ids that are no longer on the day are dropped from the new order', async () => {
|
|
const a1 = buildAssignment({ id: 1, day_id: 5, order_index: 0 });
|
|
seedStore(useTripStore, { assignments: { '5': [a1] } });
|
|
|
|
await useTripStore.getState().reorderAssignments(1, 5, [999, 1]);
|
|
|
|
const dayAssignments = useTripStore.getState().assignments['5'];
|
|
expect(dayAssignments.map(a => a.id)).toEqual([1]);
|
|
expect(dayAssignments[0].order_index).toBe(1);
|
|
});
|
|
|
|
it('FE-ASSIGN-014: reordering a day with no assignments entry yields an empty list', async () => {
|
|
seedStore(useTripStore, { assignments: {} });
|
|
|
|
await useTripStore.getState().reorderAssignments(1, 5, [1, 2]);
|
|
|
|
expect(useTripStore.getState().assignments['5']).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('moveAssignment', () => {
|
|
it('FE-ASSIGN-006: moveAssignment removes from source day and adds to target day', async () => {
|
|
const place = buildPlace({ id: 10 });
|
|
const assignment = buildAssignment({ id: 50, day_id: 1, order_index: 0, place });
|
|
seedStore(useTripStore, {
|
|
assignments: {
|
|
'1': [assignment],
|
|
'2': [],
|
|
},
|
|
});
|
|
|
|
await useTripStore.getState().moveAssignment(1, 50, 1, 2);
|
|
|
|
expect(useTripStore.getState().assignments['1']).toHaveLength(0);
|
|
expect(useTripStore.getState().assignments['2']).toHaveLength(1);
|
|
expect(useTripStore.getState().assignments['2'][0].id).toBe(50);
|
|
});
|
|
|
|
it('FE-ASSIGN-007: moveAssignment rolls back on failure', async () => {
|
|
const place = buildPlace({ id: 10 });
|
|
const assignment = buildAssignment({ id: 50, day_id: 1, order_index: 0, place });
|
|
seedStore(useTripStore, {
|
|
assignments: {
|
|
'1': [assignment],
|
|
'2': [],
|
|
},
|
|
});
|
|
|
|
server.use(
|
|
http.put('/api/trips/1/assignments/50/move', () =>
|
|
HttpResponse.json({ message: 'Error' }, { status: 500 })
|
|
),
|
|
);
|
|
|
|
await expect(useTripStore.getState().moveAssignment(1, 50, 1, 2)).rejects.toThrow();
|
|
|
|
// Rolled back: assignment back in day 1
|
|
expect(useTripStore.getState().assignments['1']).toHaveLength(1);
|
|
expect(useTripStore.getState().assignments['1'][0].id).toBe(50);
|
|
expect(useTripStore.getState().assignments['2']).toHaveLength(0);
|
|
});
|
|
|
|
it('FE-ASSIGN-015: an unknown assignment id is a no-op', async () => {
|
|
seedStore(useTripStore, { assignments: { '1': [buildAssignment({ id: 50, day_id: 1 })] } });
|
|
|
|
await useTripStore.getState().moveAssignment(1, 999, 1, 2);
|
|
|
|
expect(useTripStore.getState().assignments['1']).toHaveLength(1);
|
|
expect(useTripStore.getState().assignments['2']).toBeUndefined();
|
|
});
|
|
|
|
it('FE-ASSIGN-016: a source day with no assignments entry is a no-op', async () => {
|
|
seedStore(useTripStore, { assignments: {} });
|
|
|
|
await useTripStore.getState().moveAssignment(1, 50, 1, 2);
|
|
|
|
expect(useTripStore.getState().assignments).toEqual({});
|
|
});
|
|
|
|
it('FE-ASSIGN-017: dropping at an explicit index renumbers the target day and pushes the new order', async () => {
|
|
const moved = buildAssignment({ id: 50, day_id: 1, order_index: 0 });
|
|
const t1 = buildAssignment({ id: 60, day_id: 2, order_index: 1 });
|
|
const t2 = buildAssignment({ id: 61, day_id: 2, order_index: 0 });
|
|
seedStore(useTripStore, { assignments: { '1': [moved], '2': [t1, t2] } });
|
|
|
|
let reorderBody: number[] | undefined;
|
|
server.use(
|
|
http.put('/api/trips/1/days/2/assignments/reorder', async ({ request }) => {
|
|
const body = await request.json() as { orderedIds: number[] };
|
|
reorderBody = body.orderedIds;
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().moveAssignment(1, 50, 1, 2, 1);
|
|
|
|
const target = useTripStore.getState().assignments['2'];
|
|
// Target day is sorted by order_index first (61, 60), then the drop lands at index 1.
|
|
expect(target.map(a => a.id)).toEqual([61, 50, 60]);
|
|
expect(target.map(a => a.order_index)).toEqual([0, 1, 2]);
|
|
expect(target[1].day_id).toBe(2);
|
|
expect(reorderBody).toEqual([61, 50, 60]);
|
|
});
|
|
|
|
it('FE-ASSIGN-018: moving onto a day with no assignments entry skips the reorder call', async () => {
|
|
const moved = buildAssignment({ id: 50, day_id: 1, order_index: 0 });
|
|
seedStore(useTripStore, { assignments: { '1': [moved] } });
|
|
|
|
let reorderCalls = 0;
|
|
server.use(
|
|
http.put('/api/trips/1/days/2/assignments/reorder', () => {
|
|
reorderCalls += 1;
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().moveAssignment(1, 50, 1, 2);
|
|
|
|
expect(useTripStore.getState().assignments['2'].map(a => a.id)).toEqual([50]);
|
|
expect(reorderCalls).toBe(0);
|
|
});
|
|
});
|
|
|
|
describe('setAssignmentNotes', () => {
|
|
const visit = () => buildAssignment({ id: 5, day_id: 1, place_id: 10, notes: 'old', assignment_time: '09:00' });
|
|
|
|
it('FE-ASSIGN-030: shows the note at once and keeps the one the server saved', async () => {
|
|
seedStore(useTripStore, { assignments: { '1': [visit()] } });
|
|
let seen: unknown;
|
|
server.use(
|
|
http.put('/api/trips/1/assignments/5/notes', async ({ request }) => {
|
|
seen = await request.json();
|
|
expect(useTripStore.getState().assignments['1'][0].notes).toBe('Bring cash');
|
|
return HttpResponse.json({ assignment: { ...visit(), notes: 'Bring cash' } });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().setAssignmentNotes(1, 1, 5, 'Bring cash');
|
|
|
|
expect(seen).toEqual({ notes: 'Bring cash' });
|
|
expect(useTripStore.getState().assignments['1'][0]).toMatchObject({ notes: 'Bring cash', assignment_time: '09:00' });
|
|
});
|
|
|
|
it('FE-ASSIGN-031: a refused write puts the old note back', async () => {
|
|
seedStore(useTripStore, { assignments: { '1': [visit()] } });
|
|
server.use(http.put('/api/trips/1/assignments/5/notes', () => HttpResponse.json({ error: 'no' }, { status: 403 })));
|
|
|
|
await expect(useTripStore.getState().setAssignmentNotes(1, 1, 5, null)).rejects.toBeTruthy();
|
|
|
|
expect(useTripStore.getState().assignments['1'][0].notes).toBe('old');
|
|
});
|
|
|
|
it('FE-ASSIGN-032: a visit it cannot find, or one not yet saved, is left alone', async () => {
|
|
const unsaved = { ...visit(), id: -3 };
|
|
seedStore(useTripStore, { assignments: { '1': [unsaved] } });
|
|
|
|
await useTripStore.getState().setAssignmentNotes(1, 1, 5, 'x');
|
|
await useTripStore.getState().setAssignmentNotes(1, 1, -3, 'x');
|
|
|
|
expect(useTripStore.getState().assignments['1'][0]).toEqual(unsaved);
|
|
});
|
|
});
|
|
|
|
describe('setAssignmentTimes', () => {
|
|
// The pool place still carries an End of its own, which the visit shows once its
|
|
// own override is gone, exactly as a fresh read of the day would.
|
|
const pool = () => buildPlace({ id: 10, trip_id: 1, place_time: null, end_time: '18:00' });
|
|
const visit = () => buildAssignment({
|
|
id: 5, day_id: 1, place_id: 10, assignment_time: '09:00', assignment_end_time: '14:00',
|
|
place: { ...pool(), place_time: '09:00', end_time: '14:00' },
|
|
});
|
|
|
|
it('FE-ASSIGN-020: clears the End at once, with the place End showing through, and keeps the Start', async () => {
|
|
seedStore(useTripStore, { places: [pool()], assignments: { '1': [visit()] } });
|
|
let seen: unknown;
|
|
server.use(
|
|
http.put('/api/trips/1/assignments/5/time', async ({ request }) => {
|
|
seen = await request.json();
|
|
const mid = useTripStore.getState().assignments['1'][0];
|
|
expect(mid).toMatchObject({ assignment_end_time: null, place: { end_time: '18:00', place_time: '09:00' } });
|
|
return HttpResponse.json({ assignment: { ...visit(), assignment_end_time: null, place: { ...pool(), place_time: '09:00' } } });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().setAssignmentTimes(1, 1, 5, { place_time: '09:00', end_time: null });
|
|
|
|
expect(seen).toEqual({ place_time: '09:00', end_time: null });
|
|
expect(useTripStore.getState().assignments['1'][0]).toMatchObject({
|
|
assignment_time: '09:00', assignment_end_time: null, place: { end_time: '18:00' },
|
|
});
|
|
});
|
|
|
|
it('FE-ASSIGN-021: a refused write puts the visit back as it was', async () => {
|
|
seedStore(useTripStore, { places: [pool()], assignments: { '1': [visit()] } });
|
|
server.use(http.put('/api/trips/1/assignments/5/time', () => HttpResponse.json({ error: 'no' }, { status: 403 })));
|
|
|
|
await expect(useTripStore.getState().setAssignmentTimes(1, 1, 5, { place_time: '09:00', end_time: null })).rejects.toBeTruthy();
|
|
|
|
expect(useTripStore.getState().assignments['1'][0]).toMatchObject({ assignment_end_time: '14:00', place: { end_time: '14:00' } });
|
|
});
|
|
|
|
it('FE-ASSIGN-022: a visit it cannot find, or one not yet saved, is left alone', async () => {
|
|
const unsaved = { ...visit(), id: -3 };
|
|
seedStore(useTripStore, { places: [pool()], assignments: { '1': [unsaved] } });
|
|
|
|
await useTripStore.getState().setAssignmentTimes(1, 1, 5, { place_time: null, end_time: null });
|
|
await useTripStore.getState().setAssignmentTimes(1, 1, -3, { place_time: null, end_time: null });
|
|
|
|
expect(useTripStore.getState().assignments['1'][0]).toEqual(unsaved);
|
|
});
|
|
});
|
|
|
|
describe('setAssignmentParticipants / setAssignmentLegMode', () => {
|
|
it('FE-ASSIGN-023: the travellers the server answers with, and a leg mode it took, land on the visit', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { assignments: { '2': [buildAssignment({ id: 5, day_id: 2, place_id: 10, place })] } });
|
|
let participantsBody: unknown;
|
|
const transportBodies: unknown[] = [];
|
|
server.use(
|
|
http.put('/api/trips/1/assignments/5/participants', async ({ request }) => {
|
|
participantsBody = await request.json();
|
|
return HttpResponse.json({ participants: [{ user_id: 4, username: 'Lena' }] });
|
|
}),
|
|
http.put('/api/trips/1/assignments/5/transport', async ({ request }) => {
|
|
transportBodies.push(await request.json());
|
|
return HttpResponse.json({ success: true });
|
|
}),
|
|
);
|
|
|
|
await useTripStore.getState().setAssignmentParticipants(1, 2, 5, [4]);
|
|
await useTripStore.getState().setAssignmentLegMode(1, 2, 5, 'driving');
|
|
await useTripStore.getState().setAssignmentLegMode(1, 2, 5, 'cycling', 'incoming');
|
|
|
|
expect(participantsBody).toEqual({ user_ids: [4] });
|
|
expect(transportBodies).toEqual([{ transport_mode: 'driving' }, { transport_mode: 'cycling', direction: 'incoming' }]);
|
|
const visit = useTripStore.getState().assignments['2'][0];
|
|
expect(visit.participants).toEqual([{ user_id: 4, username: 'Lena' }]);
|
|
expect(visit.leg_transport_mode).toBe('driving');
|
|
expect(visit.incoming_leg_transport_mode).toBe('cycling');
|
|
});
|
|
|
|
it('FE-ASSIGN-024: a refused write is thrown and leaves the visit as it was', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { assignments: { '2': [buildAssignment({ id: 5, day_id: 2, place_id: 10, place })] } });
|
|
server.use(
|
|
http.put('/api/trips/1/assignments/5/participants', () => HttpResponse.json({ error: 'nope' }, { status: 400 })),
|
|
);
|
|
|
|
await expect(useTripStore.getState().setAssignmentParticipants(1, 2, 5, [4])).rejects.toBeTruthy();
|
|
expect(useTripStore.getState().assignments['2'][0].participants).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe('setAssignments', () => {
|
|
it('FE-ASSIGN-019: replaces the whole assignments map', () => {
|
|
seedStore(useTripStore, { assignments: { '1': [buildAssignment({ id: 1, day_id: 1 })] } });
|
|
|
|
const next = { '9': [buildAssignment({ id: 90, day_id: 9 })] };
|
|
useTripStore.getState().setAssignments(next);
|
|
|
|
expect(useTripStore.getState().assignments).toEqual(next);
|
|
});
|
|
});
|
|
|
|
// #2601: offline a place goes on its day, comes off it, moves and is reordered
|
|
// through the queue instead of failing.
|
|
describe('offline', () => {
|
|
const setOnline = (v: boolean) => Object.defineProperty(navigator, 'onLine', { value: v, writable: true, configurable: true });
|
|
beforeEach(async () => { await clearAll(); setOnline(false); });
|
|
afterEach(async () => { setOnline(true); await clearAll(); });
|
|
|
|
async function queued(): Promise<[string, string][]> {
|
|
return (await offlineDb.mutationQueue.toArray())
|
|
.sort((a, b) => a.createdAt - b.createdAt)
|
|
.map(m => [m.method, m.url]);
|
|
}
|
|
|
|
it('FE-ASSIGN-OFF-001: a place put on a day offline stays there and waits in the queue', async () => {
|
|
const place = buildPlace({ id: 10, trip_id: 1 });
|
|
seedStore(useTripStore, { places: [place], assignments: { '1': [] } });
|
|
|
|
const visit = await useTripStore.getState().assignPlaceToDay(1, 1, 10);
|
|
|
|
expect(visit?.id).toBeLessThan(0);
|
|
expect(useTripStore.getState().assignments['1'].map(a => a.place_id)).toEqual([10]);
|
|
expect(await queued()).toEqual([['POST', '/trips/1/days/1/assignments']]);
|
|
});
|
|
|
|
it('FE-ASSIGN-OFF-002: removing, reordering and moving offline keep the change and queue it', async () => {
|
|
const a = buildAssignment({ id: 5, day_id: 1, order_index: 0 });
|
|
const b = buildAssignment({ id: 6, day_id: 1, order_index: 1 });
|
|
seedStore(useTripStore, { assignments: { '1': [a, b], '2': [] } });
|
|
|
|
await useTripStore.getState().reorderAssignments(1, 1, [6, 5]);
|
|
await useTripStore.getState().moveAssignment(1, 6, 1, 2);
|
|
await useTripStore.getState().removeAssignment(1, 1, 5);
|
|
|
|
expect(useTripStore.getState().assignments['1']).toEqual([]);
|
|
expect(useTripStore.getState().assignments['2'].map(x => x.id)).toEqual([6]);
|
|
expect(await queued()).toEqual([
|
|
['PUT', '/trips/1/days/1/assignments/reorder'],
|
|
['PUT', '/trips/1/assignments/6/move'],
|
|
['DELETE', '/trips/1/days/1/assignments/5'],
|
|
]);
|
|
});
|
|
|
|
it('FE-ASSIGN-OFF-003: a leg mode and the travellers chosen offline land on the visit', async () => {
|
|
seedStore(useTripStore, { assignments: { '2': [buildAssignment({ id: 5, day_id: 2 })] } });
|
|
await offlineDb.tripMembers.put({ tripId: 1, id: 4, username: 'Lena', avatar: null });
|
|
|
|
await useTripStore.getState().setAssignmentParticipants(1, 2, 5, [4]);
|
|
await useTripStore.getState().setAssignmentLegMode(1, 2, 5, 'driving');
|
|
|
|
const visit = useTripStore.getState().assignments['2'][0];
|
|
expect(visit.participants).toEqual([{ user_id: 4, username: 'Lena', avatar: null }]);
|
|
expect(visit.leg_transport_mode).toBe('driving');
|
|
expect(await queued()).toEqual([
|
|
['PUT', '/trips/1/assignments/5/participants'],
|
|
['PUT', '/trips/1/assignments/5/transport'],
|
|
]);
|
|
});
|
|
});
|
|
});
|