optimize logic for CH-AR, CH-AI, CH-NE

nager · Oct 1, 2024 · d1cf49b · d1cf49b
1 parent e35ebad
commit d1cf49b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/src/Nager.Date.UnitTest/Common/CountryTest.cs b/src/Nager.Date.UnitTest/Common/CountryTest.cs
@@ -30,7 +30,7 @@ public void HolidayProvider_ReturnCorrectCountryCode()
         }
 
         [TestMethod]
-        public void CheckCounties()
+        public void CheckSubdivisonCodes()
         {
             var failures = new List<string>();
 
@@ -54,6 +54,12 @@ public void CheckCounties()
                             continue;
                         }
 
+                        var groupedSubdivisonCodes = publicHoliday.SubdivisionCodes.GroupBy(subdivisionCode => subdivisionCode).Select(subdivisionCodes => new { subdivisionCodes.Key, Count = subdivisionCodes.Count() });
+                        if (groupedSubdivisonCodes.Where(o => o.Count > 1).Any())
+                        {
+                            failures.Add($"{countryCode} - Duplicate SubdivisonCode by {publicHoliday}");
+                        }
+
                         if (publicHoliday.SubdivisionCodes.Count(o => subdivisionCodes.Keys.Contains(o)) != publicHoliday.SubdivisionCodes.Length)
                         {
                             var diff = publicHoliday.SubdivisionCodes.Except(subdivisionCodes.Keys);

diff --git a/src/Nager.Date/HolidayProviders/SwitzerlandHolidayProvider.cs b/src/Nager.Date/HolidayProviders/SwitzerlandHolidayProvider.cs
@@ -198,8 +198,8 @@ private HolidaySpecification BerchtoldsDay(int year)
         {
             var subdivisionCodes = new List<string>(["CH-BE", "CH-FR", "CH-SH", "CH-AG", "CH-TG", "CH-VD"]);
 
-            if (new DateTime(year, 12, 25).DayOfWeek == DayOfWeek.Sunday ||
-                new DateTime(year, 1, 1).DayOfWeek == DayOfWeek.Sunday)
+            if (new DateTime(year, 1, 1).DayOfWeek == DayOfWeek.Sunday ||
+                new DateTime(year, 12, 25).DayOfWeek == DayOfWeek.Sunday)
             {
                 subdivisionCodes.Add("CH-NE");
             }
@@ -339,12 +339,19 @@ private HolidaySpecification[] StephensDay(int year)
             var englishName = "St. Stephen's Day";
             var localName = "Stephanstag";
 
-            //TODO: CH-AR logik
-            //Appenzell AR: “The second day of Christmas is not celebrated if the first day of Christmas falls on a Monday or Friday.” -> 26.12. is not a public holiday if it is a Tuesday or Saturday -- as in Appenzell IR
-            //TODO: CH-AI logik
-            //Appenzell IR: Appenzell IR: “St. Stephen's Day, unless its celebration results in three consecutive days of rest” -> 26.12. is not a public holiday if it is a Tuesday or Saturday -- as in Appenzell AR
-            //TODO: CH-NE logik
-            //Neuchâtel: public holiday if 1.1. or 25.12. is a Sunday
+            var subdivisionCodes = new List<string>(["CH-ZH", "CH-BE", "CH-LU", "CH-GL", "CH-FR", "CH-BS", "CH-BL", "CH-SH", "CH-SG", "CH-GR", "CH-AG", "CH-TG", "CH-TI"]);
+
+            if (new DateTime(year, 12, 26).DayOfWeek != DayOfWeek.Tuesday &&
+                new DateTime(year, 12, 26).DayOfWeek != DayOfWeek.Saturday)
+            {
+                subdivisionCodes.AddRange(["CH-AR", "CH-AI"]);
+            }
+
+            if (new DateTime(year, 1, 1).DayOfWeek == DayOfWeek.Sunday ||
+                new DateTime(year, 12, 25).DayOfWeek == DayOfWeek.Sunday)
+            {
+                subdivisionCodes.Add("CH-NE");
+            }
 
             return
             [
@@ -354,7 +361,7 @@ private HolidaySpecification[] StephensDay(int year)
                     EnglishName = englishName,
                     LocalName = localName,
                     HolidayTypes = HolidayTypes.Public,
-                    SubdivisionCodes = ["CH-ZH", "CH-BE", "CH-LU", "CH-GL", "CH-FR", "CH-BS", "CH-BL", "CH-SH", "CH-AR", "CH-AI", "CH-SG", "CH-GR", "CH-AG", "CH-TG", "CH-TI", "CH-NE" ]
+                    SubdivisionCodes = [.. subdivisionCodes]
                 },
                 new HolidaySpecification
                 {