mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-22 23:16:46 +00:00
Maurice
2b41a55022
Reminder jobs, user profile, trip members, Dawarich suggestions, the doc sync controller, the plugin registry and the plugin repository parity suite now write and read their rows through the ORM factories. The doc sync controller's itemsForTrip stand-in answers through the two repository reads DocSyncService makes instead of a copy of their SQL, and one more database mock drops its dead canAccessTrip/isOwner stand-ins. What stays raw is marked: the legacy statements the parity cases are held to, and the places stub in the Dawarich suggestions suite, which runs inside the service's open transaction and has to write on the connection that transaction holds.
1468 lines
66 KiB
TypeScript
1468 lines
66 KiB
TypeScript
/**
|
|
* Unit tests for DawarichSuggestionsService: DAWARICH-SUG-001..064.
|
|
*
|
|
* This is the only service in the Dawarich domain that writes into TREK proper,
|
|
* and every write it makes crosses an ownership line: a suggestion belongs to
|
|
* one user, the trip it lands on belongs to a roster, the wish it ticks belongs
|
|
* to the caller alone. So the DB is real in-memory SQLite — the scoping lives in
|
|
* the SQL and a stub would assert nothing about it — while the four collaborators
|
|
* that would reach further (Atlas, Places, Assignments, Journey) are stubs, plus
|
|
* DawarichService and DawarichClient so no case can touch the network or a
|
|
* user's stored credentials.
|
|
*/
|
|
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
|
import { createSnapshotTestDb } from '../../helpers/db-mock';
|
|
|
|
// ── DB setup (real in-memory SQLite — same pattern as the other service tests) ──
|
|
|
|
const testDb = createSnapshotTestDb();
|
|
|
|
vi.mock('../../../src/config', () => ({
|
|
JWT_SECRET: 'test-secret',
|
|
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
|
updateJwtSecret: () => {},
|
|
}));
|
|
vi.mock('../../../src/websocket', () => ({ broadcast: vi.fn() }));
|
|
|
|
import { DAWARICH_BUCKET_SCAN_LIMIT } from '@trek/shared';
|
|
import type { DawarichConnection } from '@trek/shared';
|
|
import { resetTestDb } from '../../helpers/test-db';
|
|
import { createUser, createTrip, createDay, addTripMember } from '../../helpers/factories';
|
|
import {
|
|
AcceptError,
|
|
DawarichSuggestionsService,
|
|
} from '../../../src/nest/integrations/dawarich-suggestions.service';
|
|
import type { DawarichService } from '../../../src/nest/integrations/dawarich.service';
|
|
import type { DawarichClient } from '../../../src/nest/integrations/dawarich.client';
|
|
import type { AtlasService } from '../../../src/nest/atlas/atlas.service';
|
|
import type { PlacesService } from '../../../src/nest/places/places.service';
|
|
import type { AssignmentsService } from '../../../src/nest/assignments/assignments.service';
|
|
import type { PermissionsService } from '../../../src/nest/permissions/permissions.service';
|
|
import type { JourneyDomainService } from '../../../src/nest/journey/journey-domain.service';
|
|
import type { DawarichVisitSuggestionsRepository } from '../../../src/db/repositories/DawarichVisitSuggestions.repository';
|
|
import type { TripsRepository } from '../../../src/db/repositories/Trips.repository';
|
|
import { BucketList } from '../../../src/db/entities/BucketList.entity';
|
|
import { Days } from '../../../src/db/entities/Days.entity';
|
|
import { DawarichVisitSuggestions } from '../../../src/db/entities/DawarichVisitSuggestions.entity';
|
|
import { Journeys } from '../../../src/db/entities/Journeys.entity';
|
|
import { JourneyEntries } from '../../../src/db/entities/JourneyEntries.entity';
|
|
import { Places } from '../../../src/db/entities/Places.entity';
|
|
import { VisitedCountries } from '../../../src/db/entities/VisitedCountries.entity';
|
|
import { countRows, deleteRows, findRow, insertRow, updateRows } from '../../helpers/factories/rows';
|
|
import type { PlacesRepository } from '../../../src/db/repositories/Places.repository';
|
|
import type { BucketListRepository } from '../../../src/db/repositories/BucketList.repository';
|
|
import type { UsersRepository } from '../../../src/db/repositories/Users.repository';
|
|
import type { TestOrm } from '../../helpers/test-orm';
|
|
import { createTestDawarichVisitSuggestionsRepo } from '../../helpers/dawarich-repos';
|
|
import { createTestPlacesRepo, createTestTripsRepo, createTestUnitOfWork, createTestUsersRepo, sharedTestOrm } from '../../helpers/test-uow';
|
|
|
|
// ── Collaborator stubs ───────────────────────────────────────────────────────
|
|
//
|
|
// `getCredentials` hands back a fixed pair rather than reading
|
|
// dawarich_connections: the encrypted-at-rest round trip is DawarichService's
|
|
// own business, and a case that needed it would be testing apiKeyCrypto. The
|
|
// client is a stub with no implementation of its own, which doubles as the
|
|
// assertion that nothing here reaches the network — an unstubbed call would
|
|
// return undefined and fail loudly rather than dial out.
|
|
|
|
const CREDS = { baseUrl: 'https://dawarich.example.com', apiKey: 'test-key', allowInsecureTls: false };
|
|
|
|
const CONNECTION: DawarichConnection = {
|
|
url: CREDS.baseUrl,
|
|
apiKeyMasked: '********',
|
|
allowInsecureTls: false,
|
|
syncEnabled: true,
|
|
connected: true,
|
|
lastSyncAt: '2026-09-06T04:15:00Z',
|
|
lastSyncState: 'ok',
|
|
lastSyncError: null,
|
|
capabilities: null,
|
|
};
|
|
|
|
const dawarichStub = {
|
|
getConnection: vi.fn(),
|
|
getCredentials: vi.fn(),
|
|
};
|
|
const clientStub = {
|
|
findVisitsNear: vi.fn(),
|
|
listVisitedCities: vi.fn(),
|
|
};
|
|
// `stats` is what the Atlas map is drawn from, and "already visited" in the
|
|
// hand-off means "already on that map", so the stub answers it as the map
|
|
// would: a list of countries with the status each is painted in.
|
|
const atlasStub = { markCountry: vi.fn(), stats: vi.fn() };
|
|
// `broadcast` and `onCreated` are stubbed because an acceptance is a normal
|
|
// place write and has to behave like one: everyone on the trip is told, and a
|
|
// live journey mirrors it. Both are asserted rather than merely tolerated.
|
|
const placesStub = { create: vi.fn(), broadcast: vi.fn(), onCreated: vi.fn() };
|
|
const assignmentsStub = { dayExists: vi.fn(), createAssignment: vi.fn(), broadcast: vi.fn() };
|
|
// The instance's permission matrix, stubbed so a case can narrow place_edit or
|
|
// day_edit to the owner the way an admin would and watch a member be refused.
|
|
const permissionsStub = { checkPermission: vi.fn() };
|
|
const journeyStub = { canEdit: vi.fn(), createEntry: vi.fn() };
|
|
|
|
let t: TestOrm;
|
|
let suggestions: DawarichVisitSuggestionsRepository;
|
|
let trips: TripsRepository;
|
|
let placesRepo: PlacesRepository;
|
|
let bucketList: BucketListRepository;
|
|
let users: UsersRepository;
|
|
let svc: DawarichSuggestionsService;
|
|
beforeAll(async () => {
|
|
// Table creation is the OTHER beforeAll below (line-order-later, same
|
|
// pre-test phase) — ORM init here does not need the schema to exist yet
|
|
// (it only introspects lazily, per query), so the order between these two
|
|
// top-level beforeAll hooks is unobservable.
|
|
t = await sharedTestOrm(testDb);
|
|
suggestions = await createTestDawarichVisitSuggestionsRepo(testDb);
|
|
trips = await createTestTripsRepo(testDb);
|
|
placesRepo = await createTestPlacesRepo(testDb);
|
|
bucketList = t.repo(BucketList);
|
|
users = await createTestUsersRepo(testDb);
|
|
svc = new DawarichSuggestionsService(
|
|
suggestions,
|
|
dawarichStub as unknown as DawarichService,
|
|
clientStub as unknown as DawarichClient,
|
|
atlasStub as unknown as AtlasService,
|
|
placesStub as unknown as PlacesService,
|
|
assignmentsStub as unknown as AssignmentsService,
|
|
permissionsStub as unknown as PermissionsService,
|
|
journeyStub as unknown as JourneyDomainService,
|
|
trips,
|
|
placesRepo,
|
|
bucketList,
|
|
users,
|
|
await createTestUnitOfWork(testDb),
|
|
);
|
|
});
|
|
|
|
const CREATED_ENTRY_ID = 7702;
|
|
|
|
/**
|
|
* The places stub writes a real row rather than inventing an id:
|
|
* `accepted_place_id` is a foreign key onto places, so a made-up number makes
|
|
* the acceptance fail on the constraint instead of on anything a case is about.
|
|
*/
|
|
function insertPlaceRow(tripId: string, body: { name?: string; lat?: number; lng?: number }): { id: number } {
|
|
// test-sql-allow: runs inside the service's open transaction, on the connection that transaction holds.
|
|
const category = testDb.prepare('SELECT id FROM categories LIMIT 1').get() as { id: number } | undefined;
|
|
const result = testDb
|
|
// test-sql-allow: runs inside the service's open transaction, on the connection that transaction holds.
|
|
.prepare('INSERT INTO places (trip_id, name, lat, lng, category_id) VALUES (?, ?, ?, ?, ?)')
|
|
.run(Number(tripId), body.name ?? 'Imported stay', body.lat ?? null, body.lng ?? null, category?.id ?? null);
|
|
return { id: Number(result.lastInsertRowid) };
|
|
}
|
|
|
|
function armStubs(): void {
|
|
// `placesRepo.findWithTagsAndRatings` is the REAL repository method now
|
|
// (Plan 3h Task 3) — no reset/reimplementation needed by default; only
|
|
// DAWARICH-SUG-061 overrides it, locally, with its own `vi.spyOn`.
|
|
dawarichStub.getConnection.mockReset().mockReturnValue({ ...CONNECTION });
|
|
dawarichStub.getCredentials.mockReset().mockReturnValue({ ...CREDS });
|
|
clientStub.findVisitsNear.mockReset();
|
|
clientStub.listVisitedCities.mockReset();
|
|
// Answers true — it added the country — unless a case says otherwise.
|
|
atlasStub.markCountry.mockReset().mockReturnValue(true);
|
|
// An empty map unless a case paints something on it.
|
|
atlasStub.stats.mockReset().mockResolvedValue({ countries: [] });
|
|
placesStub.create
|
|
.mockReset()
|
|
.mockImplementation((tripId: string, body: { name?: string; lat?: number; lng?: number }) =>
|
|
insertPlaceRow(tripId, body),
|
|
);
|
|
// Answered out of the same DB the cases seed: day ownership is the point of
|
|
// several of them, and a stub hardcoded to true would prove nothing about
|
|
// which trip the day was looked up against.
|
|
assignmentsStub.dayExists
|
|
.mockReset()
|
|
.mockImplementation(
|
|
async (dayId: unknown, tripId: unknown) =>
|
|
!!(await findRow(t, Days, { id: Number(dayId), trip: Number(tripId) })),
|
|
);
|
|
placesStub.broadcast.mockReset();
|
|
placesStub.onCreated.mockReset();
|
|
assignmentsStub.createAssignment.mockReset();
|
|
assignmentsStub.broadcast.mockReset();
|
|
permissionsStub.checkPermission.mockReset().mockReturnValue(true);
|
|
journeyStub.canEdit.mockReset().mockReturnValue(true);
|
|
journeyStub.createEntry.mockReset().mockReturnValue({ id: CREATED_ENTRY_ID });
|
|
}
|
|
|
|
// ── Fixtures ─────────────────────────────────────────────────────────────────
|
|
|
|
interface SuggestionSeed {
|
|
userId: number;
|
|
tripId?: number | null;
|
|
name?: string;
|
|
lat?: number | null;
|
|
lng?: number | null;
|
|
startedAt?: string;
|
|
endedAt?: string;
|
|
durationMinutes?: number;
|
|
localDate?: string;
|
|
state?: string;
|
|
matchedBucketListItemId?: number | null;
|
|
sourceHash?: string;
|
|
}
|
|
|
|
let _visitSeq = 0;
|
|
|
|
async function seedSuggestion(seed: SuggestionSeed): Promise<number> {
|
|
_visitSeq++;
|
|
return insertRow(t, DawarichVisitSuggestions, {
|
|
user: seed.userId,
|
|
source_visit_id: `visit-${_visitSeq}`,
|
|
trip: seed.tripId ?? null,
|
|
name: seed.name ?? 'Cafe Central',
|
|
lat: seed.lat === undefined ? 48.2092 : seed.lat,
|
|
lng: seed.lng === undefined ? 16.3658 : seed.lng,
|
|
started_at: seed.startedAt ?? '2026-09-01T09:30:00Z',
|
|
ended_at: seed.endedAt ?? '2026-09-01T11:45:00Z',
|
|
duration_minutes: seed.durationMinutes ?? 135,
|
|
local_date: seed.localDate ?? '2026-09-01',
|
|
state: seed.state ?? 'new',
|
|
matchedBucketListItem: seed.matchedBucketListItemId ?? null,
|
|
source_hash: seed.sourceHash ?? `hash-${_visitSeq}`,
|
|
});
|
|
}
|
|
|
|
/** The stored suggestion; fails the case when it is gone. */
|
|
async function rowOf(id: number) {
|
|
const row = await findRow(t, DawarichVisitSuggestions, { id });
|
|
if (!row) throw new Error(`no suggestion ${id}`);
|
|
return row;
|
|
}
|
|
|
|
async function seedBucketItem(
|
|
userId: number,
|
|
overrides: Partial<{
|
|
name: string;
|
|
lat: number | null;
|
|
lng: number | null;
|
|
visitedAt: string | null;
|
|
visitedSource: string | null;
|
|
}> = {},
|
|
): Promise<number> {
|
|
return insertRow(t, BucketList, {
|
|
user: userId,
|
|
name: overrides.name ?? 'Zell am See',
|
|
lat: overrides.lat === undefined ? 47.3232 : overrides.lat,
|
|
lng: overrides.lng === undefined ? 12.7981 : overrides.lng,
|
|
visited_at: overrides.visitedAt ?? null,
|
|
visited_source: overrides.visitedSource ?? null,
|
|
});
|
|
}
|
|
|
|
/** The stored wish; fails the case when it is gone. */
|
|
async function bucketOf(id: number) {
|
|
const row = await findRow(t, BucketList, { id });
|
|
if (!row) throw new Error(`no bucket list item ${id}`);
|
|
return row;
|
|
}
|
|
|
|
/**
|
|
* The refusal itself, not just that one happened: every case here cares about
|
|
* the status the controller maps and the code the MCP tool renders, and
|
|
* `toThrow(AcceptError)` alone would pass on the wrong refusal.
|
|
*/
|
|
async function asyncRefusalFrom(fn: () => Promise<unknown>): Promise<AcceptError> {
|
|
try {
|
|
await fn();
|
|
} catch (err) {
|
|
if (err instanceof AcceptError) return err;
|
|
throw err;
|
|
}
|
|
throw new Error('expected the call to reject with an AcceptError, but it resolved');
|
|
}
|
|
|
|
beforeEach(() => {
|
|
resetTestDb(testDb);
|
|
// dawarich_visit_suggestions is not in the shared helper's reset list, so it
|
|
// is cleared here rather than by widening a list every other suite shares.
|
|
testDb.exec('DELETE FROM dawarich_visit_suggestions');
|
|
t.clear();
|
|
armStubs();
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await t.close();
|
|
testDb.close();
|
|
});
|
|
|
|
// ── list / getOne ────────────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — the review list', () => {
|
|
it("DAWARICH-SUG-001: list() is scoped in SQL — a stranger's suggestion never appears", async () => {
|
|
const { user: mine } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const mineId = await seedSuggestion({ userId: mine.id, name: 'Volksgarten' });
|
|
const strangerId = await seedSuggestion({ userId: stranger.id, name: 'Their Kitchen' });
|
|
|
|
const list = await svc.list(mine.id, {});
|
|
|
|
expect(list.suggestions.map((s) => s.id)).toEqual([mineId]);
|
|
expect(list.suggestions.map((s) => s.name)).not.toContain('Their Kitchen');
|
|
// Asserted in both directions, so an id that happens to line up cannot carry it.
|
|
expect((await svc.list(stranger.id, {})).suggestions.map((s) => s.id)).toEqual([strangerId]);
|
|
});
|
|
|
|
it('DAWARICH-SUG-002: list() narrows by trip and by state, both still inside the user scope', async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const otherTrip = createTrip(testDb, user.id);
|
|
const strangerTrip = createTrip(testDb, stranger.id);
|
|
|
|
const onTrip = await seedSuggestion({ userId: user.id, tripId: trip.id, startedAt: '2026-09-03T08:00:00Z' });
|
|
const dismissed = await seedSuggestion({ userId: user.id, tripId: trip.id, state: 'dismissed' });
|
|
await seedSuggestion({ userId: user.id, tripId: otherTrip.id });
|
|
await seedSuggestion({ userId: stranger.id, tripId: strangerTrip.id });
|
|
|
|
const byTrip = (await svc.list(user.id, { tripId: trip.id }))
|
|
.suggestions.map((s) => s.id)
|
|
.sort((a, b) => a - b);
|
|
expect(byTrip).toEqual([onTrip, dismissed].sort((a, b) => a - b));
|
|
|
|
expect((await svc.list(user.id, { tripId: trip.id, state: 'dismissed' })).suggestions.map((s) => s.id)).toEqual([
|
|
dismissed,
|
|
]);
|
|
// Another user's trip id is not a way in: the user clause still applies.
|
|
expect((await svc.list(user.id, { tripId: strangerTrip.id })).suggestions).toEqual([]);
|
|
});
|
|
|
|
it('DAWARICH-SUG-003: list() carries the connection state so a panel needs no second request', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedSuggestion({ userId: user.id });
|
|
|
|
const list = await svc.list(user.id, {});
|
|
|
|
expect(dawarichStub.getConnection).toHaveBeenCalledWith(user.id);
|
|
expect(list.connected).toBe(true);
|
|
expect(list.lastSyncAt).toBe('2026-09-06T04:15:00Z');
|
|
expect(list.lastSyncState).toBe('ok');
|
|
expect(list.lastSyncError).toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-004: getOne() answers null for a suggestion that belongs to somebody else', async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const theirs = await seedSuggestion({ userId: stranger.id, name: 'Their Kitchen' });
|
|
|
|
expect(await svc.getOne(user.id, theirs)).toBeNull();
|
|
expect((await svc.getOne(stranger.id, theirs))?.name).toBe('Their Kitchen');
|
|
});
|
|
|
|
it('DAWARICH-SUG-059: the flags the panel warns with are read off the row, never acted on', async () => {
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
await svc.accept(user.id, id, { target: 'bucket_list', bucketListItemId: wish });
|
|
|
|
// Everything a later sync is allowed to do to a row somebody already
|
|
// accepted: the detector re-ran and the hash moved, it upgraded the stay
|
|
// from suggested to confirmed, and then the visit disappeared from
|
|
// Dawarich altogether. The tick the user made stands through all of it.
|
|
await updateRows(t, DawarichVisitSuggestions, { id }, {
|
|
source_hash: 'hash-after-redetection',
|
|
source_status: 'confirmed',
|
|
source_missing_at: '2026-09-07T00:00:00Z',
|
|
});
|
|
|
|
const wire = (await svc.getOne(user.id, id))!;
|
|
expect(wire.sourceStatus).toBe('confirmed');
|
|
expect(wire.sourceChanged).toBe(true);
|
|
expect(wire.sourceMissing).toBe(true);
|
|
expect(wire.state).toBe('accepted');
|
|
expect(wire.target).toBe('bucket_list');
|
|
expect(wire.acceptedBucketListItemId).toBe(wish);
|
|
});
|
|
});
|
|
|
|
// ── accept: place ────────────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — accepting into a trip', () => {
|
|
it('DAWARICH-SUG-005: a trip the caller cannot see is a 404, and nothing is created', async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const strangerTrip = createTrip(testDb, stranger.id);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'place', tripId: strangerTrip.id }));
|
|
|
|
expect(err.status).toBe(404);
|
|
expect(err.code).toBe('not_found');
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-006: a day from another trip is a 400 — trip access is not day access', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const otherTrip = createTrip(testDb, user.id);
|
|
const foreignDay = createDay(testDb, otherTrip.id, { date: '2026-09-01' });
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
|
|
const err = await asyncRefusalFrom(() =>
|
|
svc.accept(user.id, id, { target: 'place', tripId: trip.id, dayId: foreignDay.id }),
|
|
);
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('day_not_on_trip');
|
|
// The day was checked against the trip it is being attached to, not on its own.
|
|
expect(assignmentsStub.dayExists).toHaveBeenCalledWith(foreignDay.id, trip.id);
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
expect(assignmentsStub.createAssignment).not.toHaveBeenCalled();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-007: a stay on a trip the caller is a member of becomes a place pinned to the day', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
const day = createDay(testDb, trip.id, { date: '2026-09-01' });
|
|
const id = await seedSuggestion({ userId: member.id, tripId: trip.id, name: 'Cafe Central' });
|
|
|
|
const result = await svc.accept(member.id, id, {
|
|
target: 'place',
|
|
tripId: trip.id,
|
|
dayId: day.id,
|
|
notes: 'long lunch',
|
|
});
|
|
|
|
expect(placesStub.create).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
expect.objectContaining({
|
|
name: 'Cafe Central',
|
|
lat: 48.2092,
|
|
lng: 16.3658,
|
|
notes: 'long lunch',
|
|
place_time: '09:30',
|
|
end_time: '11:45',
|
|
duration_minutes: 135,
|
|
}),
|
|
);
|
|
const placeId = result.createdPlaceId;
|
|
expect(placeId).not.toBeNull();
|
|
expect(assignmentsStub.createAssignment).toHaveBeenCalledWith(day.id, placeId, null);
|
|
expect(result.createdJournalEntryId).toBeNull();
|
|
expect(result.suggestion.state).toBe('accepted');
|
|
|
|
const row = await rowOf(id);
|
|
expect(row.target).toBe('place');
|
|
expect(row.accepted_place_id).toBe(placeId);
|
|
// The hash is frozen at acceptance, which is what makes "changed since" answerable.
|
|
expect(row.accepted_hash).toBe(row.source_hash);
|
|
expect(result.suggestion.sourceChanged).toBe(false);
|
|
});
|
|
|
|
it("DAWARICH-SUG-065: DWS11's self-column-copy — accepted_hash freezes the CURRENT source_hash at UPDATE time, not the stale value accept() read when it started", async () => {
|
|
// `markAccepted`'s `accepted_hash = source_hash` has to be a column-ref
|
|
// expression (`columnRef`), never a bound parameter: binding would freeze
|
|
// whatever `source_hash` held at the moment the repository call was
|
|
// BUILT, which is wrong the instant a concurrent write (a sync tick
|
|
// racing the same accept-flow) changes `source_hash` before this
|
|
// specific UPDATE commits. Proven by mutating the row's `source_hash`
|
|
// from INSIDE the same `uow.transactional` block `acceptAsPlace` opens —
|
|
// `placesStub.create` fires mid-transaction, strictly before
|
|
// `markAccepted` — so this is a genuine "changed between the read and
|
|
// the write", not merely "changed before either ran".
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id, sourceHash: 'hash-at-accept-start' });
|
|
|
|
placesStub.create.mockImplementationOnce((tripId: string, body: { name?: string; lat?: number; lng?: number }) => {
|
|
// test-sql-allow: runs inside the service's open transaction, on the connection that transaction holds.
|
|
testDb.prepare('UPDATE dawarich_visit_suggestions SET source_hash = ? WHERE id = ?').run('hash-changed-concurrently', id);
|
|
return insertPlaceRow(tripId, body);
|
|
});
|
|
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
const row = await rowOf(id);
|
|
expect(row.source_hash).toBe('hash-changed-concurrently');
|
|
// A bound-at-read-time literal would have frozen 'hash-at-accept-start'
|
|
// here instead — the whole point of the column-ref form.
|
|
expect(row.accepted_hash).toBe('hash-changed-concurrently');
|
|
expect(row.accepted_hash).not.toBe('hash-at-accept-start');
|
|
});
|
|
|
|
it('DAWARICH-SUG-008: a stay with no trip anywhere is a 400 rather than a place nobody can see', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: null });
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'place' }));
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('trip_required');
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('DAWARICH-SUG-043: every field the review step lets someone correct beats the recorded one', async () => {
|
|
// The review step exists so a detector's guess can be fixed rather than
|
|
// swallowed; a correction that silently lost to the recording would make
|
|
// the whole form decorative.
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id, name: 'Unnamed stay' });
|
|
|
|
await svc.accept(user.id, id, {
|
|
target: 'place',
|
|
tripId: trip.id,
|
|
name: ' Cafe Central ',
|
|
notes: 'the good table by the window',
|
|
time: '10:00',
|
|
endTime: '12:15',
|
|
lat: 48.2,
|
|
lng: 16.3,
|
|
});
|
|
|
|
expect(placesStub.create).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
expect.objectContaining({
|
|
// Trimmed here as well as by the contract: this path is also reached
|
|
// from MCP, where nothing has trimmed it first.
|
|
name: 'Cafe Central',
|
|
notes: 'the good table by the window',
|
|
place_time: '10:00',
|
|
end_time: '12:15',
|
|
lat: 48.2,
|
|
lng: 16.3,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('DAWARICH-SUG-044: a stay with no position and no measurable length passes neither on', async () => {
|
|
// `undefined` rather than null or zero: PlacesService applies its own
|
|
// defaults for a field nobody supplied, and a place pinned at 0,0 off the
|
|
// coast of Africa with a duration of "0 min" is worse than one with none.
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id, lat: null, lng: null, durationMinutes: 0 });
|
|
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
const body = placesStub.create.mock.calls[0][1] as Record<string, unknown>;
|
|
expect(body.lat).toBeUndefined();
|
|
expect(body.lng).toBeUndefined();
|
|
expect(body.duration_minutes).toBeUndefined();
|
|
});
|
|
|
|
it('DAWARICH-SUG-045: with no trip in the body, the one the sync filed the stay under is used', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'place' });
|
|
|
|
expect(placesStub.create).toHaveBeenCalledWith(String(trip.id), expect.anything());
|
|
expect(result.createdPlaceId).not.toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-046: a timestamp with no clock time in it yields no time rather than a wrong one', async () => {
|
|
// Dawarich normally sends a full ISO instant, but a visit imported from a
|
|
// GPX or an older schema can arrive as a bare date. Slicing characters 11
|
|
// to 16 out of that would put the last five characters of the date into a
|
|
// time field.
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({
|
|
userId: user.id,
|
|
tripId: trip.id,
|
|
startedAt: '2026-09-01',
|
|
endedAt: '2026-09-01',
|
|
});
|
|
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
expect(placesStub.create).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
expect.objectContaining({ place_time: null, end_time: null }),
|
|
);
|
|
});
|
|
|
|
it("DAWARICH-SUG-009: accepting a stranger's suggestion is a 404 before any target is looked at", async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const theirs = await seedSuggestion({ userId: stranger.id });
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, theirs, { target: 'place', tripId: trip.id }));
|
|
|
|
expect(err.status).toBe(404);
|
|
expect(err.code).toBe('not_found');
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
// ── accept: journal ──────────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — accepting into a journey', () => {
|
|
it('DAWARICH-SUG-010: a journey the caller may not edit refuses before createEntry is reached', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
journeyStub.canEdit.mockReturnValue(false);
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'journal', journalId: 4242 }));
|
|
|
|
expect(journeyStub.canEdit).toHaveBeenCalledWith(4242, user.id);
|
|
expect(err.status).toBe(404);
|
|
expect(err.code).toBe('journal_forbidden');
|
|
expect(journeyStub.createEntry).not.toHaveBeenCalled();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-011: a permitted journey gets a dated entry, with the socket id passed through', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id, name: 'Cafe Central', localDate: '2026-09-01' });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'journal', journalId: 88 }, 'socket-7');
|
|
|
|
expect(journeyStub.createEntry).toHaveBeenCalledWith(
|
|
88,
|
|
user.id,
|
|
expect.objectContaining({
|
|
type: 'entry',
|
|
title: 'Cafe Central',
|
|
entry_date: '2026-09-01',
|
|
entry_time: '09:30',
|
|
location_name: 'Cafe Central',
|
|
location_lat: 48.2092,
|
|
location_lng: 16.3658,
|
|
}),
|
|
'socket-7',
|
|
);
|
|
expect(result.createdJournalEntryId).toBe(CREATED_ENTRY_ID);
|
|
expect(result.createdPlaceId).toBeNull();
|
|
|
|
const row = await rowOf(id);
|
|
expect(row.state).toBe('accepted');
|
|
expect(row.target).toBe('journal');
|
|
expect(row.accepted_journal_entry_id).toBe(CREATED_ENTRY_ID);
|
|
});
|
|
|
|
it('DAWARICH-SUG-012: a journey id missing from the body is a 400, not a guess', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'journal' }));
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('journal_required');
|
|
expect(journeyStub.canEdit).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('DAWARICH-SUG-047: a corrected entry carries the corrections, not the recording', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id, name: 'Cafe Central', localDate: '2026-09-01' });
|
|
|
|
await svc.accept(user.id, id, {
|
|
target: 'journal',
|
|
journalId: 88,
|
|
name: 'Dinner at the Naschmarkt',
|
|
notes: 'the one with the bad wine',
|
|
date: '2026-09-02',
|
|
time: '19:30',
|
|
lat: 48.198,
|
|
lng: 16.363,
|
|
});
|
|
|
|
expect(journeyStub.createEntry).toHaveBeenCalledWith(
|
|
88,
|
|
user.id,
|
|
expect.objectContaining({
|
|
title: 'Dinner at the Naschmarkt',
|
|
story: 'the one with the bad wine',
|
|
entry_date: '2026-09-02',
|
|
entry_time: '19:30',
|
|
location_name: 'Dinner at the Naschmarkt',
|
|
location_lat: 48.198,
|
|
location_lng: 16.363,
|
|
}),
|
|
undefined,
|
|
);
|
|
});
|
|
|
|
it('DAWARICH-SUG-048: a stay with no position and no clock time writes an entry without either', async () => {
|
|
// The journey domain treats a missing field and an empty one differently
|
|
// (a location_lat of null would put a pin on the map at the equator), so
|
|
// everything unknown has to arrive as undefined rather than as null.
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({
|
|
userId: user.id,
|
|
lat: null,
|
|
lng: null,
|
|
startedAt: '2026-09-03',
|
|
localDate: '2026-09-03',
|
|
});
|
|
|
|
await svc.accept(user.id, id, { target: 'journal', journalId: 88 });
|
|
|
|
const body = journeyStub.createEntry.mock.calls[0][2] as Record<string, unknown>;
|
|
expect(body.entry_date).toBe('2026-09-03');
|
|
expect(body.entry_time).toBeUndefined();
|
|
expect(body.location_lat).toBeUndefined();
|
|
expect(body.location_lng).toBeUndefined();
|
|
expect(body.story).toBeUndefined();
|
|
});
|
|
|
|
it('DAWARICH-SUG-013: a journey domain that returns nothing leaves the suggestion in review', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
journeyStub.createEntry.mockReturnValue(null);
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'journal', journalId: 12 }));
|
|
|
|
expect(err.status).toBe(404);
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
});
|
|
|
|
// ── accept: bucket list ──────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — ticking off a wish', () => {
|
|
it('DAWARICH-SUG-014: a wish owned by somebody else is a 404 and stays untouched', async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const theirWish = await seedBucketItem(stranger.id, { name: 'Their Hallstatt' });
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
|
|
const err = await asyncRefusalFrom(() =>
|
|
svc.accept(user.id, id, { target: 'bucket_list', bucketListItemId: theirWish }),
|
|
);
|
|
|
|
expect(err.status).toBe(404);
|
|
expect(err.code).toBe('not_found');
|
|
expect((await bucketOf(theirWish)).visited_at).toBeNull();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it("DAWARICH-SUG-015: the caller's own wish is ticked with the stay's arrival and marked as imported", async () => {
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
const id = await seedSuggestion({ userId: user.id, startedAt: '2026-09-01T09:30:00Z' });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'bucket_list', bucketListItemId: wish });
|
|
|
|
const item = await bucketOf(wish);
|
|
expect(item.visited_at).toBe('2026-09-01T09:30:00Z');
|
|
expect(item.visited_source).toBe('dawarich');
|
|
expect(result.bucketListItemId).toBe(wish);
|
|
expect(result.createdPlaceId).toBeNull();
|
|
expect((await rowOf(id)).accepted_bucket_list_item_id).toBe(wish);
|
|
});
|
|
|
|
it('DAWARICH-SUG-016: with no wish named in the body, the matched one is used', async () => {
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
const id = await seedSuggestion({ userId: user.id, matchedBucketListItemId: wish });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'bucket_list' });
|
|
|
|
expect(result.bucketListItemId).toBe(wish);
|
|
expect((await bucketOf(wish)).visited_source).toBe('dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-017: with nothing named and nothing matched it is a 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id, matchedBucketListItemId: null });
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'bucket_list' }));
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('bucket_required');
|
|
});
|
|
});
|
|
|
|
// ── accept twice / state ─────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — what an acceptance closes off', () => {
|
|
it('DAWARICH-SUG-018: accepting an already accepted suggestion is a 409, not a second place', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
|
|
const first = await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
expect(placesStub.create).toHaveBeenCalledTimes(1);
|
|
|
|
const err = await asyncRefusalFrom(() => svc.accept(user.id, id, { target: 'place', tripId: trip.id }));
|
|
|
|
expect(err.status).toBe(409);
|
|
expect(err.code).toBe('already_accepted');
|
|
expect(placesStub.create).toHaveBeenCalledTimes(1);
|
|
// Still pointing at the first place, so the refusal cost nothing and created nothing.
|
|
expect((await rowOf(id)).accepted_place_id).toBe(first.createdPlaceId);
|
|
expect(await countRows(t, Places, { trip: trip.id })).toBe(1);
|
|
});
|
|
|
|
it('DAWARICH-SUG-019: setState cannot pull an accepted suggestion back into review', async () => {
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
await svc.accept(user.id, id, { target: 'bucket_list', bucketListItemId: wish });
|
|
|
|
const back = await svc.setState(user.id, id, 'new');
|
|
|
|
expect(back?.state).toBe('accepted');
|
|
expect((await rowOf(id)).state).toBe('accepted');
|
|
// Dismissing it is refused the same way — the tick it produced is its own thing now.
|
|
expect((await svc.setState(user.id, id, 'dismissed'))?.state).toBe('accepted');
|
|
expect((await rowOf(id)).target).toBe('bucket_list');
|
|
});
|
|
|
|
it('DAWARICH-SUG-020: a suggestion still in review dismisses and restores', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id });
|
|
|
|
expect((await svc.setState(user.id, id, 'dismissed'))?.state).toBe('dismissed');
|
|
expect((await svc.setState(user.id, id, 'new'))?.state).toBe('new');
|
|
});
|
|
|
|
it("DAWARICH-SUG-021: setState on a stranger's suggestion answers null and writes nothing", async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const theirs = await seedSuggestion({ userId: stranger.id });
|
|
|
|
expect(await svc.setState(user.id, theirs, 'dismissed')).toBeNull();
|
|
expect((await rowOf(theirs)).state).toBe('new');
|
|
});
|
|
});
|
|
|
|
// ── bucket-list confirmation ─────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — confirming a scan', () => {
|
|
it('DAWARICH-SUG-022: confirmBucketVisits only touches wishes that were not ticked yet', async () => {
|
|
const { user } = createUser(testDb);
|
|
const open = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
const alreadyTicked = await seedBucketItem(user.id, {
|
|
name: 'Kyoto',
|
|
visitedAt: '2026-01-04T12:00:00Z',
|
|
visitedSource: 'manual',
|
|
});
|
|
|
|
const updated = await svc.confirmBucketVisits(user.id, [open, alreadyTicked], '2026-09-05T10:00:00Z');
|
|
|
|
expect(updated).toBe(1);
|
|
expect((await bucketOf(open)).visited_at).toBe('2026-09-05T10:00:00Z');
|
|
expect((await bucketOf(open)).visited_source).toBe('dawarich');
|
|
// The hand-ticked one keeps both its date and who decided it.
|
|
expect((await bucketOf(alreadyTicked)).visited_at).toBe('2026-01-04T12:00:00Z');
|
|
expect((await bucketOf(alreadyTicked)).visited_source).toBe('manual');
|
|
});
|
|
|
|
it("DAWARICH-SUG-023: confirmBucketVisits ignores ids that are not the caller's", async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const mine = await seedBucketItem(user.id);
|
|
const theirs = await seedBucketItem(stranger.id);
|
|
|
|
const updated = await svc.confirmBucketVisits(user.id, [mine, theirs]);
|
|
|
|
expect(updated).toBe(1);
|
|
expect((await bucketOf(theirs)).visited_at).toBeNull();
|
|
expect((await bucketOf(mine)).visited_at).not.toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-056: a confirmed wish is dated from the stay that matched it, not from today', async () => {
|
|
// A wish somebody reached in 2023, ticked off with today's date, is a wrong
|
|
// entry in a list people keep for years. The clock is only the answer when
|
|
// nothing else knows better.
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
await seedSuggestion({ userId: user.id, matchedBucketListItemId: wish, startedAt: '2023-07-14T08:20:00Z' });
|
|
|
|
const updated = await svc.confirmBucketVisits(user.id, [wish]);
|
|
|
|
expect(updated).toBe(1);
|
|
expect((await bucketOf(wish)).visited_at).toBe('2023-07-14T08:20:00Z');
|
|
expect((await bucketOf(wish)).visited_source).toBe('dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-024: clearBucketVisit clears the source with the date, and only for the owner', async () => {
|
|
const { user } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const mine = await seedBucketItem(user.id, { visitedAt: '2026-09-05T10:00:00Z', visitedSource: 'dawarich' });
|
|
const theirs = await seedBucketItem(stranger.id, { visitedAt: '2026-09-05T10:00:00Z', visitedSource: 'dawarich' });
|
|
|
|
expect(await svc.clearBucketVisit(user.id, mine)).toBe(true);
|
|
expect((await bucketOf(mine)).visited_at).toBeNull();
|
|
expect((await bucketOf(mine)).visited_source).toBeNull();
|
|
|
|
expect(await svc.clearBucketVisit(user.id, theirs)).toBe(false);
|
|
expect((await bucketOf(theirs)).visited_at).toBe('2026-09-05T10:00:00Z');
|
|
});
|
|
});
|
|
|
|
// ── bucket-list scan (client stubbed, never the network) ─────────────────────
|
|
|
|
describe('DawarichSuggestionsService — scanning for stays', () => {
|
|
it('DAWARICH-SUG-025: a scan without a connection refuses before a single request', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id);
|
|
dawarichStub.getCredentials.mockReturnValue(null);
|
|
|
|
const err = await asyncRefusalFrom(() => svc.scanBucketList(user.id));
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('not_connected');
|
|
expect(clientStub.findVisitsNear).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('DAWARICH-SUG-026: the longest stay wins over the nearest, and a wish without coordinates reports as skipped', async () => {
|
|
const { user } = createUser(testDb);
|
|
const wish = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
await seedBucketItem(user.id, { name: 'Somewhere vague', lat: null, lng: null });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
{
|
|
timestamp: 1757000000,
|
|
distance_meters: 12,
|
|
points_count: 4,
|
|
// The bus stopping outside: nearest, and far too short to be the visit.
|
|
visit_details: { start_time: '2026-09-04T10:00:00Z', end_time: '2026-09-04T10:05:00Z', duration_minutes: 5 },
|
|
},
|
|
{
|
|
timestamp: 1757003600,
|
|
distance_meters: 180,
|
|
points_count: 42,
|
|
visit_details: { start_time: '2026-09-04T12:00:00Z', end_time: '2026-09-04T13:30:00Z', duration_minutes: 90 },
|
|
},
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.skippedWithoutCoordinates).toBe(1);
|
|
expect(scan.truncated).toBe(false);
|
|
expect(scan.matches).toHaveLength(1);
|
|
expect(scan.matches[0]).toMatchObject({
|
|
itemId: wish,
|
|
name: 'Hallstatt',
|
|
alreadyVisited: false,
|
|
match: { at: '2026-09-04T12:00:00Z', minutes: 90, distanceMeters: 180, points: 42 },
|
|
});
|
|
});
|
|
|
|
it('DAWARICH-SUG-049: past the cap the scan says so instead of reporting the rest as unmatched', async () => {
|
|
// One upstream request per wish is why there is a cap at all. A user with
|
|
// eighty wishes being told the other thirty had no match is the failure
|
|
// mode this flag exists to prevent.
|
|
const { user } = createUser(testDb);
|
|
for (let i = 0; i < DAWARICH_BUCKET_SCAN_LIMIT + 1; i++) {
|
|
await seedBucketItem(user.id, { name: `Wish ${i}` });
|
|
}
|
|
clientStub.findVisitsNear.mockResolvedValue([]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches).toHaveLength(DAWARICH_BUCKET_SCAN_LIMIT);
|
|
expect(scan.truncated).toBe(true);
|
|
expect(scan.skippedWithoutCoordinates).toBe(0);
|
|
// Exactly one request per wish that was actually looked at.
|
|
expect(clientStub.findVisitsNear).toHaveBeenCalledTimes(DAWARICH_BUCKET_SCAN_LIMIT);
|
|
});
|
|
|
|
it('DAWARICH-SUG-050: a wish already ticked is scanned last and marked as such', async () => {
|
|
// Still scanned, because the recordings may date it better than the hand
|
|
// tick did, but flagged, so the list reads as "these are new" rather than
|
|
// as a wall of things the user has known for years.
|
|
const { user } = createUser(testDb);
|
|
const open = await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
const ticked = await seedBucketItem(user.id, { name: 'Kyoto', visitedAt: '2023-04-02T09:00:00Z' });
|
|
clientStub.findVisitsNear.mockResolvedValue([]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches.map((m) => m.itemId)).toEqual([open, ticked]);
|
|
expect(scan.matches[0].alreadyVisited).toBe(false);
|
|
expect(scan.matches[1].alreadyVisited).toBe(true);
|
|
});
|
|
|
|
it('DAWARICH-SUG-051: a stay beyond the radius is no match, however long it lasted', async () => {
|
|
// `radius_override` is a request, not a guarantee: an instance that ignores
|
|
// it answers with stays from its own default 500 m, and a four-hour stay
|
|
// 600 m away is somewhere else entirely.
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
{
|
|
timestamp: 1757000000,
|
|
distance_meters: 600,
|
|
points_count: 90,
|
|
visit_details: {
|
|
start_time: '2026-09-04T10:00:00Z',
|
|
end_time: '2026-09-04T14:00:00Z',
|
|
duration_minutes: 240,
|
|
},
|
|
},
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches[0].match).toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-052: with no duration reported the two timestamps decide, and a stay with no details is skipped', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
// Nothing to measure at all: no duration, no times. It cannot clear the
|
|
// dwell threshold, so it is not a visit.
|
|
{ timestamp: 1757000000, distance_meters: 10, visit_details: null },
|
|
{
|
|
timestamp: 1757003600,
|
|
distance_meters: 20,
|
|
visit_details: { start_time: '2026-09-04T10:00:00Z', end_time: '2026-09-04T10:45:00Z' },
|
|
},
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches[0].match).toEqual({
|
|
at: '2026-09-04T10:00:00Z',
|
|
minutes: 45,
|
|
distanceMeters: 20,
|
|
// No points_count reported is zero, not undefined on the wire.
|
|
points: 0,
|
|
});
|
|
});
|
|
|
|
it('DAWARICH-SUG-053: with no distance reported the stay is taken at the radius and dated from its instant', async () => {
|
|
// The endpoint does not always carry `distance_meters`, and it was asked
|
|
// for a 250 m radius: treating the answer as "at most the radius" keeps the
|
|
// stay rather than dropping a real match over a missing field.
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
{
|
|
timestamp: 1_757_000_000,
|
|
points_count: 12,
|
|
visit_details: { end_time: '2025-09-04T16:13:20Z', duration_minutes: 40 },
|
|
},
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches[0].match).toEqual({
|
|
at: '2025-09-04T15:33:20.000Z',
|
|
minutes: 40,
|
|
distanceMeters: 250,
|
|
points: 12,
|
|
});
|
|
});
|
|
|
|
it('DAWARICH-SUG-054: a stay that cannot be dated at all is skipped, not ticked off on 1970-01-01', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
{ timestamp: null, distance_meters: 10, points_count: 8, visit_details: { duration_minutes: 60 } },
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches[0].match).toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-055: the longest qualifying stay wins, and a later shorter one does not displace it', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockResolvedValue([
|
|
{
|
|
timestamp: 1757000000,
|
|
distance_meters: 30,
|
|
points_count: 3,
|
|
visit_details: { start_time: '2026-09-04T08:00:00Z', end_time: '2026-09-04T08:30:00Z', duration_minutes: 30 },
|
|
},
|
|
{
|
|
timestamp: 1757010000,
|
|
distance_meters: 200,
|
|
points_count: 40,
|
|
visit_details: { start_time: '2026-09-04T10:00:00Z', end_time: '2026-09-04T11:30:00Z', duration_minutes: 90 },
|
|
},
|
|
{
|
|
timestamp: 1757020000,
|
|
distance_meters: 5,
|
|
points_count: 20,
|
|
visit_details: { start_time: '2026-09-04T14:00:00Z', end_time: '2026-09-04T14:45:00Z', duration_minutes: 45 },
|
|
},
|
|
]);
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
// The nearest stay is the 5 m one and the first one is the earliest; the
|
|
// ninety-minute one in the middle is still the visit.
|
|
expect(scan.matches[0].match).toMatchObject({ minutes: 90, distanceMeters: 200 });
|
|
});
|
|
|
|
it('DAWARICH-SUG-027: a wish whose lookup fails reads as "no match", not as a failed scan', async () => {
|
|
const { user } = createUser(testDb);
|
|
await seedBucketItem(user.id, { name: 'Hallstatt' });
|
|
clientStub.findVisitsNear.mockRejectedValue(new Error('upstream is down'));
|
|
|
|
const scan = await svc.scanBucketList(user.id);
|
|
|
|
expect(scan.matches).toHaveLength(1);
|
|
expect(scan.matches[0].match).toBeNull();
|
|
});
|
|
});
|
|
|
|
// ── Atlas ────────────────────────────────────────────────────────────────────
|
|
|
|
describe('DawarichSuggestionsService — the Atlas hand-off', () => {
|
|
it('DAWARICH-SUG-028: acceptAtlasCountries marks every code through the Atlas with the dawarich source', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const marked = await svc.acceptAtlasCountries(user.id, ['de', ' fr ', 'us']);
|
|
|
|
expect(marked).toBe(3);
|
|
expect(atlasStub.markCountry).toHaveBeenCalledTimes(3);
|
|
expect(atlasStub.markCountry).toHaveBeenNthCalledWith(1, user.id, 'DE', 'dawarich');
|
|
expect(atlasStub.markCountry).toHaveBeenNthCalledWith(2, user.id, 'FR', 'dawarich');
|
|
expect(atlasStub.markCountry).toHaveBeenNthCalledWith(3, user.id, 'US', 'dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-042: the count is what was added, not what was asked for', async () => {
|
|
const { user } = createUser(testDb);
|
|
// A country already on the map is an INSERT OR IGNORE that changes nothing,
|
|
// and "2 countries added" for one country is a toast that lies.
|
|
atlasStub.markCountry.mockImplementation((_userId: number, code: string) => code === 'FR');
|
|
|
|
expect(await svc.acceptAtlasCountries(user.id, ['de', 'fr'])).toBe(1);
|
|
});
|
|
|
|
it('DAWARICH-SUG-029: anything that is not a two-letter code is skipped rather than written', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const marked = await svc.acceptAtlasCountries(user.id, ['XYZ', 'D', '', ' ', 'D1', 'at']);
|
|
|
|
expect(marked).toBe(1);
|
|
expect(atlasStub.markCountry).toHaveBeenCalledTimes(1);
|
|
expect(atlasStub.markCountry).toHaveBeenCalledWith(user.id, 'AT', 'dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-030: atlasSuggestions codes what it can, lists what it cannot, and flags what TREK already has', async () => {
|
|
const { user } = createUser(testDb);
|
|
// A hand mark, as the Atlas reports it back: the map merges visited_countries
|
|
// into its own list, so it is the map that is asked, not the table.
|
|
atlasStub.stats.mockResolvedValue({ countries: [{ code: 'DE', status: 'visited' }] });
|
|
clientStub.listVisitedCities.mockResolvedValue([
|
|
{ country: 'Germany', cities: [{ city: 'Berlin', stayed_for: 120, timestamp: 1757000000 }] },
|
|
{ country: 'France', cities: [] },
|
|
{ country: 'Absurdistan', cities: [] },
|
|
]);
|
|
|
|
const suggestions = await svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01'));
|
|
|
|
expect(suggestions.countries.map((c) => c.countryCode)).toEqual(['DE', 'FR']);
|
|
expect(suggestions.countries[0]).toMatchObject({ sourceName: 'Germany', alreadyVisited: true });
|
|
expect(suggestions.countries[0].cities[0]).toMatchObject({ name: 'Berlin', minutes: 120 });
|
|
expect(suggestions.countries[1].alreadyVisited).toBe(false);
|
|
// A country TREK cannot code is still a country the user went to.
|
|
expect(suggestions.unresolved).toEqual(['Absurdistan']);
|
|
expect(atlasStub.stats).toHaveBeenCalledWith(user.id);
|
|
});
|
|
|
|
it('DAWARICH-SUG-063: a country the Atlas already paints from a past trip is not offered as new, hand mark or not', async () => {
|
|
// The map derives Japan from the places on a finished trip and needs no
|
|
// visited_countries row to do so. Offering it back, preselected, would
|
|
// make the dialog a list of things the user has known for years, and the
|
|
// toast afterwards would count countries that changed nothing on the map.
|
|
const { user } = createUser(testDb);
|
|
atlasStub.stats.mockResolvedValue({
|
|
countries: [
|
|
{ code: 'JP', status: 'visited' },
|
|
// Planned is a future trip: not on the map as visited yet, so still news.
|
|
{ code: 'FR', status: 'planned' },
|
|
],
|
|
});
|
|
clientStub.listVisitedCities.mockResolvedValue([
|
|
{ country: 'Japan', cities: [{ city: 'Tokyo', stayed_for: 600 }] },
|
|
{ country: 'France', cities: [] },
|
|
{ country: 'Austria', cities: [] },
|
|
]);
|
|
|
|
const suggestions = await svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01'));
|
|
|
|
expect(suggestions.countries.map((c) => [c.countryCode, c.alreadyVisited])).toEqual([
|
|
['JP', true],
|
|
['FR', false],
|
|
['AT', false],
|
|
]);
|
|
expect(await countRows(t, VisitedCountries, { user: user.id })).toBe(0);
|
|
});
|
|
|
|
it('DAWARICH-SUG-064: the shape the Atlas answers for a user without trips carries no status and reads as visited', async () => {
|
|
// With no trips at all the map lists only hand marks, without a status
|
|
// field, and paints every one of them as visited.
|
|
const { user } = createUser(testDb);
|
|
atlasStub.stats.mockResolvedValue({ countries: [{ code: 'DE' }] });
|
|
clientStub.listVisitedCities.mockResolvedValue([{ country: 'Germany', cities: [] }]);
|
|
|
|
const suggestions = await svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01'));
|
|
|
|
expect(suggestions.countries).toHaveLength(1);
|
|
expect(suggestions.countries[0]).toMatchObject({ countryCode: 'DE', alreadyVisited: true });
|
|
});
|
|
|
|
it('DAWARICH-SUG-057: atlasSuggestions without a connection refuses before a request', async () => {
|
|
const { user } = createUser(testDb);
|
|
dawarichStub.getCredentials.mockReturnValue(null);
|
|
|
|
const err = await asyncRefusalFrom(() =>
|
|
svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01')),
|
|
);
|
|
|
|
expect(err.status).toBe(400);
|
|
expect(err.code).toBe('not_connected');
|
|
expect(clientStub.listVisitedCities).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('DAWARICH-SUG-058: a country with no name is dropped, and a nameless city does not become a blank row', async () => {
|
|
// The endpoint groups by a name string it derived itself, so an entry can
|
|
// arrive with that field empty or missing entirely. Those are the rows that
|
|
// would otherwise reach the Atlas dialog as an empty checkbox.
|
|
clientStub.listVisitedCities.mockResolvedValue([
|
|
{ cities: [] },
|
|
{ country: ' ', cities: [{ city: 'Nowhere' }] },
|
|
{ country: 'Austria' },
|
|
{ country: 'Germany', cities: [{ city: '' }, { city: 'Berlin' }] },
|
|
]);
|
|
|
|
const { user } = createUser(testDb);
|
|
const suggestions = await svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01'));
|
|
|
|
expect(suggestions.countries.map((c) => c.countryCode)).toEqual(['AT', 'DE']);
|
|
// No cities array at all is an empty list, not a crash.
|
|
expect(suggestions.countries[0].cities).toEqual([]);
|
|
// A city with neither a stay length nor a timestamp still counts as a city
|
|
// the user was in; it just has nothing to say about when.
|
|
expect(suggestions.countries[1].cities).toEqual([{ name: 'Berlin', minutes: 0, lastSeenAt: null }]);
|
|
expect(suggestions.unresolved).toEqual([]);
|
|
});
|
|
|
|
it('DAWARICH-SUG-062: a hole in the cities array, and a city object without the field, are both dropped', async () => {
|
|
// `/countries/visited_cities` is upstream JSON that TREK does not validate,
|
|
// so the array can hold a null where a city object should be, or an object
|
|
// that simply never got the field. Both have to fall through to the empty
|
|
// name the filter removes: reading `.city` off a null would take the whole
|
|
// Atlas hand-off down, and one malformed city is not worth losing the
|
|
// country it sat in.
|
|
clientStub.listVisitedCities.mockResolvedValue([
|
|
{ country: 'Germany', cities: [null, {}, { city: 'Hamburg', stayed_for: 45 }] },
|
|
]);
|
|
|
|
const { user } = createUser(testDb);
|
|
const suggestions = await svc.atlasSuggestions(user.id, new Date('2026-08-01'), new Date('2026-09-01'));
|
|
|
|
expect(suggestions.countries.map((c) => c.countryCode)).toEqual(['DE']);
|
|
expect(suggestions.countries[0].cities).toEqual([{ name: 'Hamburg', minutes: 45, lastSeenAt: null }]);
|
|
});
|
|
// ── What an acceptance tells the rest of the trip ──────────────────────────
|
|
|
|
it('DAWARICH-SUG-031: accepting as a place broadcasts it like any other place, socket id and all', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id, name: 'Museum Ludwig' });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'place', tripId: trip.id }, 'socket-7');
|
|
|
|
expect(placesStub.broadcast).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
'place:created',
|
|
{ place: expect.objectContaining({ id: result.createdPlaceId }) },
|
|
'socket-7',
|
|
);
|
|
// The journey mirror is the other half of what the places controller does.
|
|
expect(placesStub.onCreated).toHaveBeenCalledWith(String(trip.id), result.createdPlaceId);
|
|
});
|
|
|
|
it('DAWARICH-SUG-060: the broadcast carries the re-read row, so everyone on the trip sees the dawarich mark', async () => {
|
|
// `source` is stamped after PlacesService.create returns, so the object
|
|
// that call handed back does not have it. Broadcasting that one would leave
|
|
// every other client showing the place without its provenance until the
|
|
// next full load, which is the state this re-read exists to avoid.
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id, name: 'Museum Ludwig' });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
const payload = placesStub.broadcast.mock.calls[0][2] as { place: { id: number; source: string | null } };
|
|
expect(payload.place.id).toBe(result.createdPlaceId);
|
|
expect(payload.place.source).toBe('dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-061: a re-read that comes back empty still broadcasts the place that was created', async () => {
|
|
// The re-read is an improvement on the payload, not a precondition for it:
|
|
// if it finds nothing the acceptance has still happened, and a broadcast
|
|
// the trip never receives is a place that needs a page reload to appear.
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
// Plan 3h Task 3: the re-read is `PlacesRepository.findWithTagsAndRatings`
|
|
// now, injected directly (no more `DatabaseService.getPlaceWithTags`
|
|
// indirection) — spied directly on the real repository instance.
|
|
const getPlaceWithTagsSpy = vi.spyOn(placesRepo, 'findWithTagsAndRatings').mockResolvedValueOnce(null);
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'place', tripId: trip.id }, 'socket-3');
|
|
getPlaceWithTagsSpy.mockRestore();
|
|
|
|
expect(placesStub.broadcast).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
'place:created',
|
|
{ place: { id: result.createdPlaceId } },
|
|
'socket-3',
|
|
);
|
|
});
|
|
|
|
it('DAWARICH-SUG-039: a member refused place_edit is refused here too', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
const id = await seedSuggestion({ userId: member.id, tripId: trip.id });
|
|
permissionsStub.checkPermission.mockImplementation((action: string) => action !== 'place_edit');
|
|
|
|
await expect(svc.accept(member.id, id, { target: 'place', tripId: trip.id })).rejects.toThrow(AcceptError);
|
|
// Nothing written, and the stay is still waiting rather than marked handled.
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-040: pinning to a day asks day_edit as well, and writes nothing without it', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
const day = createDay(testDb, trip.id, { date: '2026-09-01' });
|
|
const id = await seedSuggestion({ userId: member.id, tripId: trip.id });
|
|
permissionsStub.checkPermission.mockImplementation((action: string) => action !== 'day_edit');
|
|
|
|
await expect(svc.accept(member.id, id, { target: 'place', tripId: trip.id, dayId: day.id })).rejects.toThrow(AcceptError);
|
|
expect(placesStub.create).not.toHaveBeenCalled();
|
|
expect((await rowOf(id)).state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-041: the permission is asked about the trip owner, not about the caller', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
const id = await seedSuggestion({ userId: member.id, tripId: trip.id });
|
|
|
|
await svc.accept(member.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
expect(permissionsStub.checkPermission).toHaveBeenCalledWith('place_edit', 'user', owner.id, member.id, true);
|
|
});
|
|
|
|
it('DAWARICH-SUG-038: a place made from a recording says where it came from', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
|
|
const result = await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
const place = await findRow(t, Places, { id: result.createdPlaceId });
|
|
expect(place?.source).toBe('dawarich');
|
|
});
|
|
|
|
it('DAWARICH-SUG-032: a stay accepted onto a day broadcasts the assignment too', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const day = createDay(testDb, trip.id, { date: '2026-09-01' });
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
assignmentsStub.createAssignment.mockReturnValue({ id: 4242, day_id: day.id });
|
|
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id, dayId: day.id }, 'socket-9');
|
|
|
|
expect(assignmentsStub.broadcast).toHaveBeenCalledWith(
|
|
String(trip.id),
|
|
'assignment:created',
|
|
{ assignment: { id: 4242, day_id: day.id } },
|
|
'socket-9',
|
|
);
|
|
});
|
|
|
|
it('DAWARICH-SUG-033: an assignment the domain refuses to create is not broadcast as one', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const day = createDay(testDb, trip.id, { date: '2026-09-01' });
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
assignmentsStub.createAssignment.mockReturnValue(undefined);
|
|
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id, dayId: day.id });
|
|
|
|
expect(assignmentsStub.broadcast).not.toHaveBeenCalled();
|
|
});
|
|
|
|
// ── An acceptance whose result was deleted ────────────────────────────────
|
|
//
|
|
// Deleting the place is how somebody says "not that one" after the fact. The
|
|
// stay then has nothing to show for itself and belongs back in the review
|
|
// list; leaving it under "already dealt with" is a dead end, because the row
|
|
// points at a place that is gone and accepting it again is refused as a
|
|
// duplicate.
|
|
|
|
it('DAWARICH-SUG-034: deleting the place an acceptance created puts the stay back into review', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
const result = await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
expect((await rowOf(id)).state).toBe('accepted');
|
|
|
|
await deleteRows(t, Places, { id: result.createdPlaceId });
|
|
|
|
const listed = (await svc.list(user.id, {})).suggestions.find((s) => s.id === id)!;
|
|
expect(listed.state).toBe('new');
|
|
expect(listed.target).toBeNull();
|
|
expect(listed.acceptedPlaceId).toBeNull();
|
|
// And it can be accepted again rather than answering 409 forever.
|
|
await expect(svc.accept(user.id, id, { target: 'place', tripId: trip.id })).resolves.not.toThrow();
|
|
});
|
|
|
|
it('DAWARICH-SUG-035: an acceptance whose place still exists is left alone', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: trip.id });
|
|
await svc.accept(user.id, id, { target: 'place', tripId: trip.id });
|
|
|
|
const listed = (await svc.list(user.id, {})).suggestions.find((s) => s.id === id)!;
|
|
expect(listed.state).toBe('accepted');
|
|
expect(listed.acceptedPlaceId).not.toBeNull();
|
|
});
|
|
|
|
it('DAWARICH-SUG-036: a journal acceptance reopens once its entry is gone', async () => {
|
|
const { user } = createUser(testDb);
|
|
const id = await seedSuggestion({ userId: user.id, tripId: null });
|
|
const journeyId = await insertRow(t, Journeys, { user: user.id, title: 'Trip diary', status: 'active', created_at: 0, updated_at: 0 });
|
|
const entryId = await insertRow(t, JourneyEntries, {
|
|
journey: journeyId,
|
|
author: user.id,
|
|
type: 'entry',
|
|
title: 'Cafe',
|
|
entry_date: '2026-09-01',
|
|
created_at: 0,
|
|
updated_at: 0,
|
|
});
|
|
journeyStub.createEntry.mockReturnValue({ id: entryId });
|
|
|
|
await svc.accept(user.id, id, { target: 'journal', journalId: journeyId });
|
|
expect((await svc.list(user.id, {})).suggestions.find((s) => s.id === id)!.state).toBe('accepted');
|
|
|
|
await deleteRows(t, JourneyEntries, { id: entryId });
|
|
|
|
expect((await svc.list(user.id, {})).suggestions.find((s) => s.id === id)!.state).toBe('new');
|
|
});
|
|
|
|
it('DAWARICH-SUG-037: reopening is scoped to the caller — another user\'s orphan stays put', async () => {
|
|
const { user: mine } = createUser(testDb);
|
|
const { user: theirs } = createUser(testDb);
|
|
const trip = createTrip(testDb, theirs.id);
|
|
const id = await seedSuggestion({ userId: theirs.id, tripId: trip.id });
|
|
const result = await svc.accept(theirs.id, id, { target: 'place', tripId: trip.id });
|
|
await deleteRows(t, Places, { id: result.createdPlaceId });
|
|
|
|
await svc.list(mine.id, {});
|
|
|
|
expect((await rowOf(id)).state).toBe('accepted');
|
|
});
|
|
});
|