mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-13 07:40:59 +00:00
7277e35a96
The Atlas server no longer keeps the admin-1 regions of every country in memory. Each country's regions are now a pre-gzipped file of their own, sent to the map as they are. **Why:** `GET /addons/atlas/regions/geo?countries=…` built `admin1Store` (every country's region text, kept until restart), then joined the requested countries, `JSON.parse`d them, and Nest stringified them again. On the 512 MB – 1 GB boxes TREK runs on, the first z≥5 view could OOM the server (same shape as #1576). **What changes:** - `server/assets/atlas/admin1/<ISO_A2>.geojson.gz`: 198 files, 14.85 MB, the same 3,447 features as `admin1.geojson.gz`. - New `GET /addons/atlas/regions/geo/:code` with a Zod contract (`regionGeoParamsSchema` in `@trek/shared`: two letters, any case). It sends the country's file as it is, with `Content-Encoding: gzip` and the current 1-day `Cache-Control`, as `countries/geo` does. A country without regions gets an empty FeatureCollection. Anything that is not two letters gets a 400. - `useAtlas.ts` fetches one URL per uncached country and still rebuilds the layer once. Each country has a stable URL, so a country evicted by `REGION_CACHE_MAX` comes back from the browser cache. - `getRegionFeatures` reads only the country it needs. `admin1Store` is removed. - `?countries=` keeps working for cached PWA clients. It joins the per-country files as bytes, without a parse. - The migrations are untouched. `admin1.geojson.gz` still ships, only for `Migration20200101021500` and `Migration20200101031500`. This costs ~15 MB of disk in the image and no RAM. `build-atlas-geo.mjs` writes both, and ATLAS-BUNDLE-008 keeps them equal. **Memory** (real `atlas-geo` module, first z≥5 view over Europe = 49 country codes, JS heap + Buffers): | | peak | kept after | |---|---|---| | before, first view (builds the store) | +372 MB | +61 MB | | before, later views | +115 MB | 0 | | after, `/regions/geo/:code` | +4.7 MB | 0 | | after, legacy `?countries=` | +59 MB | 0 | **Tests:** - New: `atlas-region-files.test.ts` (moved from `atlas.service.test.ts`, plus join and dedupe cases), the `regionGeoParamsSchema` spec, ATLAS-BUNDLE-007 (the file format the byte join depends on), ATLAS-BUNDLE-008 (bundle and per-country files are equal), ATLAS-016/017/018 (the new route over HTTP, including the 400). - The `getVisitedRegions` tests (ATLAS-UNIT-019..024) used to pass only when `getRegionGeo`'s `beforeAll` had built the store first. They now also pass on their own. - The shared, server and client gates pass. Baselines go down only where this change removed code (`no-console`, `no-explicit-any`, `no-swallowed-catch`, file sizes). **Trade-offs:** - A first zoom over Europe sends ~49 small parallel requests instead of 1. Over HTTP/1.1 the browser queues them 6 at a time. The total bytes are the same (4.4 MB gz). - The per-country URLs are unversioned and cached for a day, like `countries/geo`. After an upgrade that changes a country's regions, a browser can show the old shapes for up to 24 h. Approved on Discord in #github-pr: <paste the thread link here> Related: #1576, #2559 - [x] Bug fix - [ ] New feature - [ ] Breaking change - [ ] Documentation update - [ ] I have read the [Contributing Guidelines](https://github.com/liketrek/TREK/wiki/Contributing) - [ ] My branch is [up to date with `dev`](https://github.com/liketrek/TREK/wiki/Development-environment#3-keep-your-fork-up-to-date) - [x] This PR targets the `dev` branch, not `main` *(wiki-only PRs are exempt)* - [x] I have tested my changes locally - [x] I have added/updated tests that prove my fix is effective or that my feature works - [x] I have updated documentation if needed
623 lines
25 KiB
TypeScript
623 lines
25 KiB
TypeScript
/**
|
|
* Atlas integration tests.
|
|
* Covers ATLAS-001 to ATLAS-008.
|
|
*/
|
|
import { buildApp } from '../../src/bootstrap';
|
|
import { db as testDb } from '../../src/db/database';
|
|
import { PlaceRegions } from '../../src/db/entities/PlaceRegions.entity';
|
|
import { authCookie } from '../helpers/auth';
|
|
import { createUser, createTrip } from '../helpers/factories';
|
|
import type { FactoryOrm } from '../helpers/factories/context';
|
|
import { makePlace } from '../helpers/factories/places';
|
|
import { findRow } from '../helpers/factories/rows';
|
|
import { resetTestDb, resetRateLimits } from '../helpers/test-db';
|
|
import { MikroORM } from '@mikro-orm/core';
|
|
import type { INestApplication } from '@nestjs/common';
|
|
|
|
import type { Application } from 'express';
|
|
import request from 'supertest';
|
|
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
|
|
|
vi.mock('../../src/db/database', async () => {
|
|
const { createSnapshotTestDb, buildDbMock } = await import('../helpers/db-mock');
|
|
return buildDbMock(createSnapshotTestDb());
|
|
});
|
|
|
|
let nestApp: INestApplication;
|
|
let app: Application;
|
|
/** The app's own ORM, which the factories seed and read through. */
|
|
const orm = (): FactoryOrm => nestApp.get(MikroORM);
|
|
|
|
beforeAll(async () => {
|
|
// Stub the admin-1 GeoJSON download so /regions/geo is deterministic and never
|
|
// hits the real network (the un-stubbed fetch of a ~4600-feature file from
|
|
// raw.githubusercontent.com is what made ATLAS-013 hang/time out under load).
|
|
// Any other outbound fetch (e.g. background reverse-geocoding) returns empty so
|
|
// no test depends on live network.
|
|
vi.stubGlobal('fetch', async (url: unknown) => {
|
|
if (String(url).includes('natural-earth-vector')) {
|
|
return new Response(
|
|
JSON.stringify({
|
|
type: 'FeatureCollection',
|
|
features: [
|
|
{ type: 'Feature', properties: { iso_a2: 'DE' }, geometry: { type: 'Point', coordinates: [10, 51] } },
|
|
{ type: 'Feature', properties: { iso_a2: 'FR' }, geometry: { type: 'Point', coordinates: [2, 47] } },
|
|
],
|
|
}),
|
|
{ status: 200, headers: { 'Content-Type': 'application/json' } },
|
|
);
|
|
}
|
|
return new Response('{}', { status: 200, headers: { 'Content-Type': 'application/json' } });
|
|
});
|
|
|
|
nestApp = await buildApp();
|
|
app = nestApp.getHttpAdapter().getInstance();
|
|
}, 60_000);
|
|
|
|
beforeEach(async () => {
|
|
resetTestDb(testDb);
|
|
await resetRateLimits(nestApp);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
vi.unstubAllGlobals();
|
|
await nestApp.close();
|
|
testDb.close();
|
|
});
|
|
|
|
describe('Atlas stats', () => {
|
|
it('ATLAS-001 — GET /api/atlas/stats returns stats object', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toHaveProperty('countries');
|
|
expect(res.body).toHaveProperty('stats');
|
|
});
|
|
|
|
it('ATLAS-014 — a future trip is returned as planned and excluded from totalCountries (#1048)', async () => {
|
|
const { user } = createUser(testDb);
|
|
// Offsets from today rather than literal dates, so this cannot expire.
|
|
const iso = (days: number) => new Date(Date.now() + days * 86_400_000).toISOString().slice(0, 10);
|
|
const past = createTrip(testDb, user.id, { title: 'Rome, last month', start_date: iso(-40), end_date: iso(-30) });
|
|
const future = createTrip(testDb, user.id, { title: 'Tokyo, next month', start_date: iso(30), end_date: iso(40) });
|
|
// No coordinates and no category: the country has to come from the address.
|
|
const unplaced = { lat: null, lng: null, category: null };
|
|
await makePlace(orm(), past.id, { ...unplaced, name: 'Colosseum', address: 'Piazza del Colosseo, Rome, Italy' });
|
|
await makePlace(orm(), future.id, { ...unplaced, name: 'Senso-ji', address: 'Asakusa, Tokyo, Japan' });
|
|
|
|
const res = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
const countries = res.body.countries as { code: string; status: string }[];
|
|
expect(countries.find((c) => c.code === 'IT')?.status).toBe('visited');
|
|
expect(countries.find((c) => c.code === 'JP')?.status).toBe('planned');
|
|
expect(res.body.stats.totalCountries).toBe(1);
|
|
expect(res.body.stats.totalCountriesPlanned).toBe(1);
|
|
// The whole point: the map gets more countries than the passport counter shows.
|
|
expect(countries.length).toBeGreaterThan(res.body.stats.totalCountries);
|
|
});
|
|
|
|
it('ATLAS-002 — GET /api/atlas/country/:code returns places in country', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).get('/api/addons/atlas/country/FR').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(Array.isArray(res.body.places)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Mark/unmark country', () => {
|
|
it('ATLAS-003 — POST /country/:code/mark marks country as visited', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).post('/api/addons/atlas/country/DE/mark').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
|
|
// Verify it appears in visited countries
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
|
expect(codes).toContain('DE');
|
|
});
|
|
|
|
it('ATLAS-004 — DELETE /country/:code/mark unmarks country', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app).post('/api/addons/atlas/country/IT/mark').set('Cookie', authCookie(user.id));
|
|
|
|
const res = await request(app).delete('/api/addons/atlas/country/IT/mark').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe('Bucket list', () => {
|
|
it('ATLAS-005 — POST /bucket-list creates a bucket list item', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Machu Picchu', country_code: 'PE', lat: -13.1631, lng: -72.545 });
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.item.name).toBe('Machu Picchu');
|
|
});
|
|
|
|
it('ATLAS-005 — POST without name returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ country_code: 'JP' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('ATLAS-005 — POST the same item twice returns 409 and keeps one row (#1898)', async () => {
|
|
const { user } = createUser(testDb);
|
|
const body = { name: 'Japan', country_code: 'JP' };
|
|
|
|
const first = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send(body);
|
|
expect(first.status).toBe(201);
|
|
|
|
const second = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send(body);
|
|
expect(second.status).toBe(409);
|
|
expect(second.body).toEqual({ error: 'Already on your bucket list' });
|
|
|
|
const list = await request(app).get('/api/addons/atlas/bucket-list').set('Cookie', authCookie(user.id));
|
|
expect(list.body.items).toHaveLength(1);
|
|
});
|
|
|
|
it('ATLAS-005 — POST the same item for another target date is allowed (#1898)', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const undated = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Japan', country_code: 'JP', target_date: null });
|
|
expect(undated.status).toBe(201);
|
|
|
|
const dated = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Japan', country_code: 'JP', target_date: '2027-05' });
|
|
expect(dated.status).toBe(201);
|
|
|
|
const list = await request(app).get('/api/addons/atlas/bucket-list').set('Cookie', authCookie(user.id));
|
|
expect(list.body.items).toHaveLength(2);
|
|
});
|
|
|
|
it('ATLAS-006 — GET /bucket-list returns items', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Santorini', country_code: 'GR' });
|
|
|
|
const res = await request(app).get('/api/addons/atlas/bucket-list').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.items).toHaveLength(1);
|
|
});
|
|
|
|
it('ATLAS-007 — PUT /bucket-list/:id updates item', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const create = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Old Name' });
|
|
const id = create.body.item.id;
|
|
|
|
const res = await request(app)
|
|
.put(`/api/addons/atlas/bucket-list/${id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'New Name', notes: 'Updated' });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.item.name).toBe('New Name');
|
|
});
|
|
|
|
it('ATLAS-007 — PUT onto an existing wish returns 409 and leaves the row alone (#1898)', async () => {
|
|
const { user } = createUser(testDb);
|
|
await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Japan', country_code: 'JP', target_date: '2027-05' });
|
|
const second = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Japan', country_code: 'JP', target_date: '2028-09' });
|
|
|
|
const res = await request(app)
|
|
.put(`/api/addons/atlas/bucket-list/${second.body.item.id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ target_date: '2027-05' });
|
|
expect(res.status).toBe(409);
|
|
expect(res.body).toEqual({ error: 'Already on your bucket list' });
|
|
|
|
const list = await request(app).get('/api/addons/atlas/bucket-list').set('Cookie', authCookie(user.id));
|
|
expect(list.body.items.map((i: { target_date: string }) => i.target_date).sort()).toEqual(['2027-05', '2028-09']);
|
|
});
|
|
|
|
it('ATLAS-008 — DELETE /bucket-list/:id removes item', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const create = await request(app)
|
|
.post('/api/addons/atlas/bucket-list')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Tokyo' });
|
|
const id = create.body.item.id;
|
|
|
|
const del = await request(app).delete(`/api/addons/atlas/bucket-list/${id}`).set('Cookie', authCookie(user.id));
|
|
expect(del.status).toBe(200);
|
|
expect(del.body.success).toBe(true);
|
|
|
|
const list = await request(app).get('/api/addons/atlas/bucket-list').set('Cookie', authCookie(user.id));
|
|
expect(list.body.items).toHaveLength(0);
|
|
});
|
|
|
|
it('ATLAS-008 — DELETE non-existent item returns 404', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).delete('/api/addons/atlas/bucket-list/99999').set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(404);
|
|
});
|
|
});
|
|
|
|
describe('Mark/unmark region', () => {
|
|
it('ATLAS-009 — POST /region/:code/mark marks a region as visited', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
});
|
|
|
|
it('ATLAS-009 — POST /region/:code/mark without name returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ country_code: 'DE' });
|
|
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('ATLAS-009 — POST /region/:code/mark without country_code returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen' });
|
|
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('ATLAS-009 — marking a region also auto-marks the parent country', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
|
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
|
expect(codes).toContain('DE');
|
|
});
|
|
|
|
it('ATLAS-009 — marking the same region twice is idempotent', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
const res = await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
expect(res.status).toBe(200);
|
|
});
|
|
|
|
it('ATLAS-010 — GET /regions returns marked regions grouped by country', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-BY/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Bayern', country_code: 'DE' });
|
|
|
|
const res = await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toHaveProperty('regions');
|
|
const deRegions = res.body.regions['DE'] as any[];
|
|
expect(deRegions).toBeDefined();
|
|
const codes = deRegions.map((r: any) => r.code);
|
|
expect(codes).toContain('DE-NW');
|
|
expect(codes).toContain('DE-BY');
|
|
});
|
|
|
|
it('ATLAS-011 — DELETE /region/:code/mark unmarks a region', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
const del = await request(app).delete('/api/addons/atlas/region/DE-NW/mark').set('Cookie', authCookie(user.id));
|
|
|
|
expect(del.status).toBe(200);
|
|
expect(del.body.success).toBe(true);
|
|
|
|
const res = await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
|
|
const deRegions = res.body.regions['DE'] as any[] | undefined;
|
|
const codes = (deRegions || []).map((r: any) => r.code);
|
|
expect(codes).not.toContain('DE-NW');
|
|
});
|
|
|
|
it('ATLAS-011 — unmark last region in country also unmarks the parent country', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
await request(app).delete('/api/addons/atlas/region/DE-NW/mark').set('Cookie', authCookie(user.id));
|
|
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
|
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
|
expect(codes).not.toContain('DE');
|
|
});
|
|
|
|
it('ATLAS-011 — unmark one region keeps country when another region remains', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-BY/mark')
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Bayern', country_code: 'DE' });
|
|
|
|
await request(app).delete('/api/addons/atlas/region/DE-NW/mark').set('Cookie', authCookie(user.id));
|
|
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(user.id));
|
|
|
|
const codes = (stats.body.countries as any[]).map((c: any) => c.code);
|
|
expect(codes).toContain('DE');
|
|
});
|
|
|
|
it('ATLAS-011: unmark last region keeps a country the user marked visited itself (#2597)', async () => {
|
|
const { user } = createUser(testDb);
|
|
const cookie = authCookie(user.id);
|
|
|
|
await request(app).post('/api/addons/atlas/country/NO/mark').set('Cookie', cookie);
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/NO-03/mark')
|
|
.set('Cookie', cookie)
|
|
.send({ name: 'Oslo', country_code: 'NO' });
|
|
await request(app).delete('/api/addons/atlas/region/NO-03/mark').set('Cookie', cookie);
|
|
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', cookie);
|
|
expect((stats.body.countries as { code: string }[]).map((c) => c.code)).toContain('NO');
|
|
const country = await request(app).get('/api/addons/atlas/country/NO').set('Cookie', cookie);
|
|
expect(country.body).toMatchObject({ manually_marked: true, marked_source: 'manual' });
|
|
const regions = await request(app).get('/api/addons/atlas/regions').set('Cookie', cookie);
|
|
expect(regions.body.regions['NO']).toBeUndefined();
|
|
});
|
|
|
|
it('ATLAS-011: a country first reached through a region stays once it is marked itself (#2597)', async () => {
|
|
const { user } = createUser(testDb);
|
|
const cookie = authCookie(user.id);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/NO-03/mark')
|
|
.set('Cookie', cookie)
|
|
.send({ name: 'Oslo', country_code: 'NO' });
|
|
const before = await request(app).get('/api/addons/atlas/country/NO').set('Cookie', cookie);
|
|
expect(before.body).toMatchObject({ manually_marked: true, marked_source: 'manual' });
|
|
|
|
await request(app).post('/api/addons/atlas/country/NO/mark').set('Cookie', cookie);
|
|
await request(app).delete('/api/addons/atlas/region/NO-03/mark').set('Cookie', cookie);
|
|
|
|
const stats = await request(app).get('/api/addons/atlas/stats').set('Cookie', cookie);
|
|
expect((stats.body.countries as { code: string }[]).map((c) => c.code)).toContain('NO');
|
|
});
|
|
|
|
it('ATLAS-011 — regions are isolated between users', async () => {
|
|
const { user: user1 } = createUser(testDb);
|
|
const { user: user2 } = createUser(testDb);
|
|
|
|
await request(app)
|
|
.post('/api/addons/atlas/region/DE-NW/mark')
|
|
.set('Cookie', authCookie(user1.id))
|
|
.send({ name: 'Nordrhein-Westfalen', country_code: 'DE' });
|
|
|
|
const res = await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user2.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
const deRegions = res.body.regions['DE'] as any[] | undefined;
|
|
expect(deRegions).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe('Regions geo', () => {
|
|
it('ATLAS-012 — GET /regions/geo without countries param returns empty FeatureCollection', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).get('/api/addons/atlas/regions/geo').set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toEqual({ type: 'FeatureCollection', features: [] });
|
|
});
|
|
|
|
it('ATLAS-013 — GET /regions/geo?countries=DE,FR returns FeatureCollection', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.get('/api/addons/atlas/regions/geo?countries=DE,FR')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toHaveProperty('type', 'FeatureCollection');
|
|
expect(
|
|
new Set((res.body.features as { properties: { iso_a2: string } }[]).map((f) => f.properties.iso_a2)),
|
|
).toEqual(new Set(['DE', 'FR']));
|
|
});
|
|
|
|
it('ATLAS-016 — GET /regions/geo/:code serves that country gzipped, cached for a day', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app)
|
|
.get('/api/addons/atlas/regions/geo/no')
|
|
.set('Accept-Encoding', 'gzip')
|
|
.set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.headers['content-encoding']).toBe('gzip');
|
|
expect(res.headers['cache-control']).toBe('public, max-age=86400');
|
|
expect(res.body.type).toBe('FeatureCollection');
|
|
expect(res.body.features.length).toBeGreaterThan(0);
|
|
expect((res.body.features as { properties: { iso_a2: string } }[]).every((f) => f.properties.iso_a2 === 'NO')).toBe(
|
|
true,
|
|
);
|
|
});
|
|
|
|
it('ATLAS-017 — GET /regions/geo/:code answers a country without regions with an empty FeatureCollection', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const res = await request(app).get('/api/addons/atlas/regions/geo/ZZ').set('Cookie', authCookie(user.id));
|
|
|
|
expect(res.status).toBe(200);
|
|
expect(res.body).toEqual({ type: 'FeatureCollection', features: [] });
|
|
});
|
|
|
|
it('ATLAS-018 — GET /regions/geo/:code refuses a code that is not two letters with a 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
|
|
const codes = ['NOR', '..%2Fadmin0'];
|
|
const answers = await Promise.all(
|
|
codes.map((code) => request(app).get(`/api/addons/atlas/regions/geo/${code}`).set('Cookie', authCookie(user.id))),
|
|
);
|
|
for (const [i, res] of answers.entries()) {
|
|
expect(res.status, codes[i]).toBe(400);
|
|
expect(res.body.error, codes[i]).toMatch(/^code: /);
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('A place that moves takes its Atlas country with it (#2527)', () => {
|
|
// The region cache is filled by a background task that GET /regions only starts,
|
|
// so wait for the row the way the next Atlas load would find it.
|
|
async function readRegion(placeId: number): Promise<{ country_code: string; region_code: string } | undefined> {
|
|
const row = await findRow(orm(), PlaceRegions, { place: placeId });
|
|
return row ? { country_code: row.country_code, region_code: row.region_code } : undefined;
|
|
}
|
|
|
|
async function regionRowOf(placeId: number): Promise<{ country_code: string; region_code: string } | undefined> {
|
|
for (let i = 0; i < 100; i++) {
|
|
const row = await readRegion(placeId);
|
|
if (row) return row;
|
|
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
async function atlasCountries(userId: number): Promise<string[]> {
|
|
const res = await request(app).get('/api/addons/atlas/stats').set('Cookie', authCookie(userId));
|
|
expect(res.status).toBe(200);
|
|
return (res.body.countries as { code: string }[]).map((c) => c.code);
|
|
}
|
|
|
|
it('ATLAS-015: correcting a place from France to Germany moves it on the Atlas', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id, {
|
|
title: 'Wrongly imported',
|
|
start_date: '2025-05-01',
|
|
end_date: '2025-05-05',
|
|
});
|
|
const place = await makePlace(orm(), trip.id, {
|
|
name: 'Hotel',
|
|
lat: 48.8566,
|
|
lng: 2.3522,
|
|
address: 'Rue de Rivoli, Paris, France',
|
|
category: null,
|
|
});
|
|
|
|
// The place is seen on the Atlas once, which caches France for it.
|
|
await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
expect((await regionRowOf(place.id))?.country_code).toBe('FR');
|
|
expect(await atlasCountries(user.id)).toEqual(['FR']);
|
|
|
|
// The user fixes the location in the trip.
|
|
const put = await request(app)
|
|
.put(`/api/trips/${trip.id}/places/${place.id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ lat: 52.5163, lng: 13.3777, address: 'Pariser Platz, Berlin, Germany' });
|
|
expect(put.status).toBe(200);
|
|
|
|
expect(await atlasCountries(user.id)).toEqual(['DE']);
|
|
|
|
// And the regions follow on the next load, with nothing left in France.
|
|
await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
expect((await regionRowOf(place.id))?.country_code).toBe('DE');
|
|
const regions = await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
expect(Object.keys(regions.body.regions)).toEqual(['DE']);
|
|
expect(await atlasCountries(user.id)).toEqual(['DE']);
|
|
});
|
|
|
|
it('ATLAS-015: an edit that leaves the location alone keeps the cached country', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id, { title: 'Paris', start_date: '2025-05-01', end_date: '2025-05-05' });
|
|
const place = await makePlace(orm(), trip.id, {
|
|
name: 'Louvre',
|
|
lat: 48.8606,
|
|
lng: 2.3376,
|
|
address: 'Rue de Rivoli, Paris, France',
|
|
category: null,
|
|
});
|
|
await request(app).get('/api/addons/atlas/regions').set('Cookie', authCookie(user.id));
|
|
const cached = await regionRowOf(place.id);
|
|
expect(cached?.country_code).toBe('FR');
|
|
|
|
// The place editor sends the whole form back, location included, for a notes edit.
|
|
const put = await request(app)
|
|
.put(`/api/trips/${trip.id}/places/${place.id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ notes: 'Closed on Tuesdays', lat: 48.8606, lng: 2.3376, address: 'Rue de Rivoli, Paris, France' });
|
|
expect(put.status).toBe(200);
|
|
|
|
expect(await readRegion(place.id)).toEqual(cached);
|
|
});
|
|
});
|