Fixed cross months event dates

Author: Matt443

.gitignore

@@ -2,4 +2,5 @@ node_modules
 dist
 junk * log.env
 
-src/index.ts
+src/index.ts
+commit.bat

__tests__/__snapshots__/race-results.test.ts.snap

@@ -4,139 +4,139 @@ exports[`get race results 1`] = `
 [
   {
     "car": "Ferrari",
-    "date": 2000-03-11T23:00:00.000Z,
+    "date": 2000-03-12T08:00:00.000Z,
     "grandPrix": "Australia",
     "laps": 58,
     "time": "1:34:01.987",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "Ferrari",
-    "date": 2000-03-25T23:00:00.000Z,
+    "date": 2000-03-26T08:00:00.000Z,
     "grandPrix": "Brazil",
     "laps": 71,
     "time": "1:31:35.271",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "Ferrari",
-    "date": 2000-04-08T22:00:00.000Z,
+    "date": 2000-04-09T07:00:00.000Z,
     "grandPrix": "San Marino",
     "laps": 62,
     "time": "1:31:39.776",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-04-22T22:00:00.000Z,
+    "date": 2000-04-23T07:00:00.000Z,
     "grandPrix": "Great Britain",
     "laps": 60,
     "time": "1:28:50.108",
-    "winner": "David Coulthard",
+    "winner": "David Coulthard",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-05-06T22:00:00.000Z,
+    "date": 2000-05-07T07:00:00.000Z,
     "grandPrix": "Spain",
     "laps": 65,
     "time": "1:33:55.390",
-    "winner": "Mika Hakkinen",
+    "winner": "Mika Hakkinen",
   },
   {
     "car": "Ferrari",
-    "date": 2000-05-20T22:00:00.000Z,
+    "date": 2000-05-21T07:00:00.000Z,
     "grandPrix": "Europe",
     "laps": 67,
     "time": "1:42:00.307",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-06-03T22:00:00.000Z,
+    "date": 2000-06-04T07:00:00.000Z,
     "grandPrix": "Monaco",
     "laps": 78,
     "time": "1:49:28.213",
-    "winner": "David Coulthard",
+    "winner": "David Coulthard",
   },
   {
     "car": "Ferrari",
-    "date": 2000-06-17T22:00:00.000Z,
+    "date": 2000-06-18T07:00:00.000Z,
     "grandPrix": "Canada",
     "laps": 69,
     "time": "1:41:12.313",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-07-01T22:00:00.000Z,
+    "date": 2000-07-02T07:00:00.000Z,
     "grandPrix": "France",
     "laps": 72,
     "time": "1:38:05.538",
-    "winner": "David Coulthard",
+    "winner": "David Coulthard",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-07-15T22:00:00.000Z,
+    "date": 2000-07-16T07:00:00.000Z,
     "grandPrix": "Austria",
     "laps": 71,
     "time": "1:28:15.818",
-    "winner": "Mika Hakkinen",
+    "winner": "Mika Hakkinen",
   },
   {
     "car": "Ferrari",
-    "date": 2000-07-29T22:00:00.000Z,
+    "date": 2000-07-30T07:00:00.000Z,
     "grandPrix": "Germany",
     "laps": 45,
     "time": "1:25:34.418",
-    "winner": "Rubens Barrichello",
+    "winner": "Rubens Barrichello",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-08-12T22:00:00.000Z,
+    "date": 2000-08-13T07:00:00.000Z,
     "grandPrix": "Hungary",
     "laps": 77,
     "time": "1:45:33.869",
-    "winner": "Mika Hakkinen",
+    "winner": "Mika Hakkinen",
   },
   {
     "car": "McLaren Mercedes",
-    "date": 2000-08-26T22:00:00.000Z,
+    "date": 2000-08-27T07:00:00.000Z,
     "grandPrix": "Belgium",
     "laps": 44,
     "time": "1:28:14.494",
-    "winner": "Mika Hakkinen",
+    "winner": "Mika Hakkinen",
   },
   {
     "car": "Ferrari",
-    "date": 2000-09-09T22:00:00.000Z,
+    "date": 2000-09-10T07:00:00.000Z,
     "grandPrix": "Italy",
     "laps": 53,
     "time": "1:27:31.638",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "Ferrari",
-    "date": 2000-09-23T22:00:00.000Z,
+    "date": 2000-09-24T07:00:00.000Z,
     "grandPrix": "United States",
     "laps": 73,
     "time": "1:36:30.883",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "Ferrari",
-    "date": 2000-10-07T22:00:00.000Z,
+    "date": 2000-10-08T07:00:00.000Z,
     "grandPrix": "Japan",
     "laps": 53,
     "time": "1:29:53.435",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
   {
     "car": "Ferrari",
-    "date": 2000-10-21T22:00:00.000Z,
+    "date": 2000-10-22T07:00:00.000Z,
     "grandPrix": "Malaysia",
     "laps": 56,
     "time": "1:35:54.235",
-    "winner": "Michael Schumacher",
+    "winner": "Michael Schumacher",
   },
 ]
-`;
+`;

__tests__/__snapshots__/race-schedule.test.ts.snap

@@ -57,7 +57,7 @@ exports[`get race schedule 1`] = `
     "round": "ROUND 8",
   },
   {
-    "date": "30May-01Jun",
+    "date": "30-01May-Jun",
     "eventTitle": "FORMULA 1 ARAMCO GRAN PREMIO DE ESPAÑA 2025",
     "raceCountry": "Spain",
     "round": "ROUND 9",
@@ -153,4 +153,4 @@ exports[`get race schedule 1`] = `
     "round": "ROUND 24",
   },
 ]
-`;
+`;

src/scraper/race-schedule.ts

@@ -42,10 +42,18 @@ export const getRaceSchedule = async (year: number = new Date().getFullYear()):
             //Semantics differ for the next race
             if (raceCountry === "") raceCountry = $(this).find("div:nth-child(1) > div:nth-child(2) > span:nth-child(2) > p:nth-child(2)").text().trim();
 
+            date = date.replaceAll(" ", "");
+
+            //Cross-month
+            if (date.length > 8) {
+                const dateParts: string[] = [date.slice(0, 2), date.slice(2, 5), date.slice(6, 8), date.slice(8, 13)];
+                date = `${dateParts[0]}-${dateParts[2]}${dateParts[1]}-${dateParts[3]}`;
+            }
+
             if (round !== undefined && raceCountry !== undefined && eventTitle !== undefined) {
                 const singleSchedule = {
                     round,
-                    date: date.replaceAll(" ", ""),
+                    date,
                     raceCountry,
                     eventTitle,
                 };