Fix bug with cancelled services

BenjaminEHowe · Jul 21, 2024 · 395b177 · 395b177
1 parent b5b9568
commit 395b177
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/functions/api/raildata/departures/v1/[[departures]].js b/functions/api/raildata/departures/v1/[[departures]].js
@@ -42,9 +42,19 @@ export async function onRequest(context) {
   if ("trainServices" in nreDepartures) {
     nreDepartures["trainServices"].forEach((nreService) => {
       const service = {};
+
+      // cancellations
+      service["cancelled"] = nreService["isCancelled"];
+      if ("cancelReason" in nreService) {
+        if (nreService["cancelReason"].includes(CANCEL_REASON_PREFIX)) {
+          service["cancelReason"] = `Due to ${nreService["cancelReason"].substring(CANCEL_REASON_PREFIX.length)}`;
+        } else {
+          service["cancelReason"] = nreService["cancelReason"];
+        }
+      }
 
       // verify that the service still calls at the filter station (if applicable)
-      if (crsFilter) {
+      if (crsFilter && !service["cancelled"]) {
         const allCallingPoints = []
         nreService["subsequentCallingPoints"].forEach((callingPoints => {
           allCallingPoints.push(...callingPoints["callingPoint"]);
@@ -55,16 +65,6 @@ export async function onRequest(context) {
         }
       }
 
-      // cancellations
-      service["cancelled"] = nreService["isCancelled"];
-      if ("cancelReason" in nreService) {
-        if (nreService["cancelReason"].includes(CANCEL_REASON_PREFIX)) {
-          service["cancelReason"] = `Due to ${nreService["cancelReason"].substring(CANCEL_REASON_PREFIX.length)}`;
-        } else {
-          service["cancelReason"] = nreService["cancelReason"];
-        }
-      }
-
       // timings
       service["etd"] = nreService["etd"];
       service["std"] = nreService["std"];