From dceb8b91a3d7b5c40000fa43b43ff9c5f4d61e33 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Mon, 15 Jan 2024 09:31:33 -0500
Subject: [PATCH] Support the day of the event

---
 Calendar/Service/src/events/event.ts         |  4 ++-
 Calendar/Service/src/events/events.routes.ts | 32 ++++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Calendar/Service/src/events/event.ts b/Calendar/Service/src/events/event.ts
index e68e337..8092d43 100644
--- a/Calendar/Service/src/events/event.ts
+++ b/Calendar/Service/src/events/event.ts
@@ -5,6 +5,7 @@ export class Event {
     name: string;
     date: DateTime;
     type: HolidaysTypes.HolidayType;
+    isToday: boolean;
     durationUntil: {
         days: number;
         hours: number;
@@ -16,7 +17,8 @@ export class Event {
         this.name = holiday.name;
         this.date = DateTime.fromFormat(holiday.date, 'yyyy-MM-dd HH:mm:ss', { zone: timezone });
         this.type = holiday.type;
-
+        this.isToday = this.date.hasSame(DateTime.now(), 'day');
+        
         const duration = Interval.fromDateTimes(DateTime.now(), this.date).toDuration(['days', 'hours', 'minutes', 'seconds']);
 
         this.durationUntil = !duration.isValid ? null : {
diff --git a/Calendar/Service/src/events/events.routes.ts b/Calendar/Service/src/events/events.routes.ts
index 96cf5d3..5605493 100644
--- a/Calendar/Service/src/events/events.routes.ts
+++ b/Calendar/Service/src/events/events.routes.ts
@@ -2,6 +2,7 @@ import express, { Request, Response } from 'express';
 import { StatusCodes } from 'http-status-codes';
 import * as DateHolidays from 'date-holidays';
 import { Event } from './event';
+import { DateTime } from 'luxon';
 
 export const eventsRouter = express.Router();
 
@@ -25,11 +26,12 @@ function getHolidays(req: Request): DateHolidays.HolidaysTypes.Holiday[] {
 eventsRouter.get('/all', async (req: Request, res: Response) => {
     try {
         const timezone = req.query.timezone as string;
+        
         const holidays = getHolidays(req);
 
-        const calendarEvents = holidays.map(holiday => new Event(holiday, timezone));
+        const events = holidays.map(holiday => new Event(holiday, timezone));
 
-        return res.status(StatusCodes.OK).json(calendarEvents);
+        return res.status(StatusCodes.OK).json(events);
     } catch (error) {
         return res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error });
     }
@@ -38,21 +40,20 @@ eventsRouter.get('/all', async (req: Request, res: Response) => {
 eventsRouter.get('/next', async (req: Request, res: Response) => {
     try {
         const timezone = req.query.timezone as string;
+
         const holidays = getHolidays(req);
 
-        const nextHoliday = holidays.find(holiday => {
-            const holidayDate = new Date(holiday.date);
+        const events = holidays.map(holiday => new Event(holiday, timezone));
 
-            return holidayDate.getTime() > Date.now();
-        });
+        const now = DateTime.now();
 
-        if (nextHoliday == null) {
+        const nextEvent = events.find(event => event.date > now || event.isToday);
+
+        if (!nextEvent) {
             return res.status(StatusCodes.OK).json(null);
         }
 
-        const calendarEvent = new Event(nextHoliday, timezone);
-
-        return res.status(StatusCodes.OK).json(calendarEvent);
+        return res.status(StatusCodes.OK).json(nextEvent);
     } catch (error) {
         return res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error });
     }
@@ -61,17 +62,16 @@ eventsRouter.get('/next', async (req: Request, res: Response) => {
 eventsRouter.get('/future', async (req: Request, res: Response) => {
     try {
         const timezone = req.query.timezone as string;
+
         const holidays = getHolidays(req);
 
-        const futureHolidays = holidays.filter(holiday => {
-            const holidayDate = new Date(holiday.date);
+        const events = holidays.map(holiday => new Event(holiday, timezone));
 
-            return holidayDate.getTime() > Date.now();
-        });
+        const now = DateTime.now();
 
-        const calendarEvents = futureHolidays.map(holiday => new Event(holiday, timezone));
+        const futureEvents = events.filter(event => event.date > now || event.isToday);
 
-        return res.status(StatusCodes.OK).json(calendarEvents);
+        return res.status(StatusCodes.OK).json(futureEvents);
     } catch (error) {
         return res.status(StatusCodes.INTERNAL_SERVER_ERROR).json({ error });
     }