ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-06-15 01:45:06 -04:00
Code Issues 9 Packages Projects Releases Wiki Activity

Handle multiple countries for national days

Browse Source
This commit is contained in:
Chris Kaczor
2026-04-01 12:16:17 -04:00
parent c088ab8292
commit 0384879bea
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Calendar/Service/Controllers/NationalDaysController.cs
View File

@@ -1,8 +1,8 @@
using ChrisKaczor.HomeMonitor.Calendar.Service.Models;
using DaysOfTheYear = ChrisKaczor.HomeMonitor.Calendar.Service.Models.DaysOfTheYear;
using HolidayCalendar = ChrisKaczor.HomeMonitor.Calendar.Service.Models.HolidayCalendar;
using Microsoft.AspNetCore.Mvc;
using RestSharp;
using DaysOfTheYear = ChrisKaczor.HomeMonitor.Calendar.Service.Models.DaysOfTheYear;
using HolidayCalendar = ChrisKaczor.HomeMonitor.Calendar.Service.Models.HolidayCalendar;
namespace ChrisKaczor.HomeMonitor.Calendar.Service.Controllers;
@@ -51,17 +51,18 @@ public class NationalDaysController(IConfiguration configuration, RestClient res
var now = DateTimeOffset.UtcNow.ToOffset(timeZoneOffset);
var dateString = now.ToString("yyyy-MM-dd");
var countries = configuration.GetSection("Calendar:HolidayCalendar:CountryCodes").Get<List<string>>() ?? [];
var restRequest = new RestRequest(configuration["Calendar:HolidayCalendar:Url"]);
restRequest.AddHeader("Authorization", $"Bearer {configuration["Calendar:HolidayCalendar:Key"] ?? string.Empty}");
restRequest.AddQueryParameter("limit", 100);
restRequest.AddQueryParameter("country", configuration["Calendar:HolidayCalendar:Country"]);
restRequest.AddQueryParameter("type", "Day");
restRequest.AddQueryParameter("startDate", dateString);
restRequest.AddQueryParameter("endDate", dateString);
var response = await restClient.GetAsync<HolidayCalendar.Response>(restRequest);
var nationalDays = response?.Data.Items.Select(i => new NationalDay(i));
var nationalDays = response?.Data.Items.Where(i => countries.Contains(i.Country.Code)).Select(i => new NationalDay(i));
return nationalDays;
}

11
Calendar/Service/Models/HolidayCalendar/Country.cs Normal file
View File

@@ -0,0 +1,11 @@
using JetBrains.Annotations;
namespace ChrisKaczor.HomeMonitor.Calendar.Service.Models.HolidayCalendar;
[PublicAPI]
public class Country
{
public required string Id { get; set; }
public required string Name { get; set; }
public required string Code { get; set; }
}

1
Calendar/Service/Models/HolidayCalendar/Item.cs
View File

@@ -10,4 +10,5 @@ public class Item
public required string Excerpt { get; set; }
public required string Url { get; set; }
public required string Type { get; set; }
public required Country Country { get; set; }
}

2
Calendar/Service/appsettings.json
View File

@@ -19,7 +19,7 @@
"HolidayCalendar": {
"Url": "",
"Key": "",
"Country": "recYxvMVBeTBnsPrJ"
"CountryCodes": [ "US", "INTL" ]
},
"NationalDays": {
"Provider": "HolidayCalendar"