Merge branch 'main' into oauth-flow-module
This commit is contained in:
Ullrich Schäfer
GitHub
commit
5e70aff9fa
31 changed files with 617 additions and 758 deletions
|
|
@ -4,8 +4,8 @@ import { unionAll } from "drizzle-orm/pg-core";
|
|||
import { getDb } from "./db.ts";
|
||||
import { activities, routes, syncImports, users, follows, remoteActors } from "@trails-cool/db/schema/journal";
|
||||
import type { Visibility } from "@trails-cool/db/schema/journal";
|
||||
import { validateGpx, writeGeom } from "./gpx-save.server.ts";
|
||||
import type { GpxData } from "./gpx-save.server.ts";
|
||||
import { processGpx, writeGeom } from "./gpx-save.server.ts";
|
||||
import type { ProcessedGpx } from "./gpx-save.server.ts";
|
||||
import { enqueueOptional } from "./boss.server.ts";
|
||||
import type { OwnedRef } from "./ownership.server.ts";
|
||||
import {
|
||||
|
|
@ -70,7 +70,7 @@ export async function createActivity(ownerId: string, input: ActivityInput) {
|
|||
const db = getDb();
|
||||
const id = randomUUID();
|
||||
|
||||
let parsed: GpxData | null = null;
|
||||
let processed: ProcessedGpx | null = null;
|
||||
let distance: number | null = input.distance ?? null;
|
||||
let elevationGain: number | null = null;
|
||||
let elevationLoss: number | null = null;
|
||||
|
|
@ -78,13 +78,12 @@ export async function createActivity(ownerId: string, input: ActivityInput) {
|
|||
const duration: number | null = input.duration ?? null;
|
||||
|
||||
if (input.gpx) {
|
||||
parsed = await validateGpx(input.gpx);
|
||||
distance = parsed.distance || distance;
|
||||
elevationGain = parsed.elevation.gain;
|
||||
elevationLoss = parsed.elevation.loss;
|
||||
if (!startedAt && parsed.tracks[0]?.[0]?.time) {
|
||||
startedAt = new Date(parsed.tracks[0][0].time);
|
||||
}
|
||||
processed = await processGpx(input.gpx);
|
||||
// GPX-derived distance wins unless it is zero; caller input is the fallback
|
||||
distance = processed.stats.distance || distance;
|
||||
elevationGain = processed.stats.elevationGain;
|
||||
elevationLoss = processed.stats.elevationLoss;
|
||||
startedAt = startedAt ?? processed.stats.startTime;
|
||||
}
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
|
|
@ -104,9 +103,8 @@ export async function createActivity(ownerId: string, input: ActivityInput) {
|
|||
...(input.synthetic ? { synthetic: true } : {}),
|
||||
});
|
||||
|
||||
if (input.gpx && parsed) {
|
||||
const coords = parsed.tracks.flat().map((p) => [p.lon, p.lat] as [number, number]);
|
||||
await writeGeom(tx, id, "activities", coords);
|
||||
if (input.gpx && processed) {
|
||||
await writeGeom(tx, id, "activities", processed.coords);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -332,8 +330,7 @@ export async function createRouteFromActivity(ownedActivity: OwnedRef): Promise<
|
|||
.where(and(eq(activities.id, activityId), eq(activities.ownerId, ownerId)));
|
||||
if (!activity?.gpx) return null;
|
||||
|
||||
const parsed = await validateGpx(activity.gpx);
|
||||
const coords = parsed.tracks.flat().map((p) => [p.lon, p.lat] as [number, number]);
|
||||
const { coords } = await processGpx(activity.gpx);
|
||||
const routeId = randomUUID();
|
||||
|
||||
await db.transaction(async (tx) => {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import type { z } from "zod";
|
||||
import { getAuthenticatedUser } from "./oauth.server.ts";
|
||||
import { TERMS_VERSION } from "./legal.ts";
|
||||
import { ERROR_CODES } from "@trails-cool/api";
|
||||
|
|
@ -36,3 +37,19 @@ export async function requireApiUser(request: Request) {
|
|||
export function apiError(status: number, code: string, message: string, fields?: Array<{ field: string; message: string }>) {
|
||||
return Response.json({ error: message, code, fields }, { status });
|
||||
}
|
||||
|
||||
/**
|
||||
* Respond with a payload validated against its @trails-cool/api
|
||||
* contract. The schema is enforced, not advisory: a handler whose
|
||||
* payload drifts from the contract fails its unit tests / e2e run with
|
||||
* a ZodError instead of silently shipping a different wire shape.
|
||||
* Parsing also strips unknown keys, so the response is exactly the
|
||||
* contract — nothing extra leaks.
|
||||
*/
|
||||
export function apiJson<S extends z.ZodType>(
|
||||
schema: S,
|
||||
payload: z.input<S>,
|
||||
init?: ResponseInit,
|
||||
): Response {
|
||||
return Response.json(schema.parse(payload), init);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { getDb } from "./db.ts";
|
|||
import { activities, routes, users } from "@trails-cool/db/schema/journal";
|
||||
import { createRoute } from "./routes.server.ts";
|
||||
import { createActivity } from "./activities.server.ts";
|
||||
import { validateGpx } from "./gpx-save.server.ts";
|
||||
import { processGpx } from "./gpx-save.server.ts";
|
||||
import { TERMS_VERSION } from "./legal.ts";
|
||||
import { logger } from "./logger.server.ts";
|
||||
import {
|
||||
|
|
@ -649,10 +649,8 @@ export async function generateOneWalk(
|
|||
const name = templateName(now, locale, persona);
|
||||
const description = templateDescription(now, locale, persona);
|
||||
|
||||
const parsed = await validateGpx(result.gpx);
|
||||
const distance = parsed.distance;
|
||||
const elevationGain = parsed.elevation.gain;
|
||||
const elevationLoss = parsed.elevation.loss;
|
||||
const { stats } = await processGpx(result.gpx);
|
||||
const { distance, elevationGain, elevationLoss } = stats;
|
||||
|
||||
if (!distance || distance < 500) return null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import { validateGpx, GpxValidationError } from "./gpx-save.server.ts";
|
||||
import { generateGpx } from "@trails-cool/gpx";
|
||||
import { processGpx, validateGpx, GpxValidationError } from "./gpx-save.server.ts";
|
||||
|
||||
const VALID_GPX = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gpx version="1.1" xmlns="http://www.topografix.com/GPX/1/1">
|
||||
|
|
@ -84,3 +85,68 @@ describe("validateGpx", () => {
|
|||
expect(err.name).toBe("GpxValidationError");
|
||||
});
|
||||
});
|
||||
|
||||
const TIMED_GPX = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gpx version="1.1" xmlns="http://www.topografix.com/GPX/1/1">
|
||||
<metadata><desc>An alpine loop</desc></metadata>
|
||||
<trk>
|
||||
<trkseg>
|
||||
<trkpt lat="47.0" lon="8.0"><ele>500</ele><time>2026-06-01T08:00:00Z</time></trkpt>
|
||||
<trkpt lat="47.1" lon="8.1"><ele>520</ele><time>2026-06-01T09:00:00Z</time></trkpt>
|
||||
</trkseg>
|
||||
</trk>
|
||||
</gpx>`;
|
||||
|
||||
describe("processGpx", () => {
|
||||
it("extracts coords in [lon, lat] PostGIS axis order", async () => {
|
||||
const { coords } = await processGpx(VALID_GPX);
|
||||
expect(coords).toEqual([
|
||||
[8.0, 47.0],
|
||||
[8.1, 47.1],
|
||||
[8.2, 47.2],
|
||||
]);
|
||||
});
|
||||
|
||||
it("derives distance, elevation, description, and start time", async () => {
|
||||
const { stats } = await processGpx(TIMED_GPX);
|
||||
expect(stats.distance).toBeGreaterThan(0);
|
||||
expect(stats.elevationGain).not.toBeNull();
|
||||
expect(stats.elevationLoss).not.toBeNull();
|
||||
expect(stats.description).toBe("An alpine loop");
|
||||
expect(stats.startTime).toEqual(new Date("2026-06-01T08:00:00Z"));
|
||||
});
|
||||
|
||||
it("returns null startTime and empty dayBreaks when absent", async () => {
|
||||
const { stats } = await processGpx(VALID_GPX);
|
||||
expect(stats.startTime).toBeNull();
|
||||
expect(stats.dayBreaks).toEqual([]);
|
||||
});
|
||||
|
||||
it("derives dayBreaks from day-break waypoints (round-trip via generateGpx)", async () => {
|
||||
const gpx = generateGpx({
|
||||
name: "Multi-day",
|
||||
waypoints: [
|
||||
{ lat: 47.0, lon: 8.0, name: "Start" },
|
||||
{ lat: 47.1, lon: 8.1, name: "Hut", isDayBreak: true },
|
||||
{ lat: 47.2, lon: 8.2, name: "End" },
|
||||
],
|
||||
tracks: [[
|
||||
{ lat: 47.0, lon: 8.0 },
|
||||
{ lat: 47.1, lon: 8.1 },
|
||||
{ lat: 47.2, lon: 8.2 },
|
||||
]],
|
||||
});
|
||||
|
||||
const { stats } = await processGpx(gpx);
|
||||
expect(stats.dayBreaks).toEqual([1]);
|
||||
});
|
||||
|
||||
it("propagates GpxValidationError from validation", async () => {
|
||||
await expect(processGpx(ONE_POINT_GPX)).rejects.toThrow(GpxValidationError);
|
||||
});
|
||||
|
||||
it("returns the parsed GpxData so callers never re-parse", async () => {
|
||||
const { parsed } = await processGpx(VALID_GPX);
|
||||
expect(parsed.tracks.flat()).toHaveLength(3);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -45,6 +45,51 @@ export async function validateGpx(gpx: string): Promise<GpxData> {
|
|||
return parsed;
|
||||
}
|
||||
|
||||
export interface GpxStats {
|
||||
distance: number | null;
|
||||
elevationGain: number | null;
|
||||
elevationLoss: number | null;
|
||||
/** Indices of waypoints flagged as day breaks. */
|
||||
dayBreaks: number[];
|
||||
/** GPX-level description, when present. */
|
||||
description?: string;
|
||||
/** Timestamp of the first track point, when present. */
|
||||
startTime: Date | null;
|
||||
}
|
||||
|
||||
export interface ProcessedGpx {
|
||||
parsed: GpxData;
|
||||
/** [lon, lat] pairs in PostGIS axis order, ready for writeGeom. */
|
||||
coords: Array<[number, number]>;
|
||||
stats: GpxStats;
|
||||
}
|
||||
|
||||
/**
|
||||
* The validate-and-derive step every GPX save starts with: parse +
|
||||
* validate (throws GpxValidationError), extract the geometry
|
||||
* coordinates, and derive the stats rows store. Callers own the
|
||||
* precedence between these derived stats and caller-supplied ones —
|
||||
* routes let explicit input win wholesale, activities prefer the GPX
|
||||
* distance unless it is zero.
|
||||
*/
|
||||
export async function processGpx(gpx: string): Promise<ProcessedGpx> {
|
||||
const parsed = await validateGpx(gpx);
|
||||
return {
|
||||
parsed,
|
||||
coords: parsed.tracks.flat().map((p) => [p.lon, p.lat] as [number, number]),
|
||||
stats: {
|
||||
distance: parsed.distance ?? null,
|
||||
elevationGain: parsed.elevation.gain ?? null,
|
||||
elevationLoss: parsed.elevation.loss ?? null,
|
||||
dayBreaks: parsed.waypoints
|
||||
.map((w, i) => (w.isDayBreak ? i : -1))
|
||||
.filter((i) => i >= 0),
|
||||
description: parsed.description,
|
||||
startTime: parsed.tracks[0]?.[0]?.time ? new Date(parsed.tracks[0][0].time) : null,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
type Tx = Parameters<Parameters<Database["transaction"]>[0]>[0];
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import { getDb } from "./db.ts";
|
|||
import { routes, routeVersions } from "@trails-cool/db/schema/journal";
|
||||
import type { Visibility } from "@trails-cool/db/schema/journal";
|
||||
import { sql } from "drizzle-orm";
|
||||
import { validateGpx, writeGeom } from "./gpx-save.server.ts";
|
||||
import type { GpxData } from "./gpx-save.server.ts";
|
||||
import { processGpx, writeGeom } from "./gpx-save.server.ts";
|
||||
import type { ProcessedGpx } from "./gpx-save.server.ts";
|
||||
import type { OwnedRef } from "./ownership.server.ts";
|
||||
|
||||
export interface RouteInput {
|
||||
|
|
@ -26,21 +26,17 @@ export async function createRoute(ownerId: string, input: RouteInput) {
|
|||
const db = getDb();
|
||||
const id = randomUUID();
|
||||
|
||||
let parsed: GpxData | null = null;
|
||||
let processed: ProcessedGpx | null = null;
|
||||
let distance: number | null = input.distance ?? null;
|
||||
let elevationGain: number | null = input.elevationGain ?? null;
|
||||
let elevationLoss: number | null = input.elevationLoss ?? null;
|
||||
let dayBreaks: number[] = input.dayBreaks ?? [];
|
||||
|
||||
if (input.gpx) {
|
||||
parsed = await validateGpx(input.gpx);
|
||||
// Only compute stats from GPX if not pre-supplied by caller
|
||||
processed = await processGpx(input.gpx);
|
||||
// Only use GPX-derived stats if not pre-supplied by caller
|
||||
if (input.distance === undefined) {
|
||||
const stats = computeRouteStats(parsed);
|
||||
distance = stats.distance;
|
||||
elevationGain = stats.elevationGain;
|
||||
elevationLoss = stats.elevationLoss;
|
||||
dayBreaks = stats.dayBreaks;
|
||||
({ distance, elevationGain, elevationLoss, dayBreaks } = processed.stats);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -60,9 +56,8 @@ export async function createRoute(ownerId: string, input: RouteInput) {
|
|||
...(input.synthetic ? { synthetic: true } : {}),
|
||||
});
|
||||
|
||||
if (input.gpx && parsed) {
|
||||
const coords = parsed.tracks.flat().map((p) => [p.lon, p.lat] as [number, number]);
|
||||
await writeGeom(tx, id, "routes", coords);
|
||||
if (input.gpx && processed) {
|
||||
await writeGeom(tx, id, "routes", processed.coords);
|
||||
|
||||
await tx.insert(routeVersions).values({
|
||||
id: randomUUID(),
|
||||
|
|
@ -135,9 +130,9 @@ export async function updateRoute(route: OwnedRef, input: Partial<RouteInput>) {
|
|||
const { id, ownerId } = route;
|
||||
const db = getDb();
|
||||
|
||||
let parsed: GpxData | null = null;
|
||||
let processed: ProcessedGpx | null = null;
|
||||
if (input.gpx) {
|
||||
parsed = await validateGpx(input.gpx);
|
||||
processed = await processGpx(input.gpx);
|
||||
}
|
||||
|
||||
const updateData: Record<string, unknown> = { updatedAt: new Date() };
|
||||
|
|
@ -145,8 +140,8 @@ export async function updateRoute(route: OwnedRef, input: Partial<RouteInput>) {
|
|||
if (input.description !== undefined) updateData.description = input.description;
|
||||
if (input.visibility !== undefined) updateData.visibility = input.visibility;
|
||||
|
||||
if (input.gpx && parsed) {
|
||||
const stats = computeRouteStats(parsed);
|
||||
if (input.gpx && processed) {
|
||||
const { stats } = processed;
|
||||
updateData.gpx = input.gpx;
|
||||
updateData.distance = stats.distance;
|
||||
updateData.elevationGain = stats.elevationGain;
|
||||
|
|
@ -163,9 +158,8 @@ export async function updateRoute(route: OwnedRef, input: Partial<RouteInput>) {
|
|||
.set(updateData)
|
||||
.where(and(eq(routes.id, id), eq(routes.ownerId, ownerId)));
|
||||
|
||||
if (input.gpx && parsed) {
|
||||
const coords = parsed.tracks.flat().map((p) => [p.lon, p.lat] as [number, number]);
|
||||
await writeGeom(tx, id, "routes", coords);
|
||||
if (input.gpx && processed) {
|
||||
await writeGeom(tx, id, "routes", processed.coords);
|
||||
|
||||
const existingVersions = await tx
|
||||
.select()
|
||||
|
|
@ -197,19 +191,6 @@ export async function deleteRoute(route: OwnedRef) {
|
|||
return result.length > 0;
|
||||
}
|
||||
|
||||
function computeRouteStats(gpxData: GpxData) {
|
||||
const dayBreaks = gpxData.waypoints
|
||||
.map((w, i) => (w.isDayBreak ? i : -1))
|
||||
.filter((i) => i >= 0);
|
||||
return {
|
||||
distance: gpxData.distance,
|
||||
elevationGain: gpxData.elevation.gain,
|
||||
elevationLoss: gpxData.elevation.loss,
|
||||
dayBreaks,
|
||||
description: gpxData.description,
|
||||
};
|
||||
}
|
||||
|
||||
async function getGeojson(table: "routes" | "activities", id: string): Promise<string | null> {
|
||||
try {
|
||||
const db = getDb();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import type { Route } from "./+types/api.v1.activities.$id";
|
||||
import { requireApiUser, apiError } from "~/lib/api-guard.server";
|
||||
import { requireApiUser, apiError, apiJson } from "~/lib/api-guard.server";
|
||||
import { getActivity, deleteActivity } from "~/lib/activities.server";
|
||||
import { loadOwnedActivity } from "~/lib/ownership.server";
|
||||
import { ERROR_CODES } from "@trails-cool/api";
|
||||
import { ERROR_CODES, ActivityDetailSchema } from "@trails-cool/api";
|
||||
|
||||
/** GET /api/v1/activities/:id — full activity detail */
|
||||
export async function loader({ request, params }: Route.LoaderArgs) {
|
||||
|
|
@ -13,11 +13,14 @@ export async function loader({ request, params }: Route.LoaderArgs) {
|
|||
return apiError(404, ERROR_CODES.NOT_FOUND, "Activity not found");
|
||||
}
|
||||
|
||||
return Response.json({
|
||||
return apiJson(ActivityDetailSchema, {
|
||||
id: activity.id,
|
||||
name: activity.name,
|
||||
description: activity.description,
|
||||
description: activity.description ?? "",
|
||||
routeId: activity.routeId,
|
||||
routeName: null, // TODO: join route name (matches the list endpoint)
|
||||
photos: [], // no photos on this surface yet; contract field
|
||||
|
||||
distance: activity.distance,
|
||||
duration: activity.duration,
|
||||
elevationGain: activity.elevationGain,
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
import type { Route } from "./+types/api.v1.activities._index";
|
||||
import { requireApiUser, apiError } from "~/lib/api-guard.server";
|
||||
import { requireApiUser, apiError, apiJson } from "~/lib/api-guard.server";
|
||||
import { listActivities, createActivity } from "~/lib/activities.server";
|
||||
import {
|
||||
PaginationQuerySchema,
|
||||
CreateActivityRequestSchema,
|
||||
ERROR_CODES,
|
||||
zodIssuesToFieldErrors,
|
||||
ActivityListResponseSchema,
|
||||
CreateActivityResponseSchema,
|
||||
} from "@trails-cool/api";
|
||||
|
||||
/** GET /api/v1/activities — paginated activity list */
|
||||
|
|
@ -32,11 +34,11 @@ export async function loader({ request }: Route.LoaderArgs) {
|
|||
const page = allActivities.slice(startIdx, startIdx + limit);
|
||||
const nextCursor = startIdx + limit < allActivities.length ? page[page.length - 1]?.id ?? null : null;
|
||||
|
||||
return Response.json({
|
||||
return apiJson(ActivityListResponseSchema, {
|
||||
activities: page.map((a) => ({
|
||||
id: a.id,
|
||||
name: a.name,
|
||||
description: a.description,
|
||||
description: a.description ?? "",
|
||||
routeId: a.routeId,
|
||||
routeName: null, // TODO: join route name
|
||||
distance: a.distance,
|
||||
|
|
@ -67,5 +69,5 @@ export async function action({ request }: Route.ActionArgs) {
|
|||
...parsed.data,
|
||||
startedAt: parsed.data.startedAt ? new Date(parsed.data.startedAt) : null,
|
||||
});
|
||||
return Response.json({ id }, { status: 201 });
|
||||
return apiJson(CreateActivityResponseSchema, { id }, { status: 201 });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import type { Route } from "./+types/api.v1.routes.$id";
|
||||
import { requireApiUser, apiError } from "~/lib/api-guard.server";
|
||||
import { requireApiUser, apiError, apiJson } from "~/lib/api-guard.server";
|
||||
import { getRouteWithVersions, updateRoute, deleteRoute } from "~/lib/routes.server";
|
||||
import { loadOwnedRoute } from "~/lib/ownership.server";
|
||||
import { UpdateRouteRequestSchema, ERROR_CODES, zodIssuesToFieldErrors } from "@trails-cool/api";
|
||||
import { UpdateRouteRequestSchema, ERROR_CODES, zodIssuesToFieldErrors, RouteDetailSchema } from "@trails-cool/api";
|
||||
|
||||
/** GET /api/v1/routes/:id — full route detail */
|
||||
export async function loader({ request, params }: Route.LoaderArgs) {
|
||||
|
|
@ -13,10 +13,10 @@ export async function loader({ request, params }: Route.LoaderArgs) {
|
|||
return apiError(404, ERROR_CODES.NOT_FOUND, "Route not found");
|
||||
}
|
||||
|
||||
return Response.json({
|
||||
return apiJson(RouteDetailSchema, {
|
||||
id: route.id,
|
||||
name: route.name,
|
||||
description: route.description,
|
||||
description: route.description ?? "",
|
||||
distance: route.distance,
|
||||
elevationGain: route.elevationGain,
|
||||
elevationLoss: route.elevationLoss,
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
import type { Route } from "./+types/api.v1.routes._index";
|
||||
import { requireApiUser, apiError } from "~/lib/api-guard.server";
|
||||
import { requireApiUser, apiError, apiJson } from "~/lib/api-guard.server";
|
||||
import { listRoutes, createRoute } from "~/lib/routes.server";
|
||||
import {
|
||||
PaginationQuerySchema,
|
||||
CreateRouteRequestSchema,
|
||||
ERROR_CODES,
|
||||
zodIssuesToFieldErrors,
|
||||
RouteListResponseSchema,
|
||||
CreateRouteResponseSchema,
|
||||
} from "@trails-cool/api";
|
||||
|
||||
/** GET /api/v1/routes — paginated route list */
|
||||
|
|
@ -32,11 +34,11 @@ export async function loader({ request }: Route.LoaderArgs) {
|
|||
const page = allRoutes.slice(startIdx, startIdx + limit);
|
||||
const nextCursor = startIdx + limit < allRoutes.length ? page[page.length - 1]?.id ?? null : null;
|
||||
|
||||
return Response.json({
|
||||
return apiJson(RouteListResponseSchema, {
|
||||
routes: page.map((r) => ({
|
||||
id: r.id,
|
||||
name: r.name,
|
||||
description: r.description,
|
||||
description: r.description ?? "",
|
||||
distance: r.distance,
|
||||
elevationGain: r.elevationGain,
|
||||
elevationLoss: r.elevationLoss,
|
||||
|
|
@ -63,5 +65,5 @@ export async function action({ request }: Route.ActionArgs) {
|
|||
}
|
||||
|
||||
const id = await createRoute(user.id, parsed.data);
|
||||
return Response.json({ id }, { status: 201 });
|
||||
return apiJson(CreateRouteResponseSchema, { id }, { status: 201 });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
|
|||
import { TERMS_VERSION } from "~/lib/legal";
|
||||
|
||||
const mockUser = { id: "user-1", email: "test@test.com", username: "test", domain: "localhost", displayName: null, bio: null, createdAt: new Date(), termsVersion: TERMS_VERSION };
|
||||
const ROUTE_ID = "11111111-1111-4111-8111-111111111111";
|
||||
const VERSION_ID = "22222222-2222-4222-8222-222222222222";
|
||||
const NEW_ID = "33333333-3333-4333-8333-333333333333";
|
||||
const mockGetAuthenticatedUser = vi.fn();
|
||||
const mockListRoutes = vi.fn();
|
||||
const mockCreateRoute = vi.fn();
|
||||
|
|
@ -51,7 +54,7 @@ describe("GET /api/v1/routes", () => {
|
|||
const now = new Date();
|
||||
mockListRoutes.mockResolvedValue([
|
||||
{
|
||||
id: "r1", name: "Tour", description: "", distance: 42000,
|
||||
id: ROUTE_ID, name: "Tour", description: "", distance: 42000,
|
||||
elevationGain: 340, elevationLoss: 320, routingProfile: "fastbike",
|
||||
dayBreaks: [], geojson: null, ownerId: "user-1", gpx: null,
|
||||
tags: null, plannerState: null, createdAt: now, updatedAt: now,
|
||||
|
|
@ -63,7 +66,7 @@ describe("GET /api/v1/routes", () => {
|
|||
const data = await resp.json();
|
||||
|
||||
expect(data.routes).toHaveLength(1);
|
||||
expect(data.routes[0].id).toBe("r1");
|
||||
expect(data.routes[0].id).toBe(ROUTE_ID);
|
||||
expect(data.nextCursor).toBeNull();
|
||||
});
|
||||
|
||||
|
|
@ -83,7 +86,7 @@ describe("GET /api/v1/routes", () => {
|
|||
|
||||
describe("POST /api/v1/routes", () => {
|
||||
it("creates a route with valid body", async () => {
|
||||
mockCreateRoute.mockResolvedValue("new-id");
|
||||
mockCreateRoute.mockResolvedValue(NEW_ID);
|
||||
const { action } = await import("./api.v1.routes._index.ts");
|
||||
|
||||
const resp = await action(routeArgs(
|
||||
|
|
@ -95,7 +98,7 @@ describe("POST /api/v1/routes", () => {
|
|||
|
||||
expect(resp.status).toBe(201);
|
||||
const data = await resp.json();
|
||||
expect(data.id).toBe("new-id");
|
||||
expect(data.id).toBe(NEW_ID);
|
||||
});
|
||||
|
||||
it("returns 400 on validation error", async () => {
|
||||
|
|
@ -117,20 +120,20 @@ describe("GET /api/v1/routes/:id", () => {
|
|||
it("returns route detail", async () => {
|
||||
const now = new Date();
|
||||
mockGetRouteWithVersions.mockResolvedValue({
|
||||
id: "r1", name: "Tour", description: "", distance: 42000,
|
||||
id: ROUTE_ID, name: "Tour", description: "", distance: 42000,
|
||||
elevationGain: 340, elevationLoss: 320, routingProfile: "fastbike",
|
||||
dayBreaks: [], gpx: "<gpx/>", ownerId: "user-1",
|
||||
tags: null, plannerState: null, createdAt: now, updatedAt: now,
|
||||
versions: [{ id: "v1", routeId: "r1", version: 1, gpx: "<gpx/>", createdBy: "user-1", changeDescription: null, createdAt: now }],
|
||||
versions: [{ id: VERSION_ID, routeId: ROUTE_ID, version: 1, gpx: "<gpx/>", createdBy: "user-1", changeDescription: null, createdAt: now }],
|
||||
});
|
||||
|
||||
const { loader } = await import("./api.v1.routes.$id.ts");
|
||||
const resp = await loader(routeArgs(
|
||||
authRequest("/api/v1/routes/r1"), { id: "r1" }, "api/v1/routes/:id",
|
||||
authRequest(`/api/v1/routes/${ROUTE_ID}`), { id: ROUTE_ID }, "api/v1/routes/:id",
|
||||
)) as Response;
|
||||
|
||||
const data = await resp.json();
|
||||
expect(data.id).toBe("r1");
|
||||
expect(data.id).toBe(ROUTE_ID);
|
||||
expect(data.gpx).toBe("<gpx/>");
|
||||
expect(data.versions).toHaveLength(1);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
"@trails-cool/map-core": "workspace:*",
|
||||
"@trails-cool/sentry-config": "workspace:*",
|
||||
"@trails-cool/types": "workspace:*",
|
||||
"expo": "~56.0.4",
|
||||
"expo": "~56.0.9",
|
||||
"expo-constants": "~56.0.17",
|
||||
"expo-crypto": "~56.0.4",
|
||||
"expo-dev-client": "~56.0.19",
|
||||
|
|
@ -62,10 +62,10 @@
|
|||
"react": "catalog:",
|
||||
"react-native": "0.85.3",
|
||||
"react-native-gesture-handler": "^2.31.2",
|
||||
"react-native-reanimated": "^4.4.1",
|
||||
"react-native-safe-area-context": "~5.8.0",
|
||||
"react-native-reanimated": "^4.3.1",
|
||||
"react-native-safe-area-context": "~5.7.0",
|
||||
"react-native-screens": "~4.25.2",
|
||||
"react-native-worklets": "0.9.1",
|
||||
"react-native-worklets": "0.8.3",
|
||||
"use-latest-callback": "^0.3.4",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue