refactor: streamline static file serving

refactor: add starter script
test: run tests and keep assets in subdirectory
2024-11-07 14:11:09 +03:00 · 2024-11-07 10:28:11 +01:00 · 2024-11-07 10:20:56 +01:00 · 2024-11-07 10:15:37 +01:00
35 changed files with 213 additions and 374 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
 node_modules/
-tests/calendar/
+test/calendar/
--- a/app.js
+++ b/app.js
@ -0,0 +1,6 @@
+import server from './server.js';
+
+const port = process.env.NODE_PORT || 3000;
+server.listen(port, () => {
+    console.log(`Server started on port ${port}`);
+});
--- a/calendar/test.ics
+++ b/calendar/test.ics
@ -1,30 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//sebbo.net//ical-generator//EN
-NAME:test
-X-WR-CALNAME:test
-BEGIN:VEVENT
-UID:4t6i@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241107T002033Z
-DTSTART:20240930T113000Z
-DTEND:20240930T123000Z
-SUMMARY:work other work
-END:VEVENT
-BEGIN:VEVENT
-UID:3yag@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241107T002033Z
-DTSTART:20241003T190000Z
-DTEND:20241003T200000Z
-SUMMARY:work progodessey
-END:VEVENT
-BEGIN:VEVENT
-UID:k6p3@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241107T002033Z
-DTSTART:20241009T173000Z
-DTEND:20241009T183000Z
-SUMMARY:work do
-END:VEVENT
-END:VCALENDAR
--- a/calendar/test.json
+++ b/calendar/test.json
@ -1,11 +0,0 @@
-{
-  "id": "test",
-  "linkGroupName": "test",
-  "calendars": [
-    {
-      "prefix": "work",
-      "override": false,
-      "url": "https://calendar.google.com/calendar/ical/b4c66eb4bb2cc15257d071bab3f935385778b042112ea1aaedada47f3f1a6e3a%40group.calendar.google.com/public/basic.ics"
-    }
-  ]
-}
--- a/directory_tree.txt
+++ b/directory_tree.txt
@ -1,38 +0,0 @@
-.
-./.babelrc
-./.git
-./.git/COMMIT_EDITMSG
-./.git/config
-./.git/description
-./.git/FETCH_HEAD
-./.git/HEAD
-./.git/hooks
-./.git/index
-./.git/info
-./.git/logs
-./.git/objects
-./.git/ORIG_HEAD
-./.git/refs
-./.gitignore
-./calendar
-./calendar.test.js
-./directory_tree.txt
-./index.html
-./jest.config.cjs
-./node_modules
-./package-lock.json
-./package.json
-./README.md
-./script.js
-./server.js
-./styles.css
-./temp_test_calendar
-./temp_test_calendar/Date_Based_Calendar.json
-./temp_test_calendar/No_Prefix_Calendar.ics
-./temp_test_calendar/No_Prefix_Calendar.json
-./temp_test_calendar/Override_Calendar.json
-./temp_test_calendar/Time_Based_Calendar.json
-./tests
-./tests/expected_outputs
-./tests/test_calendars
-./__snapshots__
--- a/jest.config.cjs
+++ b/jest.config.cjs
@ -1,5 +0,0 @@
-module.exports = {
-  transform: {
-    '^.+\\.jsx?$': 'babel-jest',
-  },
-};
--- a/package.json
+++ b/package.json
@ -1,10 +1,9 @@
 {
  "name": "calendar-merger",
-  "version": "1.0.0",
-  "type": "module",
+  "version": "1.1.0",
  "scripts": {
-    "start": "node server.js",
-    "test": "jest"
+    "start": "node app.js",
+    "test": "jest ./test"
  },
  "dependencies": {
    "axios": "^1.7.7",
@ -16,8 +15,9 @@
    "node-cron": "^2.0.3",
    "supertest": "^7.0.0"
  },
-  "description": "cal merge",
-  "main": "script.js",
+  "description": "calmerger",
+  "main": "server.js",
+  "type": "module",
  "author": "Ryan",
  "license": "ISC",
  "devDependencies": {
--- a/server.js
+++ b/server.js
@ -8,21 +8,15 @@ import icalGenerator from 'ical-generator';
 const app = express();
 app.use(express.json());

-// Determine the merged calendars directory based on the environment
-const MERGED_CALENDARS_DIR = path.join(__dirname, 'calendar');
+const MERGED_CALENDARS_DIR = path.join(process.cwd(), 'calendar');
 console.log(`Merged calendars directory: ${MERGED_CALENDARS_DIR} under ${process.cwd()}`);

 // Ensure the merged calendars directory exists
 fs.mkdirSync(MERGED_CALENDARS_DIR, { recursive: true });

-app.get('/script.js', (req, res) => {
-    res.setHeader('Content-Type', 'application/javascript');
-    res.sendFile('script.js', { root: '.' });
-});
-
-app.get('/', (req, res) => {
-    res.sendFile('index.html', { root: '.' });
-});
+// Serve static files
+app.get('/script.js', (req, res) => res.sendFile('script.js', { root: '.' }));
+app.get('/', (req, res) => res.sendFile('index.html', { root: '.' }));

 // Function to sanitize the linkGroupName for use as a filename
 function sanitizeFilename(filename) {
@ -56,10 +50,9 @@ app.post('/merge', async (req, res) => {
                        prefix: calendar.prefix,
                        override: calendar.override,
                    });
-
-                } catch (error){
-                    console.error(`Error reading calendar file ${calendar.url}:`, error);
-                    return Promise.resolve(null);
+                } catch (error) {
+                    console.error(`Error reading calendar file ${calendar.url}: ${error}`);
+                    return Promise.reject(error)
                }
            } else {
                // Fetch calendar data from URL
@ -79,14 +72,11 @@ app.post('/merge', async (req, res) => {
        });

        const results = await Promise.all(promises);
-        // Filter out any failed requests
-        const validResults = results.filter((result) => result !== null);
-
        // Create a new iCalendar instance
        const calendar = icalGenerator({ name: linkGroupName });

        // Parse calendar data
-        validResults.forEach((result) => {
+        results.forEach((result) => {
            const parsed = ICAL.parse(result.data);
            const component = new ICAL.Component(parsed);
            const events = component.getAllSubcomponents('vevent');
@ -238,13 +228,4 @@ function saveCalendarData(calendarId, linkGroupName, calendars) {
    }
 }

-// Start the server
-if (process.env.NODE_ENV !== 'test') {
-    const port = 3000;
-    app.listen(port, () => {
-        console.log(`Server started on port ${port}`);
-    });
-}
-
-
 export default app;
--- a/temp_test_calendar/Date_Based_Calendar.json
+++ b/temp_test_calendar/Date_Based_Calendar.json
@ -1,16 +0,0 @@
-{
-  "id": "Date_Based_Calendar",
-  "linkGroupName": "Date Based Calendar",
-  "calendars": [
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\ferien_bayern_2023.ics",
-      "prefix": "Ferien_Bayern_2023",
-      "override": false
-    },
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\US_Holidays.ics",
-      "prefix": "US_holidays",
-      "override": false
-    }
-  ]
-}
--- a/temp_test_calendar/No_Prefix_Calendar.ics
+++ b/temp_test_calendar/No_Prefix_Calendar.ics
@ -1,6 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//sebbo.net//ical-generator//EN
-NAME:No Prefix Calendar
-X-WR-CALNAME:No Prefix Calendar
-END:VCALENDAR
--- a/temp_test_calendar/No_Prefix_Calendar.json
+++ b/temp_test_calendar/No_Prefix_Calendar.json
@ -1,11 +0,0 @@
-{
-  "id": "No_Prefix_Calendar",
-  "linkGroupName": "No Prefix Calendar",
-  "calendars": [
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\San_Francisco_Public_Holidays.ics",
-      "prefix": "",
-      "override": false
-    }
-  ]
-}
--- a/temp_test_calendar/Override_Calendar.json
+++ b/temp_test_calendar/Override_Calendar.json
@ -1,11 +0,0 @@
-{
-  "id": "Override_Calendar",
-  "linkGroupName": "Override Calendar",
-  "calendars": [
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\San_Francisco_Public_Holidays.ics",
-      "prefix": "Override Event",
-      "override": true
-    }
-  ]
-}
--- a/temp_test_calendar/Time_Based_Calendar.json
+++ b/temp_test_calendar/Time_Based_Calendar.json
@ -1,16 +0,0 @@
-{
-  "id": "Time_Based_Calendar",
-  "linkGroupName": "Time Based Calendar",
-  "calendars": [
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\other_work.ics",
-      "prefix": "other_work",
-      "override": false
-    },
-    {
-      "url": "C:\\Users\\user\\OneDrive\\Desktop\\Internship_tasks\\final calmerg\\test_calendars\\work.ics",
-      "prefix": "work",
-      "override": false
-    }
-  ]
-}
--- a/test/calendar.test.js
+++ b/test/calendar.test.js
@ -2,22 +2,18 @@ import request from 'supertest';
 import express from 'express';
 import fs from 'fs';
 import path from 'path';
