Serbia - Fix Weekendshift non-religious holidays

#545
nager · Oct 10, 2023 · a9054db · a9054db
1 parent 8cf99ed
commit a9054db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Japan - Fix Health and Sports Day
 - Australia - Fix King's Birthday Queensland
 - Australia - Fix New Year's Day weekend shift
+- Serbia - Fix Weekendshift non-religious holidays
 
 ## [1.45.0] - 2023-08-27
 

diff --git a/src/Nager.Date/PublicHolidays/SerbiaProvider.cs b/src/Nager.Date/PublicHolidays/SerbiaProvider.cs
@@ -1,5 +1,7 @@
 using Nager.Date.Contract;
+using Nager.Date.Extensions;
 using Nager.Date.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -26,17 +28,26 @@ public IEnumerable<PublicHoliday> GetHolidays(int year)
         {
             var countryCode = CountryCode.RS;
 
+            var newYearsDay1 = new DateTime(year, 1, 1).Shift(saturday => saturday, sunday => sunday.AddDays(1));
+            var newYearsDay2 = new DateTime(year, 1, 2).Shift(saturday => saturday, sunday => sunday.AddDays(1), monday => monday.AddDays(1));
+
+            var statehoodDay1 = new DateTime(year, 2, 15).Shift(saturday => saturday, sunday => sunday.AddDays(1));
+            var statehoodDay2 = new DateTime(year, 2, 16).Shift(saturday => saturday, sunday => sunday.AddDays(1), monday => monday.AddDays(1));
+
+            var labourDay1 = new DateTime(year, 5, 1).Shift(saturday => saturday, sunday => sunday.AddDays(1));
+            var labourDay2 = new DateTime(year, 5, 2).Shift(saturday => saturday, sunday => sunday.AddDays(1), monday => monday.AddDays(1));
+
             var items = new List<PublicHoliday>();
-            items.Add(new PublicHoliday(year, 1, 1, "Nova Godina", "New Year's Day", countryCode));
-            items.Add(new PublicHoliday(year, 1, 2, "Nova Godina", "New Year's Day", countryCode));
+            items.Add(new PublicHoliday(newYearsDay1, "Nova Godina", "New Year's Day", countryCode));
+            items.Add(new PublicHoliday(newYearsDay2, "Nova Godina", "New Year's Day", countryCode));
             items.Add(new PublicHoliday(year, 1, 7, "Božić", "Christmas Day", countryCode));
-            items.Add(new PublicHoliday(year, 2, 15, "Dan državnosti Srbije", "Statehood Day", countryCode));
-            items.Add(new PublicHoliday(year, 2, 16, "Dan državnosti Srbije", "Statehood Day", countryCode));
+            items.Add(new PublicHoliday(statehoodDay1, "Dan državnosti Srbije", "Statehood Day", countryCode));
+            items.Add(new PublicHoliday(statehoodDay2, "Dan državnosti Srbije", "Statehood Day", countryCode));
             items.Add(this._orthodoxProvider.GoodFriday("Veliki petak", year, countryCode));
             items.Add(this._orthodoxProvider.EasterSunday("Vaskrs (Uskrs)", year, countryCode));
             items.Add(this._orthodoxProvider.EasterMonday("Vaskrsni (Uskrsni) ponedeljak", year, countryCode));
-            items.Add(new PublicHoliday(year, 5, 1, "Praznik rada", "May Day / International Workers' Day", countryCode));
-            items.Add(new PublicHoliday(year, 5, 2, "Praznik rada", "May Day / International Workers' Day", countryCode));
+            items.Add(new PublicHoliday(labourDay1, "Praznik rada", "Labour Day", countryCode));
+            items.Add(new PublicHoliday(labourDay2, "Praznik rada", "Labour Day", countryCode));
             items.Add(new PublicHoliday(year, 11, 11, "Dan primirja", "Armistice Day", countryCode));
 
             return items.OrderBy(o => o.Date);