refactor: replace classic fetch/API with tRPC

Author: FunctionDJ

app/api/[trpc]/route.ts

@@ -0,0 +1,25 @@
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+import { journeys } from "../journeys/journeys";
+import { parseUrl } from "../parseUrl";
+import { splitJourney } from "../splitJourney/splitJourney";
+import { t } from "@/utils/trpc-init";
+
+const appRouter = t.router({
+	journeys,
+	splitJourney,
+	parseUrl,
+});
+
+export type AppRouter = typeof appRouter;
+
+const handler = (req: Request) =>
+	fetchRequestHandler({
+		endpoint: "/api",
+		req,
+		router: appRouter,
+		onError(opts) {
+			console.error("TRPC Error", opts.error.message);
+		},
+	});
+
+export { handler as GET, handler as POST };

app/api/_lib/error-handler.ts

@@ -0,0 +1,109 @@
+import { incrementApiCount } from "@/utils/apiCounter";
+import { vendoJourneySchema, type VendoJourney } from "@/utils/schemas";
+import type { SplitPoint } from "@/utils/types";
+import { createClient } from "db-vendo-client";
+import { profile as dbProfile } from "db-vendo-client/p/db/index";
+import { z } from "zod/v4";
+import type { QueryOptions } from "../splitJourney/QueryOptions";
+import { createSplitResult } from "../splitJourney/createSplitResult";
+import { findMatchingJourney } from "../splitJourney/findMatchingJourney";
+
+const client = createClient(dbProfile, "mail@lukasweihrauch.de");
+
+// Split Analysis Functions
+export async function analyzeSingleSplit(
+	originalJourney: VendoJourney,
+	splitPoint: SplitPoint,
+	queryOptions: QueryOptions,
+	originalPrice: number
+) {
+	const origin = originalJourney.legs[0].origin;
+	const destination =
+		originalJourney.legs[originalJourney.legs.length - 1].destination;
+	const originalDeparture = new Date(originalJourney.legs[0].departure);
+	const splitDeparture = new Date(splitPoint.departure);
+
+	try {
+		// Increment API counters for both segments
+		incrementApiCount(
+			"SPLIT_SEARCH_SEGMENT_1",
+			`${origin?.name} → ${splitPoint.station?.name}`
+		);
+		incrementApiCount(
+			"SPLIT_SEARCH_SEGMENT_2",
+			`${splitPoint.station?.name} → ${destination?.name}`
+		);
+
+		// Schema validation at entry point ensures origin/destination IDs exist
+
+		// Make both API calls in parallel using Promise.all
+		const [firstSegmentUntyped, secondSegmentUntyped] = await Promise.all([
+			client.journeys(origin!.id, splitPoint.station.id, {
+				...queryOptions,
+				departure: originalDeparture,
+			}),
+
+			client.journeys(splitPoint.station.id, destination!.id, {
+				...queryOptions,
+				departure: splitDeparture,
+			}),
+		]);
+
+		const clientJourneySchema = z.object({
+			journeys: z.array(vendoJourneySchema),
+		});
+
+		const firstSegment = clientJourneySchema.parse(firstSegmentUntyped);
+		const secondSegment = clientJourneySchema.parse(secondSegmentUntyped);
+
+		if (
+			firstSegment.journeys === undefined ||
+			secondSegment.journeys === undefined
+		) {
+			return null;
+		}
+
+		const firstJourney = findMatchingJourney(
+			firstSegment.journeys,
+			originalDeparture
+		);
+
+		if (!firstJourney) {
+			return null;
+		}
+
+		const secondJourney = findMatchingJourney(
+			secondSegment.journeys,
+			splitDeparture
+		);
+
+		if (!secondJourney) {
+			return null;
+		}
+
+		// Calculate pricing
+		const firstPrice = firstJourney.price?.amount || 0;
+		const secondPrice = secondJourney.price?.amount || 0;
+		const totalPrice = firstPrice + secondPrice;
+
+		if (totalPrice > 0 && totalPrice < originalPrice) {
+			return createSplitResult(
+				"single",
+				[splitPoint.station],
+				[firstJourney, secondJourney],
+				totalPrice,
+				originalPrice,
+				splitPoint.trainLine
+			);
+		}
+
+		return null;
+	} catch (error) {
+		const typedError = error as { message: string };
+		console.log(
+			`Single split analysis error at ${splitPoint.station.name}:`,
+			typedError.message
+		);
+		throw error; // Re-throw to be handled by Promise.allSettled
+	}
+}

app/api/journeys/_lib/configure-search-options.ts

@@ -0,0 +1,43 @@
+import type { inferRouterInputs } from "@trpc/server/unstable-core-do-not-import";
+import type { SearchJourneysOptions } from "db-vendo-client";
+import { data as loyaltyCards } from "db-vendo-client/format/loyalty-cards";
+import type { AppRouter } from "../[trpc]/route";
+
+export const configureSearchOptions = (
+	input: inferRouterInputs<AppRouter>["journeys"]
+) => {
+	const options: SearchJourneysOptions = {
+		results: input.type === "accurate-time" ? 5 : input.results, // Weniger Ergebnisse bei genauer Zeit um Rauschen zu reduzieren
+		stopovers: true,
+		// Bei genauer Abfahrtszeit wollen wir exakte Treffer, nicht verschiedene Alternativen
+		notOnlyFastRoutes: input.type === "accurate-time", // Nur schnelle Routen bei genauer Zeit
+		remarks: true, // Verbindungshinweise einschließen
+		transfers: -1, // System entscheidet über optimale Anzahl Umstiege
+		// Reiseklasse-Präferenz setzen - verwende firstClass boolean Parameter
+		firstClass: input.travelClass === 1, // true für erste Klasse, false für zweite Klasse
+		age: input.passengerAge, // Passagieralter für angemessene Preisgestaltung hinzufügen
+		departure: input.type === "accurate-time" ? input.departure : undefined, // Abfahrtszeit hinzufügen falls angegeben
+	};
+
+	// BahnCard-Rabattkarte hinzufügen falls angegeben
+	if (input.bahnCard !== undefined && [25, 50, 100].includes(input.bahnCard)) {
+		options.loyaltyCard = {
+			type: loyaltyCards.BAHNCARD,
+			discount: input.bahnCard,
+			class: input.travelClass, // 1 für erste Klasse, 2 für zweite Klasse
+		};
+	}
+
+	// Deutschland-Ticket Optionen für genauere Preisgestaltung
+	if (input.hasDeutschlandTicket) {
+		options.deutschlandTicketDiscount = true;
+		// Diese Option kann helfen, genauere Preise zurückzugeben wenn Deutschland-Ticket verfügbar ist
+		options.deutschlandTicketConnectionsOnly = false; // Wir wollen alle Verbindungen, aber mit genauen Preisen
+	}
+
+	console.log("API options being passed to db-vendo-client:", options);
+	console.log("Travel class requested:", input.travelClass);
+	console.log("BahnCard with class:", options.loyaltyCard);
+
+	return options;
+};