From 33f6099a2b616f88633a126ff4b181266681740b Mon Sep 17 00:00:00 2001 From: Dmitry Afonchenko Date: Wed, 4 Nov 2026 00:06:17 +0400 Subject: [PATCH] fix(holidays): greet Tbilisoba on the date City Hall announces, not Nov 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tbilisoba moves every year (2025 — Sep 20–21, 2026 — Oct 3–4), so the fixed 11-04 entry sent the greeting a month late. Dates are now per year; years without an announced date send nothing. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01TAcLBj2Fn8nAKE4qWyn5es --- design-specs/82-holiday-calendar.md | 2 +- .../Holidays/HolidayCalendarService.cs | 39 ++++++++++++------- .../HolidayCalendarServiceTests.cs | 10 ++++- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/design-specs/82-holiday-calendar.md b/design-specs/82-holiday-calendar.md index b6a7b83a..395d79b7 100644 --- a/design-specs/82-holiday-calendar.md +++ b/design-specs/82-holiday-calendar.md @@ -203,7 +203,7 @@ OWNER-PRIORITIES упоминает «Шотаоба» (День Шота Рус | 6 | `05-26` | `independence` | დამოუკიდებლობის დღე | დამოუკიდებლობის დღე გილოცავ! | | 7 | `08-28` | `mariamoba` | მარიამობა | მარიამობა გილოცავ! | | 8 | `10-14` | `svetitskhovloba` | სვეტიცხოვლობა | სვეტიცხოვლობა გილოცავ! | -| 9 | `11-04` | `tbilisoba` | თბილისობა | თბილისობა გილოცავ! | +| 9 | дата мэрии на год (2025 — `09-20`, 2026 — `10-03`) | `tbilisoba` | თბილისობა | თბილისობა გილოცავ! | | 10 | `11-23` | `giorgoba` | გიორგობა | გიორგობა გილოცავ! | > **Транслитерации** в строках 5-10 сокращены для таблицы. Полные — в секциях выше. diff --git a/src/Application/Notifications/Holidays/HolidayCalendarService.cs b/src/Application/Notifications/Holidays/HolidayCalendarService.cs index 1fbed24b..e48a7e93 100644 --- a/src/Application/Notifications/Holidays/HolidayCalendarService.cs +++ b/src/Application/Notifications/Holidays/HolidayCalendarService.cs @@ -3,8 +3,8 @@ namespace Application.Notifications.Holidays; /// -/// V1 Georgian holiday catalog (see design-specs/82-holiday-calendar.md): 9 fixed -/// dates + movable Julian Easter. Stateless lookup — callers compute the Tbilisi +/// V1 Georgian holiday catalog (see design-specs/82-holiday-calendar.md): 8 fixed +/// dates + movable Julian Easter + Tbilisoba on the date City Hall announces each year. Stateless lookup — callers compute the Tbilisi /// (UTC+4) date and ask whether that day is a holiday. /// public class HolidayCalendarService : IHolidayCalendarService @@ -82,16 +82,6 @@ public class HolidayCalendarService : IHolidayCalendarService "⛪", "Со Светицховлоба!", "«სვეტიცხოველი» (свэтицховэли) — «животворящий столп», знаменитый собор в Мцхете. По преданию там хранится хитон Христа 🙏"), - [(11, 4)] = new( - "tbilisoba", - "Тбилисоба", - "თბილისობა", - "თბილისობა გილოცავ!", - "Тбилисоба гилоцав!", - "Поздравляю с Тбилисоба!", - "🍇", - "С Тбилисоба!", - "Тбилисоба — осенний праздник города: вино, сбор винограда «რთველი» (ртвэли), музыка. Впервые отметили в 1979 году 🍷"), [(11, 23)] = new( "giorgoba", "Гиоргоба", @@ -116,6 +106,25 @@ public class HolidayCalendarService : IHolidayCalendarService "Христос Воскресе!", "На грузинскую Пасху яйца красят в красный корнем марены «ენდრო» (эндро), а на «ქრისტე აღდგა!» отвечают «ჭეშმარიტად აღდგა!» (чэшмаритад агдга) «Воистину воскрес!» 🥚"); + // Tbilisoba has no fixed date: City Hall announces it every year (2025 — Sep 20–21, + // 2026 — Oct 3–4). Greet on the first day; years without an announced date get no push. + private static readonly Holiday Tbilisoba = new( + "tbilisoba", + "Тбилисоба", + "თბილისობა", + "თბილისობა გილოცავ!", + "Тбилисоба гилоцав!", + "Поздравляю с Тбилисоба!", + "🍇", + "С Тбилисоба!", + "Тбилисоба — осенний праздник города: вино, сбор винограда «რთველი» (ртвэли), музыка. Впервые отметили в 1979 году 🍷"); + + private static readonly IReadOnlyDictionary TbilisobaDates = new Dictionary + { + [2025] = new(2025, 9, 20), + [2026] = new(2026, 10, 3), + }; + public Holiday? GetHolidayFor(DateOnly tbilisiDate) { if (FixedHolidays.TryGetValue((tbilisiDate.Month, tbilisiDate.Day), out var fixedHoliday)) @@ -124,14 +133,18 @@ public class HolidayCalendarService : IHolidayCalendarService if (tbilisiDate == JulianEaster.For(tbilisiDate.Year)) return Easter; + if (TbilisobaDates.TryGetValue(tbilisiDate.Year, out var tbilisoba) && tbilisiDate == tbilisoba) + return Tbilisoba; + return null; } public IReadOnlyList AllHolidays() { - var all = new List(FixedHolidays.Count + 1); + var all = new List(FixedHolidays.Count + 2); all.AddRange(FixedHolidays.Values); all.Add(Easter); + all.Add(Tbilisoba); return all; } } diff --git a/tests/Application.UnitTests/Notifications/HolidayCalendarServiceTests.cs b/tests/Application.UnitTests/Notifications/HolidayCalendarServiceTests.cs index 38d5b924..c6f921e8 100644 --- a/tests/Application.UnitTests/Notifications/HolidayCalendarServiceTests.cs +++ b/tests/Application.UnitTests/Notifications/HolidayCalendarServiceTests.cs @@ -99,10 +99,18 @@ public void GetHolidayFor_Svetitskhovloba_ReturnsSvetitskhovlobaEntry() holiday.Translation.ShouldBe("Поздравляю со Светицховлоба!"); } + [TestCase(2026, 11, 4)] + [TestCase(2026, 10, 4)] + [TestCase(2027, 10, 2)] + public void GetHolidayFor_NotAnnouncedTbilisobaDay_ReturnsNull(int year, int month, int day) + { + _sut.GetHolidayFor(new DateOnly(year, month, day)).ShouldBeNull(); + } + [Test] public void GetHolidayFor_Tbilisoba_ReturnsTbilisobaEntry() { - var holiday = _sut.GetHolidayFor(new DateOnly(2026, 11, 4)); + var holiday = _sut.GetHolidayFor(new DateOnly(2026, 10, 3)); holiday.ShouldNotBeNull(); holiday.Key.ShouldBe("tbilisoba");