mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 03:50:30 +00:00
fix(atlas): count a place's country on the dashboard the way the Atlas map does
The passport card and the last/next trip countries read place countries from the place_regions cache alone, while the Atlas map falls back to the bundled borders for a place without a cached region. A place in Vatican City never gets a region row (the region bundle has no VA features and Nominatim names no region there), so the map counted VA and the card did not. The same gap hid any country whose place was still waiting for its background lookup, or whose lookup had failed. Both views now resolve each place through one helper: the cached country first, the borders otherwise, once per location. The dashboard reads every place of a started trip with its cached country instead of the distinct cached codes, and the trip countries count resolved places the same way. The MCP travel stats tool and the public stats API use the same service methods and are fixed with it. Closes #2875
This commit is contained in:
@@ -120,104 +120,57 @@ describe('PlaceRegionsRepository.listDistinctRegionCodesForCountryAndPlaces (AT2
|
||||
});
|
||||
});
|
||||
|
||||
describe('PlaceRegionsRepository.countPlacesByCountryForTrip (AT40)', () => {
|
||||
it('PLACEREGREPO-007: matches the legacy GROUP BY statement, ordered by count DESC then country ASC, NULL country excluded', async () => {
|
||||
describe('PlaceRegionsRepository.listPlaceCountriesForTrip (AT40)', () => {
|
||||
it('PLACEREGREPO-007: every place of the trip with its cached country, null where none is cached, other trips left out', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id);
|
||||
const other = createTrip(testDb, user.id);
|
||||
const fr1 = createPlace(testDb, trip.id);
|
||||
const fr2 = createPlace(testDb, trip.id);
|
||||
const de1 = createPlace(testDb, trip.id);
|
||||
const noRegion = createPlace(testDb, trip.id);
|
||||
await insertPlaceRegion(fr1.id, 'FR', 'FR-IDF', 'Île-de-France');
|
||||
await insertPlaceRegion(fr2.id, 'FR', 'FR-PAC', 'Provence');
|
||||
await insertPlaceRegion(de1.id, 'DE', 'DE-BY', 'Bavaria');
|
||||
// A different trip's place must not leak in.
|
||||
const cached = createPlace(testDb, trip.id, { lat: 48.85, lng: 2.35 });
|
||||
const uncached = createPlace(testDb, trip.id, { lat: 41.9022, lng: 12.4539 });
|
||||
await insertPlaceRegion(cached.id, 'FR', 'FR-IDF', 'Île-de-France');
|
||||
const foreign = createPlace(testDb, other.id);
|
||||
await insertPlaceRegion(foreign.id, 'FR', 'FR-IDF', 'Île-de-France');
|
||||
void noRegion;
|
||||
|
||||
// test-sql-allow: the raw statement is the legacy oracle this parity test holds the repository to.
|
||||
const legacy = testDb
|
||||
.prepare(
|
||||
`
|
||||
SELECT pr.country_code, COUNT(DISTINCT p.id) AS places
|
||||
FROM place_regions pr JOIN places p ON p.id = pr.place_id
|
||||
WHERE p.trip_id = ? AND pr.country_code IS NOT NULL
|
||||
GROUP BY pr.country_code ORDER BY places DESC, pr.country_code ASC`,
|
||||
)
|
||||
.all(trip.id);
|
||||
const typed = await repo.countPlacesByCountryForTrip(trip.id);
|
||||
expect(typed).toEqual(legacy);
|
||||
expect(typed).toEqual([
|
||||
{ country_code: 'FR', places: 2 },
|
||||
{ country_code: 'DE', places: 1 },
|
||||
expect(await repo.listPlaceCountriesForTrip(trip.id)).toEqual([
|
||||
{ id: cached.id, lat: 48.85, lng: 2.35, address: null, country_code: 'FR' },
|
||||
{ id: uncached.id, lat: 41.9022, lng: 12.4539, address: null, country_code: null },
|
||||
]);
|
||||
});
|
||||
|
||||
it('PLACEREGREPO-008: empty array for a trip with no geocoded places', async () => {
|
||||
it('PLACEREGREPO-008: empty array for a trip without places', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id);
|
||||
expect(await repo.countPlacesByCountryForTrip(trip.id)).toEqual([]);
|
||||
expect(await repo.listPlaceCountriesForTrip(trip.id)).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('PlaceRegionsRepository.listVisitedCountryCodesForUser (AT44)', () => {
|
||||
it('PLACEREGREPO-009: matches the legacy statement — owner and member trips count, only started trips, deduped, NULL country excluded', async () => {
|
||||
describe('PlaceRegionsRepository.listStartedTripPlaceCountriesForUser (AT44)', () => {
|
||||
it('PLACEREGREPO-009: owner and member see the places of started trips once each, cached or not', async () => {
|
||||
const { user: owner } = createUser(testDb);
|
||||
const { user: member } = createUser(testDb);
|
||||
const { user: other } = createUser(testDb);
|
||||
const { user: stranger } = createUser(testDb);
|
||||
const started = createTrip(testDb, owner.id, { start_date: '2020-01-01', end_date: '2020-01-10' });
|
||||
const notStarted = createTrip(testDb, owner.id, { start_date: '2099-01-01', end_date: '2099-01-10' });
|
||||
const dateless = createTrip(testDb, owner.id);
|
||||
// Two members: the trip_members join must not repeat a place per member.
|
||||
addTripMember(testDb, started.id, member.id);
|
||||
addTripMember(testDb, started.id, other.id);
|
||||
|
||||
const startedPlace = createPlace(testDb, started.id);
|
||||
await insertPlaceRegion(startedPlace.id, 'FR', 'FR-IDF', 'Île-de-France');
|
||||
const startedPlace2 = createPlace(testDb, started.id);
|
||||
await insertPlaceRegion(startedPlace2.id, 'FR', 'FR-PAC', 'Provence'); // same country, dedup target
|
||||
const notStartedPlace = createPlace(testDb, notStarted.id);
|
||||
await insertPlaceRegion(notStartedPlace.id, 'DE', 'DE-BY', 'Bavaria'); // not started, excluded
|
||||
const cached = createPlace(testDb, started.id, { lat: 48.85, lng: 2.35 });
|
||||
await insertPlaceRegion(cached.id, 'FR', 'FR-IDF', 'Île-de-France');
|
||||
const uncached = createPlace(testDb, started.id, { lat: 41.9022, lng: 12.4539 });
|
||||
const future = createPlace(testDb, notStarted.id);
|
||||
await insertPlaceRegion(future.id, 'DE', 'DE-BY', 'Bavaria');
|
||||
createPlace(testDb, dateless.id);
|
||||
|
||||
const today = '2026-01-01';
|
||||
// test-sql-allow: the raw statement is the legacy oracle this parity test holds the repository to.
|
||||
const legacy = testDb
|
||||
.prepare(
|
||||
`
|
||||
SELECT DISTINCT pr.country_code
|
||||
FROM place_regions pr
|
||||
JOIN places p ON p.id = pr.place_id
|
||||
JOIN trips t ON p.trip_id = t.id
|
||||
LEFT JOIN trip_members tm ON t.id = tm.trip_id
|
||||
WHERE (t.user_id = ? OR tm.user_id = ?)
|
||||
AND pr.country_code IS NOT NULL
|
||||
AND COALESCE(t.start_date, t.end_date) IS NOT NULL
|
||||
AND COALESCE(t.start_date, t.end_date) <= ?`,
|
||||
)
|
||||
.all(owner.id, owner.id, today);
|
||||
|
||||
const typedOwner = await repo.listVisitedCountryCodesForUser(owner.id, today);
|
||||
expect(typedOwner).toEqual(legacy.map((r: unknown) => (r as { country_code: string }).country_code));
|
||||
expect(typedOwner).toEqual(['FR']);
|
||||
|
||||
// test-sql-allow: the raw statement is the legacy oracle this parity test holds the repository to.
|
||||
const legacyMember = testDb
|
||||
.prepare(
|
||||
`
|
||||
SELECT DISTINCT pr.country_code
|
||||
FROM place_regions pr
|
||||
JOIN places p ON p.id = pr.place_id
|
||||
JOIN trips t ON p.trip_id = t.id
|
||||
LEFT JOIN trip_members tm ON t.id = tm.trip_id
|
||||
WHERE (t.user_id = ? OR tm.user_id = ?)
|
||||
AND pr.country_code IS NOT NULL
|
||||
AND COALESCE(t.start_date, t.end_date) IS NOT NULL
|
||||
AND COALESCE(t.start_date, t.end_date) <= ?`,
|
||||
)
|
||||
.all(member.id, member.id, today);
|
||||
const typedMember = await repo.listVisitedCountryCodesForUser(member.id, today);
|
||||
expect(typedMember).toEqual(legacyMember.map((r: unknown) => (r as { country_code: string }).country_code));
|
||||
expect(typedMember).toEqual(['FR']);
|
||||
|
||||
expect(await repo.listVisitedCountryCodesForUser(stranger.id, today)).toEqual([]);
|
||||
const expected = [
|
||||
{ id: cached.id, lat: 48.85, lng: 2.35, address: null, country_code: 'FR' },
|
||||
{ id: uncached.id, lat: 41.9022, lng: 12.4539, address: null, country_code: null },
|
||||
];
|
||||
expect(await repo.listStartedTripPlaceCountriesForUser(owner.id, today)).toEqual(expected);
|
||||
expect(await repo.listStartedTripPlaceCountriesForUser(member.id, today)).toEqual(expected);
|
||||
expect(await repo.listStartedTripPlaceCountriesForUser(stranger.id, today)).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -272,6 +272,116 @@ describe('getTravelStats', () => {
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* The passport card counted a place's country only once its region sat in
|
||||
* place_regions, while the Atlas map falls back to the borders. A place in
|
||||
* Vatican City never gets a region row (the region bundle has none for it, and
|
||||
* Nominatim names no region there), so the map showed VA and the card did not.
|
||||
*/
|
||||
describe('place countries without a cached region (#2875)', () => {
|
||||
const PAST_START = '2023-05-01';
|
||||
const PAST_END = '2023-05-10';
|
||||
const VATICAN = { lat: 41.9022, lng: 12.4539 };
|
||||
|
||||
async function addPlace(
|
||||
tripId: number,
|
||||
name: string,
|
||||
values: { lat?: number | null; lng?: number | null; address?: string | null },
|
||||
) {
|
||||
return insertRow(await sharedTestOrm(testDb), Places, { trip: tripId, name }, { lat: null, lng: null, ...values });
|
||||
}
|
||||
|
||||
async function cacheRegion(placeId: number, countryCode: string, regionCode: string) {
|
||||
await upsertRow(await sharedTestOrm(testDb), PlaceRegions, {
|
||||
place: placeId,
|
||||
country_code: countryCode,
|
||||
region_code: regionCode,
|
||||
region_name: regionCode,
|
||||
});
|
||||
}
|
||||
|
||||
it('TRAVEL-2875-001: a place in Vatican City stamps VA on the passport card', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id, { title: 'Rome', start_date: PAST_START, end_date: PAST_END });
|
||||
await addPlace(trip.id, "St. Peter's Basilica", VATICAN);
|
||||
|
||||
expect((await atlas.getTravelStats(user.id)).countries).toContain('VA');
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-002: any place still waiting for its region lookup counts by its borders', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id, { title: 'Paris', start_date: PAST_START, end_date: PAST_END });
|
||||
await addPlace(trip.id, 'Louvre', { lat: 48.8606, lng: 2.3376 });
|
||||
|
||||
expect((await atlas.getTravelStats(user.id)).countries).toEqual(['FR']);
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-003: the passport card and the Atlas map list the same visited countries', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id, { title: 'Rome', start_date: PAST_START, end_date: PAST_END });
|
||||
await addPlace(trip.id, "St. Peter's Basilica", VATICAN);
|
||||
const colosseumId = await addPlace(trip.id, 'Colosseum', { lat: 41.8902, lng: 12.4922 });
|
||||
await cacheRegion(colosseumId, 'IT', 'IT-62');
|
||||
|
||||
const atlasVisited = (await atlas.stats(user.id)).countries
|
||||
.filter((c) => c.status === 'visited')
|
||||
.map((c) => c.code)
|
||||
.sort();
|
||||
expect(atlasVisited).toEqual(['IT', 'VA']);
|
||||
expect([...(await atlas.getTravelStats(user.id)).countries].sort()).toEqual(atlasVisited);
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-004: a Vatican place on a trip that has not started stays off the card (#1048)', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const start = new Date(Date.now() + 30 * 86_400_000).toISOString().slice(0, 10);
|
||||
const trip = createTrip(testDb, user.id, { title: 'Rome, next month', start_date: start, end_date: start });
|
||||
await addPlace(trip.id, "St. Peter's Basilica", VATICAN);
|
||||
|
||||
expect((await atlas.getTravelStats(user.id)).countries).not.toContain('VA');
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-005: a place without coordinates counts by a country its address spells out, never by a bare code (#2111)', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const named = createTrip(testDb, user.id, { title: 'Named', start_date: PAST_START, end_date: PAST_END });
|
||||
await addPlace(named.id, 'Vatican Museums', { address: 'Viale Vaticano, Vatican City' });
|
||||
|
||||
expect((await atlas.getTravelStats(user.id)).countries).toEqual(['VA']);
|
||||
|
||||
const { user: other } = createUser(testDb);
|
||||
const bare = createTrip(testDb, other.id, { title: 'Bare', start_date: PAST_START, end_date: PAST_END });
|
||||
await addPlace(bare.id, 'Somewhere in Virginia', { address: 'Richmond, VA' });
|
||||
|
||||
expect((await atlas.getTravelStats(other.id)).countries).toEqual([]);
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-006: the last trip names Vatican City when that is all it went to', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id, {
|
||||
title: 'Day in the Vatican',
|
||||
start_date: PAST_START,
|
||||
end_date: PAST_END,
|
||||
});
|
||||
await addPlace(trip.id, "St. Peter's Basilica", VATICAN);
|
||||
await addPlace(trip.id, 'Sistine Chapel', VATICAN);
|
||||
|
||||
expect((await atlas.lastTrip(user.id))?.countries).toEqual(['VA']);
|
||||
});
|
||||
|
||||
it('TRAVEL-2875-007: the last trip ranks cached and resolved places together, most places first', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
const trip = createTrip(testDb, user.id, { title: 'Rome', start_date: PAST_START, end_date: PAST_END });
|
||||
const colosseumId = await addPlace(trip.id, 'Colosseum', { lat: 41.8902, lng: 12.4922 });
|
||||
await cacheRegion(colosseumId, 'it', 'IT-62');
|
||||
await addPlace(trip.id, 'Pantheon', { lat: 41.8986, lng: 12.4769 });
|
||||
await addPlace(trip.id, "St. Peter's Basilica", VATICAN);
|
||||
await addPlace(trip.id, 'Sistine Chapel', VATICAN);
|
||||
await addPlace(trip.id, 'Vatican Museums', VATICAN);
|
||||
|
||||
// The cached lower-case "it" and the resolved IT are one country with two places.
|
||||
expect((await atlas.lastTrip(user.id))?.countries).toEqual(['VA', 'IT']);
|
||||
});
|
||||
});
|
||||
|
||||
describe('travel-stats quirk fixes', () => {
|
||||
it('AUTH-DB-089: getTravelStats keeps a place at lat 0 / lng 0 (equator, prime meridian)', async () => {
|
||||
const { user } = createUser(testDb);
|
||||
|
||||
Reference in New Issue
Block a user