-import app from './server';

-const TEST_MERGED_CALENDARS_DIR = path.join(__dirname, 'tests');
-const TEST_CALENDARS_DIR = path.join(__dirname, 'tests', 'test_calendars');
-const EXPECTED_OUTPUTS_DIR = path.join(__dirname,'test', 'expected_outputs');
+const CALENDARS_DIR = path.join(__dirname, 'calendar')
+const TEST_CALENDARS_DIR = path.join(__dirname, 'test_calendars');
+const EXPECTED_OUTPUTS_DIR = path.join(__dirname, 'expected_outputs');
+
 let server;
+process.chdir(__dirname)
+console.log(process.cwd());
+const app = require('../server').default;
+
 describe('Calendar Merging API', () => {
    beforeAll(async () => {
-        console.log(`Test Merged Calendars Directory: ${TEST_MERGED_CALENDARS_DIR}`);
-        // Ensure the test merged calendars directory exists
-        if (!fs.existsSync(TEST_MERGED_CALENDARS_DIR)) {
-            fs.mkdirSync(TEST_MERGED_CALENDARS_DIR, { recursive: true });
-        }
-        // Change the working directory to the test-specific directory
-        process.chdir(TEST_MERGED_CALENDARS_DIR);
-        console.log(process.cwd());
        // Start the server
        server = app.listen(0);
    });
@ -60,7 +56,7 @@ describe('Calendar Merging API', () => {
        expect(response.body.url).toMatch(new RegExp(`calendar/Date_Based_Calendar`));

        // Check if the file was created in the test directory
-        const filePath = path.join(TEST_MERGED_CALENDARS_DIR, 'calendar', 'Date_Based_Calendar.ics');
+        const filePath = path.join(CALENDARS_DIR, 'Date_Based_Calendar.ics');
        console.log('Checking if file exists at:', filePath);
        expect(fs.existsSync(filePath)).toBe(true);

@ -93,7 +89,7 @@ describe('Calendar Merging API', () => {
        expect(response.body.url).toMatch(/calendar\/Time_Based_Calendar/);
        
        // Check if the file was created in the test directory
-        const filePath = path.join(TEST_MERGED_CALENDARS_DIR, 'calendar','Time_Based_Calendar.ics');
+        const filePath = path.join(CALENDARS_DIR, 'Time_Based_Calendar.ics');
        expect(fs.existsSync(filePath)).toBe(true);

        // // Load expected output and compare
@ -120,7 +116,7 @@ describe('Calendar Merging API', () => {
        expect(response.body.url).toMatch(/calendar\/No_Prefix_Calendar/);
        
        // Check if the file was created in the test directory
-        const filePath = path.join(TEST_MERGED_CALENDARS_DIR, 'calendar', 'No_Prefix_Calendar.ics');
+        const filePath = path.join(CALENDARS_DIR, 'No_Prefix_Calendar.ics');
        expect(fs.existsSync(filePath)).toBe(true);

        // // Load expected output and compare
@ -147,7 +143,7 @@ describe('Calendar Merging API', () => {
        expect(response.body.url).toMatch(/calendar\/Override_Calendar/);
        
        // Check if the file was created in the test directory
-        const filePath = path.join(TEST_MERGED_CALENDARS_DIR, 'calendar', 'Override_Calendar.ics');
+        const filePath = path.join(CALENDARS_DIR, 'Override_Calendar.ics');
        expect(fs.existsSync(filePath)).toBe(true);

        // // Load expected output and compare
--- a/tests/expected_outputs/Date_Based_Calendar.ics
+++ b/tests/expected_outputs/Date_Based_Calendar.ics
--- a/tests/expected_outputs/Date_Based_Calendar.json
+++ b/tests/expected_outputs/Date_Based_Calendar.json
--- a/tests/expected_outputs/No_Prefix_Calendar.ics
+++ b/tests/expected_outputs/No_Prefix_Calendar.ics
--- a/tests/expected_outputs/No_Prefix_Calendar.json
+++ b/tests/expected_outputs/No_Prefix_Calendar.json
--- a/tests/expected_outputs/Override_Calendar.ics
+++ b/tests/expected_outputs/Override_Calendar.ics
--- a/tests/expected_outputs/Override_Calendar.json
+++ b/tests/expected_outputs/Override_Calendar.json
--- a/tests/expected_outputs/Time_Based_Calendar.ics
+++ b/tests/expected_outputs/Time_Based_Calendar.ics
--- a/tests/expected_outputs/Time_Based_Calendar.json
+++ b/tests/expected_outputs/Time_Based_Calendar.json
--- a/tests/test_calendars/San_Francisco_Public_Holidays.ics
+++ b/tests/test_calendars/San_Francisco_Public_Holidays.ics
--- a/tests/test_calendars/US_Holidays.ics
+++ b/tests/test_calendars/US_Holidays.ics
--- a/tests/test_calendars/ferien_bayern_2023.ics
+++ b/tests/test_calendars/ferien_bayern_2023.ics
--- a/tests/test_calendars/other_work.ics
+++ b/tests/test_calendars/other_work.ics
--- a/tests/test_calendars/work.ics
+++ b/tests/test_calendars/work.ics
--- a/tests/calendar/Date_Based_Calendar.ics
+++ b/tests/calendar/Date_Based_Calendar.ics
@ -4,9 +4,9 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Date Based Calendar
 X-WR-CALNAME:Date Based Calendar
 BEGIN:VEVENT
-UID:62yw@Ryan-jr
+UID:ux86@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20230219
 DTEND;VALUE=DATE:20230224
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -14,9 +14,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Winterferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:2w28@Ryan-jr
+UID:uqqc@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20230402
 DTEND;VALUE=DATE:20230415
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -24,9 +24,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Osterferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:ljtg@Ryan-jr
+UID:s5s6@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20230529
 DTEND;VALUE=DATE:20230609
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -34,9 +34,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Pfingstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:7d5m@Ryan-jr
+UID:d1co@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20230730
 DTEND;VALUE=DATE:20230911
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -44,9 +44,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Sommerferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:2bya@Ryan-jr
+UID:bfa2@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231029
 DTEND;VALUE=DATE:20231103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -54,9 +54,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Herbstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:i3r6@Ryan-jr
+UID:422p@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231121
 DTEND;VALUE=DATE:20231122
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -64,9 +64,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Herbstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:042o@Ryan-jr
+UID:pn88@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231222
 DTEND;VALUE=DATE:20240105
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -74,9 +74,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Ferien_Bayern_2023 Weihnachtsferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:vr5n@Ryan-jr
+UID:kn7n@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231231
 DTEND;VALUE=DATE:20231231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -84,9 +84,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:gk19@Ryan-jr
+UID:m3pg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240114
 DTEND;VALUE=DATE:20240114
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -94,9 +94,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays M L King Day
 END:VEVENT
 BEGIN:VEVENT
-UID:sqva@Ryan-jr
+UID:39ny@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240218
 DTEND;VALUE=DATE:20240218
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -104,9 +104,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Presidents' Day
 END:VEVENT
 BEGIN:VEVENT
-UID:1xf8@Ryan-jr
+UID:5ifw@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240328
 DTEND;VALUE=DATE:20240328
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -114,9 +114,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Good Friday
 END:VEVENT
 BEGIN:VEVENT
-UID:5mmn@Ryan-jr
+UID:nb38@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240330
 DTEND;VALUE=DATE:20240330
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -124,9 +124,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Easter Sunday
 END:VEVENT
 BEGIN:VEVENT
-UID:rsdk@Ryan-jr
+UID:lz4n@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240526
 DTEND;VALUE=DATE:20240526
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -134,9 +134,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Memorial Day
 END:VEVENT
 BEGIN:VEVENT
-UID:kat5@Ryan-jr
+UID:0h55@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240618
 DTEND;VALUE=DATE:20240618
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -144,9 +144,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Juneteenth
 END:VEVENT
 BEGIN:VEVENT
-UID:ppvd@Ryan-jr
+UID:rw2w@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240703
 DTEND;VALUE=DATE:20240703
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -154,9 +154,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Independence Day
 END:VEVENT
 BEGIN:VEVENT
-UID:sjo7@Ryan-jr
+UID:7c9g@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240901
 DTEND;VALUE=DATE:20240901
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -164,9 +164,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:b3bo@Ryan-jr
+UID:0nz9@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241013
 DTEND;VALUE=DATE:20241013
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -174,9 +174,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Columbus Day
 END:VEVENT
 BEGIN:VEVENT
-UID:haf8@Ryan-jr
+UID:e9ol@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241110
 DTEND;VALUE=DATE:20241110
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -184,9 +184,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Veterans Day
 END:VEVENT
 BEGIN:VEVENT
-UID:33iv@Ryan-jr
+UID:p38j@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241127
 DTEND;VALUE=DATE:20241127
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -194,9 +194,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Thanksgiving Day
 END:VEVENT
 BEGIN:VEVENT
-UID:8ygs@Ryan-jr
+UID:379a@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241224
 DTEND;VALUE=DATE:20241224
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -204,9 +204,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:upph@Ryan-jr
+UID:cpof@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241231
 DTEND;VALUE=DATE:20241231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -214,9 +214,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:t7p7@Ryan-jr
+UID:p0aq@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250119
 DTEND;VALUE=DATE:20250119
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -224,9 +224,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays M L King Day
 END:VEVENT
 BEGIN:VEVENT
-UID:es1h@Ryan-jr
+UID:kb3l@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250216
 DTEND;VALUE=DATE:20250216
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -234,9 +234,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Presidents' Day
 END:VEVENT
 BEGIN:VEVENT
-UID:c0ie@Ryan-jr
+UID:htk4@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250417
 DTEND;VALUE=DATE:20250417
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -244,9 +244,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Good Friday
 END:VEVENT
 BEGIN:VEVENT
-UID:s944@Ryan-jr
+UID:db0o@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250419
 DTEND;VALUE=DATE:20250419
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -254,9 +254,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Easter Sunday
 END:VEVENT
 BEGIN:VEVENT
-UID:r33k@Ryan-jr
+UID:v0s3@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250525
 DTEND;VALUE=DATE:20250525
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -264,9 +264,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Memorial Day
 END:VEVENT
 BEGIN:VEVENT
-UID:q7bi@Ryan-jr
+UID:7hxd@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250618
 DTEND;VALUE=DATE:20250618
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -274,9 +274,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Juneteenth
 END:VEVENT
 BEGIN:VEVENT
-UID:tzx2@Ryan-jr
+UID:1zlu@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250703
 DTEND;VALUE=DATE:20250703
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -284,9 +284,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Independence Day
 END:VEVENT
 BEGIN:VEVENT
-UID:a75o@Ryan-jr
+UID:ujrf@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250831
 DTEND;VALUE=DATE:20250831
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -294,9 +294,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:3p4f@Ryan-jr
+UID:0vwh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251012
 DTEND;VALUE=DATE:20251012
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -304,9 +304,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Columbus Day
 END:VEVENT
 BEGIN:VEVENT
-UID:1fsh@Ryan-jr
+UID:5lwh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251110
 DTEND;VALUE=DATE:20251110
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -314,9 +314,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Veterans Day
 END:VEVENT
 BEGIN:VEVENT
-UID:m3ak@Ryan-jr
+UID:iz9d@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251126
 DTEND;VALUE=DATE:20251126
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -324,9 +324,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:US_holidays Thanksgiving Day
 END:VEVENT
 BEGIN:VEVENT
-UID:fjjf@Ryan-jr
+UID:9siv@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251224
 DTEND;VALUE=DATE:20251224
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
--- a/tests/calendar/Date_Based_Calendar.json
+++ b/tests/calendar/Date_Based_Calendar.json
--- a/tests/calendar/No_Prefix_Calendar.ics
+++ b/tests/calendar/No_Prefix_Calendar.ics
@ -4,9 +4,9 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:No Prefix Calendar
 X-WR-CALNAME:No Prefix Calendar
 BEGIN:VEVENT
-UID:x9il@Ryan-jr
+UID:3xkm@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231231
 DTEND;VALUE=DATE:20231231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -14,9 +14,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:teh8@Ryan-jr
+UID:brhz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240101
 DTEND;VALUE=DATE:20240101
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -24,9 +24,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:ivxs@Ryan-jr
+UID:eqra@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240102
 DTEND;VALUE=DATE:20240102
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -34,9 +34,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:wewc@Ryan-jr
+UID:n4fh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240103
 DTEND;VALUE=DATE:20240103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -44,9 +44,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:wa7f@Ryan-jr
+UID:7ere@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240104
 DTEND;VALUE=DATE:20240104
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -54,9 +54,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:zcyl@Ryan-jr
+UID:e144@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240106
 DTEND;VALUE=DATE:20240106
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -64,9 +64,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:khsh@Ryan-jr
+UID:rh1l@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240107
 DTEND;VALUE=DATE:20240107
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -74,9 +74,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:f4di@Ryan-jr
+UID:52hv@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240222
 DTEND;VALUE=DATE:20240222
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -84,9 +84,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:qj03@Ryan-jr
+UID:kzzg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240307
 DTEND;VALUE=DATE:20240307
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -94,9 +94,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:7bvf@Ryan-jr
+UID:s482@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240430
 DTEND;VALUE=DATE:20240430
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -104,9 +104,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:l26b@Ryan-jr
+UID:vqc0@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240508
 DTEND;VALUE=DATE:20240508
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -114,9 +114,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:exnx@Ryan-jr
+UID:fpcl@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240611
 DTEND;VALUE=DATE:20240611
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -124,9 +124,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:fqo9@Ryan-jr
+UID:16sp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241103
 DTEND;VALUE=DATE:20241103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -134,9 +134,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Civil Unity Day
 END:VEVENT
 BEGIN:VEVENT
-UID:vvrh@Ryan-jr
+UID:2jtp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241231
 DTEND;VALUE=DATE:20241231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -144,9 +144,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:glq6@Ryan-jr
+UID:jfuk@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250101
 DTEND;VALUE=DATE:20250101
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -154,9 +154,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:k4g5@Ryan-jr
+UID:82e6@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250102
 DTEND;VALUE=DATE:20250102
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -164,9 +164,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:spcf@Ryan-jr
+UID:zoha@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250103
 DTEND;VALUE=DATE:20250103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -174,9 +174,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:dop6@Ryan-jr
+UID:rr0h@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250104
 DTEND;VALUE=DATE:20250104
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -184,9 +184,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:083t@Ryan-jr
+UID:8712@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250106
 DTEND;VALUE=DATE:20250106
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -194,9 +194,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:n2o3@Ryan-jr
+UID:uq55@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250107
 DTEND;VALUE=DATE:20250107
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -204,9 +204,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:kxe2@Ryan-jr
+UID:hmvp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250223
 DTEND;VALUE=DATE:20250223
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -214,9 +214,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:gd00@Ryan-jr
+UID:6wgm@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250309
 DTEND;VALUE=DATE:20250309
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -224,9 +224,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:efw8@Ryan-jr
+UID:g3y7@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250430
 DTEND;VALUE=DATE:20250430
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -234,9 +234,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:fqrx@Ryan-jr
+UID:5u4o@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250508
 DTEND;VALUE=DATE:20250508
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -244,9 +244,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:f3wq@Ryan-jr
+UID:ruw2@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250611
 DTEND;VALUE=DATE:20250611
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -254,9 +254,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY: Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:nw1a@Ryan-jr
+UID:ui8c@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251103
 DTEND;VALUE=DATE:20251103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
--- a/tests/calendar/No_Prefix_Calendar.json
+++ b/tests/calendar/No_Prefix_Calendar.json
--- a/tests/calendar/Override_Calendar.ics
+++ b/tests/calendar/Override_Calendar.ics
@ -4,9 +4,9 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Override Calendar
 X-WR-CALNAME:Override Calendar
 BEGIN:VEVENT
-UID:esp0@Ryan-jr
+UID:k61c@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20231231
 DTEND;VALUE=DATE:20231231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -14,9 +14,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:wo7i@Ryan-jr
+UID:55y9@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240101
 DTEND;VALUE=DATE:20240101
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -24,9 +24,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:d2d1@Ryan-jr
+UID:skrq@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240102
 DTEND;VALUE=DATE:20240102
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -34,9 +34,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:9wmf@Ryan-jr
+UID:vz9m@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240103
 DTEND;VALUE=DATE:20240103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -44,9 +44,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:34va@Ryan-jr
+UID:vhek@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240104
 DTEND;VALUE=DATE:20240104
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -54,9 +54,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:ujj9@Ryan-jr
+UID:n520@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240106
 DTEND;VALUE=DATE:20240106
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -64,9 +64,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:cwbo@Ryan-jr
+UID:lqmc@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240107
 DTEND;VALUE=DATE:20240107
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -74,9 +74,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:6fi6@Ryan-jr
+UID:qsw7@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240222
 DTEND;VALUE=DATE:20240222
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -84,9 +84,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:7iu4@Ryan-jr
+UID:cssb@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240307
 DTEND;VALUE=DATE:20240307
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -94,9 +94,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:n6ic@Ryan-jr
+UID:q1qz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240430
 DTEND;VALUE=DATE:20240430
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -104,9 +104,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:a97h@Ryan-jr
+UID:0bgv@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240508
 DTEND;VALUE=DATE:20240508
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -114,9 +114,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:17gv@Ryan-jr
+UID:t8ux@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20240611
 DTEND;VALUE=DATE:20240611
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -124,9 +124,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:uy33@Ryan-jr
+UID:uppu@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241103
 DTEND;VALUE=DATE:20241103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -134,9 +134,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:ilt7@Ryan-jr
+UID:m56r@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20241231
 DTEND;VALUE=DATE:20241231
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -144,9 +144,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:m38p@Ryan-jr
+UID:ecvb@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250101
 DTEND;VALUE=DATE:20250101
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -154,9 +154,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:kg4t@Ryan-jr
+UID:vx0q@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250102
 DTEND;VALUE=DATE:20250102
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -164,9 +164,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:t313@Ryan-jr
+UID:jd9w@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250103
 DTEND;VALUE=DATE:20250103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -174,9 +174,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:q0tz@Ryan-jr
+UID:yvdj@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250104
 DTEND;VALUE=DATE:20250104
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -184,9 +184,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:952w@Ryan-jr
+UID:b03t@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250106
 DTEND;VALUE=DATE:20250106
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -194,9 +194,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:oa4m@Ryan-jr
+UID:gqz5@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250107
 DTEND;VALUE=DATE:20250107
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -204,9 +204,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:lf4s@Ryan-jr
+UID:xd78@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250223
 DTEND;VALUE=DATE:20250223
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -214,9 +214,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:i9e9@Ryan-jr
+UID:2hbi@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250309
 DTEND;VALUE=DATE:20250309
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -224,9 +224,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:t8ex@Ryan-jr
+UID:3sa4@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250430
 DTEND;VALUE=DATE:20250430
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -234,9 +234,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:5g1p@Ryan-jr
+UID:w8qb@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250508
 DTEND;VALUE=DATE:20250508
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -244,9 +244,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:w7fa@Ryan-jr
+UID:x8kb@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20250611
 DTEND;VALUE=DATE:20250611
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
@ -254,9 +254,9 @@ X-MICROSOFT-MSNCALENDAR-ALLDAYEVENT:TRUE
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:wwi5@Ryan-jr
+UID:wu7v@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART;VALUE=DATE:20251103
 DTEND;VALUE=DATE:20251103
 X-MICROSOFT-CDO-ALLDAYEVENT:TRUE
--- a/tests/calendar/Override_Calendar.json
+++ b/tests/calendar/Override_Calendar.json
--- a/tests/calendar/Time_Based_Calendar.ics
+++ b/tests/calendar/Time_Based_Calendar.ics
@ -4,41 +4,41 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Time Based Calendar
 X-WR-CALNAME:Time Based Calendar
 BEGIN:VEVENT
-UID:4pz8@Ryan-jr
+UID:hexi@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART:20241001T183000Z
 DTEND:20241001T193000Z
 SUMMARY:other_work calmerge
 END:VEVENT
 BEGIN:VEVENT
-UID:wlgj@Ryan-jr
+UID:5gao@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART:20241010T173000Z
 DTEND:20241010T183000Z
 SUMMARY:other_work to do
 END:VEVENT
 BEGIN:VEVENT
-UID:g5xa@Ryan-jr
+UID:d67d@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART:20240930T113000Z
 DTEND:20240930T123000Z
 SUMMARY:work other work
 END:VEVENT
 BEGIN:VEVENT
-UID:oncs@Ryan-jr
+UID:6kon@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART:20241003T190000Z
 DTEND:20241003T200000Z
 SUMMARY:work progodessey
 END:VEVENT
 BEGIN:VEVENT
-UID:n4eg@Ryan-jr
+UID:gxgt@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241107T004037Z
+DTSTAMP:20241107T002212Z
 DTSTART:20241009T173000Z
 DTEND:20241009T183000Z
 SUMMARY:work do
--- a/tests/calendar/Time_Based_Calendar.json
+++ b/tests/calendar/Time_Based_Calendar.json
Author	SHA1	Message	Date
Ryan Mwangi	cf10a62049	refactor: streamline static file serving	2024-11-07 14:11:09 +03:00
xeruf	495557e6c2	refactor: add starter script	2024-11-07 10:28:11 +01:00
xeruf	5b3a47a122	test: run tests and keep assets in subdirectory	2024-11-07 10:20:56 +01:00
xeruf	8eb44e18f6	fix(server.js): properly propagate errors	2024-11-07 10:15:37 +01:00