Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion design-specs/82-holiday-calendar.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 сокращены для таблицы. Полные — в секциях выше.
Expand Down
39 changes: 26 additions & 13 deletions src/Application/Notifications/Holidays/HolidayCalendarService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace Application.Notifications.Holidays;

/// <summary>
/// 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.
/// </summary>
public class HolidayCalendarService : IHolidayCalendarService
Expand Down Expand Up @@ -82,16 +82,6 @@ public class HolidayCalendarService : IHolidayCalendarService
"⛪",
"Со Светицховлоба!",
"«სვეტიცხოველი» (свэтицховэли) — «животворящий столп», знаменитый собор в Мцхете. По преданию там хранится хитон Христа 🙏"),
[(11, 4)] = new(
"tbilisoba",
"Тбилисоба",
"თბილისობა",
"თბილისობა გილოცავ!",
"Тбилисоба гилоцав!",
"Поздравляю с Тбилисоба!",
"🍇",
"С Тбилисоба!",
"Тбилисоба — осенний праздник города: вино, сбор винограда «რთველი» (ртвэли), музыка. Впервые отметили в 1979 году 🍷"),
[(11, 23)] = new(
"giorgoba",
"Гиоргоба",
Expand All @@ -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<int, DateOnly> TbilisobaDates = new Dictionary<int, DateOnly>
{
[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))
Expand All @@ -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<Holiday> AllHolidays()
{
var all = new List<Holiday>(FixedHolidays.Count + 1);
var all = new List<Holiday>(FixedHolidays.Count + 2);
all.AddRange(FixedHolidays.Values);
all.Add(Easter);
all.Add(Tbilisoba);
return all;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading