From 4cc6856a7628cfb5e56fead3cef106cff1744bdb Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Thu, 22 Feb 2024 12:02:13 +0000
Subject: [PATCH] Remove limiter, fix find TrainUID by date

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 app.js                                |  2 +-
 package-lock.json                     |  2 +-
 src/services/trainService.services.ts | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 431483d..2aa3946 100644
--- a/app.js
+++ b/app.js
@@ -60,7 +60,7 @@ app.use(
 );
 app.use(express.json()); //JSON Parsing for POST Requests
 app.use(compression()); // Compress API Data if supported by client
-app.use(limiter);
+//app.use(limiter);
 app.use(authenticate);
 
 // 2023 Rationalisation Routes (/api/v2, /misc)
diff --git a/package-lock.json b/package-lock.json
index dc153ef..18be2a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "ldbs-json": "^1.2.1",
         "moment-timezone": "^0.5.43",
         "mongodb": "^4.13.0",
-        "nodemailer": "^6.9.1",
+        "nodemailer": "^6.9.9",
         "pino": "^8.15.1",
         "redis": "^4.6.7",
         "zlib": "^1.0.5"
diff --git a/src/services/trainService.services.ts b/src/services/trainService.services.ts
index f013651..d2b2df2 100644
--- a/src/services/trainService.services.ts
+++ b/src/services/trainService.services.ts
@@ -56,10 +56,12 @@ export async function findByTrainUid(
 ) {
   // Set the correct date - whether a date or "now" was passed to function
   let queryDate: Date;
-  if (date instanceof Date) {
+  if (date === 'now') {
+    queryDate = new Date();
+  } else if (date instanceof Date) {
     queryDate = date;
   } else {
-    queryDate = new Date();
+    queryDate = new Date(date);
   }
 
   // Build query
@@ -69,6 +71,7 @@ export async function findByTrainUid(
     scheduleEndDate: { $gte: queryDate },
     daysRun: { $in: [getShortDay(queryDate)] },
   };
+  logger.debug(query)
   const pipeline = getFindByTrainUidPipeline(query);
 
   const result = (await queryAggregate("timetable", pipeline)) as Service[];
@@ -82,7 +85,7 @@ export async function findByTrainUid(
   } else {
     pis = null;
   }
-  // TODO: Format and return data, the function called is not yet complete
+  console.log(JSON.stringify(services[0]))
   return formatTimetableDetail(services[0], pis);
 }
 
@@ -135,6 +138,8 @@ function filterServices(services: SimpleService[]): SimpleService[] {
   > = {};
   let filteredServices: SimpleService[] = [];
 
+  console.log(services)
+
   for (const service of services) {
     const trainUid = service["trainUid"],
       stpIndicator = service["stpIndicator"];