WIP backend: add combined handler

Author: schmolldechse

backend/controllers/timetable/bahnhofHandler.ts

@@ -2,8 +2,7 @@
 import express from "npm:express";
 import { Connection, Journey } from "../../models/connection.ts";
 import mapConnection from "../../lib/mapping.ts";
-
-type RequestType = "departures" | "arrivals";
+import { RequestType } from "./vendoHandler.ts";
 
 export class BahnhofHandler {
 	async handleRequest(

backend/controllers/timetable/combinedHandler.ts

@@ -0,0 +1,70 @@
+// @ts-types="npm:@types/express"
+import express from "npm:express";
+import { RequestType } from "./vendoHandler.ts";
+import { DateTime } from "npm:luxon";
+
+type Query = {
+	evaNumber: string;
+	type: RequestType;
+	when?: string;
+	duration?: number;
+	results?: number;
+}
+
+export class CombinedHandler {
+	async handleRequest(
+		req: express.Request,
+		res: express.Response,
+	): Promise<void> {
+		let query: Query = req.query as unknown as Query;
+		query = {
+			...req.query as unknown as Query,
+			when: query.when ?? DateTime.now().toISO(),
+			duration: query.duration ?? 60,
+			results: query.results ?? 1000,
+		}
+
+		if (!query.evaNumber) {
+			res.status(400).send("Station's evaNumber is required");
+			return;
+		}
+
+		if (!query.type) {
+			res.status(400).send(
+				"Type is required. Expected 'departures' or 'arrivals'",
+			);
+			return;
+		}
+
+		if (!DateTime.fromISO(query.when).isValid) {
+			res.status(400).send("Invalid date");
+			return;
+		}
+
+		const now = DateTime.now().set({ second: 0, millisecond: 0 });
+		const diffToStart = Math.round(DateTime.fromISO(query.when).diff(now, "hours").hours);
+		const diffToEnd = Math.round((DateTime.fromISO(query.when).diff(now, "hours").minutes + query.duration) / 60);
+
+		// Bahnhof API only allows requests for the next 6 hours
+		if (diffToStart < -1 || diffToEnd > 6) {
+			// TODO: somehow url is not correct
+			const request = await fetch(`http://localhost:8000/api/v1/timetable/vendo?evaNumber=${query.evaNumber}&type=${query.type}&when=${encodeURIComponent(query.when as string)}&duration=${query.duration}&results=${query.results}`, { method: "GET" });
+			if (!request.ok) {
+				res.status(200).send(request.body);
+				return;
+			}
+
+			const data = await request.json();
+			if (!data[query.type] || !Array.isArray(data[query.type])) {
+				res.status(200).send([]);
+				return;
+			}
+
+			res.status(200).send(data);
+			return;
+		}
+
+		res.status(200).send("OK");
+		return;
+	}
+}

backend/controllers/timetable/timetable.ts

@@ -2,14 +2,17 @@
 import express from "npm:express";
 import { BahnhofHandler } from "./bahnhofHandler.ts";
 import { VendoHandler } from "./vendoHandler.ts";
+import { CombinedHandler } from "./combinedHandler.ts";
 
 export class TimetableController {
 	public router = express.Router();
 
 	private bahnhofHandler = new BahnhofHandler();
 	private vendoHandler = new VendoHandler();
+	private combinedHandler = new CombinedHandler();
 
 	constructor() {
+		this.router.get("/api/v1/timetable", this.combinedHandler.handleRequest.bind(this.combinedHandler));
 		this.router.get("/api/v1/timetable/bahnhof", this.bahnhofHandler.handleRequest.bind(this.bahnhofHandler));
 		this.router.get("/api/v1/timetable/vendo", this.vendoHandler.handleSingle.bind(this.vendoHandler));
 	}

backend/controllers/timetable/vendoHandler.ts

@@ -4,7 +4,6 @@ import { Connection } from "../../models/connection.ts";
 import mapConnection from "../../lib/mapping.ts";
 import { DateTime } from "npm:luxon";
 import merge from "../../lib/merge.ts";
-import Conn = Deno.Conn;
 
 export type RequestType = "departures" | "arrivals";
 // fetches boards; db = RIS id, dbnav = HAFAS, all = both
@@ -31,7 +30,7 @@ export class VendoHandler {
 		let query: Query = req.query as unknown as Query;
 		query = {
 			...req.query as unknown as Query,
-			when: query.when ?? DateTime.local().toISO(),
+			when: query.when ?? DateTime.now().toISO(),
 			duration: query.duration ?? 60,
 			results: query.results ?? 1000,
 		}