ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-13 17:22:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add optional holidays to upcoming

Browse Source
This commit is contained in:
Chris Kaczor
2024-12-19 09:21:03 -05:00
parent 5e216867c1
commit 200a07d6ba
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Calendar/Service/Calendar.http
View File

@@ -10,6 +10,16 @@ Accept: application/json
###
GET {{Calendar_HostAddress}}/calendar/upcoming?includeHolidays=true
Accept: application/json
###
GET {{Calendar_HostAddress}}/calendar/upcoming?days=7&includeHolidays=true
Accept: application/json
###
GET {{Calendar_HostAddress}}/events/next
Accept: application/json

19
Calendar/Service/Controllers/CalendarController.cs
View File

@@ -7,10 +7,9 @@ namespace ChrisKaczor.HomeMonitor.Calendar.Service.Controllers;
[ApiController]
public class CalendarController(IConfiguration configuration, HttpClient httpClient) : ControllerBase
{
[HttpGet("upcoming")]
public async Task<ActionResult<IEnumerable<CalendarEntry>>> GetUpcoming([FromQuery] int days = 1)
private async Task<IEnumerable<CalendarEntry>> GetCalendarEntries(string calendarUrl, int days)
{
var data = await httpClient.GetStringAsync(configuration["Calendar:PersonalUrl"]);
var data = await httpClient.GetStringAsync(calendarUrl);
var calendar = Ical.Net.Calendar.Load(data);
@@ -22,6 +21,20 @@ public class CalendarController(IConfiguration configuration, HttpClient httpCli
.Select(o => new CalendarEntry(o))
.OrderBy(ce => ce.Start);
return calendarEntries;
}
[HttpGet("upcoming")]
public async Task<ActionResult<IEnumerable<CalendarEntry>>> GetUpcoming([FromQuery] int days = 1, [FromQuery] bool includeHolidays = false)
{
var calendarEntries = await GetCalendarEntries(configuration["Calendar:PersonalUrl"]!, days);
if (!includeHolidays)
return Ok(calendarEntries);
var holidayEntries = await GetCalendarEntries(configuration["Calendar:HolidayUrl"]!, days);
calendarEntries = calendarEntries.Concat(holidayEntries).OrderBy(c => c.Start);
return Ok(calendarEntries);
}
}