🐞 Fixed bug where generateJSON had to be run twice to get accurate data

TechSupportz · Apr 1, 2024 · 3be2762 · 3be2762
1 parent 155adde
commit 3be2762
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/routes/generateJSON.ts b/src/routes/generateJSON.ts
@@ -47,7 +47,11 @@ export const generateJSON = createRouteSpec({
 
 			await writeJSON("bus-stops", transformedBusStops)
 
-			const transformedBusServices = await transformBusServices(busRoutes, busServices)
+			const transformedBusServices = await transformBusServices(
+				busRoutes,
+				busServices,
+				transformedBusStops.data,
+			)
 
 			await writeJSON("bus-services", transformedBusServices)
 
@@ -111,6 +115,7 @@ async function transformBusStops(
 async function transformBusServices(
 	busRoutes: LTABusRoute[],
 	busServices: LTABusService[],
+	busStopData: BusStop[],
 ): Promise<BusServiceJSON> {
 	const tempBusServices: BusService[] = []
 
@@ -121,7 +126,7 @@ async function transformBusServices(
 
 		const parsedBusRoutes = busRoutes.flatMap((route) => {
 			if (route.ServiceNo === v.ServiceNo) {
-				const busStop = getBusStopFromCode(route.BusStopCode)
+				const busStop = getBusStopFromCode(route.BusStopCode, busStopData)
 
 				return {
 					busStop: {
@@ -159,8 +164,8 @@ async function transformBusServices(
 			throw new Error("Error parsing bus route")
 		}
 
-		const originBusStopInfo = getBusStopFromCode(v.OriginCode)
-		const destinationBusStopInfo = getBusStopFromCode(v.DestinationCode)
+		const originBusStopInfo = getBusStopFromCode(v.OriginCode, busStopData)
+		const destinationBusStopInfo = getBusStopFromCode(v.DestinationCode, busStopData)
 
 		const busService: BusService = {
 			serviceNo: v.ServiceNo,

diff --git a/src/routes/getBusService.ts b/src/routes/getBusService.ts
@@ -15,7 +15,7 @@ export const getBusService = createRouteSpec({
 	},
 	handler: async (ctx) => {
 		const { serviceNo } = ctx.params
-		const includeRoutes = ctx.query.includeRoutes === ''
+		const includeRoutes = ctx.query.includeRoutes === ""
 
 		const busService = getBusServiceFromServiceNo(serviceNo)
 

diff --git a/src/utils/bus-stops.ts b/src/utils/bus-stops.ts
@@ -1,7 +1,14 @@
 import { busStops } from "../json"
-import { BusStop } from "../types/bus-stop-type"
+import { BusStop, BusStopJSON } from "../types/bus-stop-type"
+
+export function getBusStopFromCode(
+	busStopCode: string,
+	busStopData?: BusStopJSON["data"],
+): BusStop | undefined {
+	if (busStopData) {
+		return busStopData.find((busStop) => busStop.code === busStopCode)
+	}
 
-export function getBusStopFromCode(busStopCode: string): BusStop | undefined {
 	return busStops.find((busStop) => busStop.code === busStopCode)
 }