From dc72f71e91406f9af8aef636c7df73a5ff852e80 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Wed, 18 Dec 2024 17:24:41 +0000 Subject: [PATCH] Calendar updates --- Calendar/Service/Controllers/CalendarController.cs | 4 ++-- Calendar/Service/Models/CalendarEntry.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Calendar/Service/Controllers/CalendarController.cs b/Calendar/Service/Controllers/CalendarController.cs index 5be6d97..5e90b63 100644 --- a/Calendar/Service/Controllers/CalendarController.cs +++ b/Calendar/Service/Controllers/CalendarController.cs @@ -8,14 +8,14 @@ namespace ChrisKaczor.HomeMonitor.Calendar.Service.Controllers; public class CalendarController(IConfiguration configuration, HttpClient httpClient) : ControllerBase { [HttpGet("upcoming")] - public async Task>> GetUpcoming([FromQuery] int? days) + public async Task>> GetUpcoming([FromQuery] int days = 1) { var data = await httpClient.GetStringAsync(configuration["Calendar:PersonalUrl"]); var calendar = Ical.Net.Calendar.Load(data); var start = DateTimeOffset.Now.Date; - var end = start.AddDays(days ?? 1); + var end = start.AddDays(days); var calendarEntries = calendar .GetOccurrences(start, end) diff --git a/Calendar/Service/Models/CalendarEntry.cs b/Calendar/Service/Models/CalendarEntry.cs index 6ddc7a0..528f8f2 100644 --- a/Calendar/Service/Models/CalendarEntry.cs +++ b/Calendar/Service/Models/CalendarEntry.cs @@ -8,6 +8,7 @@ namespace ChrisKaczor.HomeMonitor.Calendar.Service.Models; public class CalendarEntry(Occurrence occurrence) { public string Summary { get; set; } = ((CalendarEvent)occurrence.Source).Summary; - public DateTimeOffset Start { get; set; } = occurrence.Period.StartTime.AsUtc; - public DateTimeOffset End { get; set; } = occurrence.Period.EndTime.AsUtc; + public bool IsAllDay { get; set; } = ((CalendarEvent)occurrence.Source).IsAllDay; + public DateTimeOffset Start { get; set; } = occurrence.Period.StartTime.AsDateTimeOffset; + public DateTimeOffset End { get; set; } = occurrence.Period.EndTime.AsDateTimeOffset; } \ No newline at end of file