Fixed NZ Easter-Anzac clash (and added tests)

joaomatossilva · Feb 10, 2025 · f83b1c0 · f83b1c0
1 parent 7f78c44
commit f83b1c0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/src/DateTimeExtensions/WorkingDays/CultureStrategies/EN_NZHolidayStrategy.cs b/src/DateTimeExtensions/WorkingDays/CultureStrategies/EN_NZHolidayStrategy.cs
@@ -36,7 +36,18 @@ protected override IDictionary<DateTime, Holiday> BuildObservancesMap(int year)
                 var date = innerHoliday.GetInstance(year);
                 if (date.HasValue)
                 {
-                    holidayMap.Add(date.Value, innerHoliday);
+                    // If the holiday already exists in the map, combine the two holidays.
+                    // This is apparent for Anzac Day/Easter Monday on 25 April 2011.
+                    if (holidayMap.TryGetValue(date.Value, out var existingHoliday))
+                    {
+                        var combinedHoliday = new FixedHoliday($"{existingHoliday.Name}/{innerHoliday.Name}", 
+                            date.Value.Month, date.Value.Day);
+                        holidayMap[date.Value] = combinedHoliday;
+                    }
+                    else
+                    {
+                        holidayMap.Add(date.Value, innerHoliday);
+                    }
 
                     // New Year, Day After New Year, Christmas and Boxing Days are 'Mondayised'
                     // ie if these dates fall on a weekday then they are observed on the actual day.

diff --git a/tests/DateTimeExtensions.Tests/en-NZCalendarTest.cs b/tests/DateTimeExtensions.Tests/en-NZCalendarTest.cs
@@ -17,7 +17,11 @@ public void NewYearsDay()
         {
             var workingDayCultureInfo = new WorkingDayCultureInfo("en-NZ");
 
-            var dateOnGregorian = new DateTime(2013, 1, 1);
+            var dateOnGregorian = new DateTime(2011, 1, 1);
+            TestHoliday(workingDayCultureInfo, dateOnGregorian);
+            dateOnGregorian = new DateTime(2012, 1, 1);
+            TestHoliday(workingDayCultureInfo, dateOnGregorian);
+            dateOnGregorian = new DateTime(2013, 1, 1);
             TestHoliday(workingDayCultureInfo, dateOnGregorian);
             dateOnGregorian = new DateTime(2014, 1, 1);
             TestHoliday(workingDayCultureInfo, dateOnGregorian);
@@ -104,6 +108,32 @@ public void BoxingDay()
             TestHoliday(workingDayCultureInfo, dateOnGregorian);
         }
 
+        [Test]
+        public void EasterAnzacClash()
+        {
+            var workingDayCultureInfo = new WorkingDayCultureInfo("en-NZ");
+
+            var holidays = workingDayCultureInfo.GetHolidaysOfYear(2010);
+            Assert.IsTrue(holidays.Any(h => h.Name == "Easter Monday"));
+            Assert.IsTrue(holidays.Any(h => h.Name == "Anzac Day"));
+            Assert.IsFalse(holidays.Any(h => h.Name == "Easter Monday/Anzac Day"));
+
+            holidays = workingDayCultureInfo.GetHolidaysOfYear(2011);
+            Assert.IsFalse(holidays.Any(h => h.Name == "Easter Monday"));
+            Assert.IsFalse(holidays.Any(h => h.Name == "Anzac Day"));
+            Assert.IsTrue(holidays.Any(h => h.Name == "Easter Monday/Anzac Day"));
+
+            holidays = workingDayCultureInfo.GetHolidaysOfYear(2012);
+            Assert.IsTrue(holidays.Any(h => h.Name == "Easter Monday"));
+            Assert.IsTrue(holidays.Any(h => h.Name == "Anzac Day"));
+            Assert.IsFalse(holidays.Any(h => h.Name == "Easter Monday/Anzac Day"));
+
+            holidays = workingDayCultureInfo.GetHolidaysOfYear(2095);
+            Assert.IsFalse(holidays.Any(h => h.Name == "Easter Monday"));
+            Assert.IsFalse(holidays.Any(h => h.Name == "Anzac Day"));
+            Assert.IsTrue(holidays.Any(h => h.Name == "Easter Monday/Anzac Day"));
+        }
+
 
         private void TestHoliday(IWorkingDayCultureInfo workingDayCultureInfo, DateTime dateOnGregorian)
         {