From 7f69d2ec92666ddd3dc29fd4a4b66953fe1a8d8a Mon Sep 17 00:00:00 2001
From: Jason McNeil <sixcolors@mac.com>
Date: Fri, 12 Nov 2021 11:42:04 -0400
Subject: [PATCH] add NationalDayForTruthAndReconciliation and fix general
 holidays on Saturdays

---
 v2/ca/ca_holidays.go      | 26 +++++++++++++++++++++-----
 v2/ca/ca_holidays_test.go | 20 ++++++++++++++------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/v2/ca/ca_holidays.go b/v2/ca/ca_holidays.go
index 961b07c..79bba80 100644
--- a/v2/ca/ca_holidays.go
+++ b/v2/ca/ca_holidays.go
@@ -12,8 +12,12 @@ import (
 
 var (
 	// Standard Canada weekend substitution rules:
+	//   Saturdays move to Monday
 	//   Sundays move to Monday
+	// See: https://www.canada.ca/en/employment-social-development/services/labour-standards/reports/holidays.html#h2.6
+	// Most employers in Canada, including the Federal Government, use the proceeding Monday.
 	weekendAlt = []cal.AltDay{
+		{Day: time.Saturday, Offset: 2},
 		{Day: time.Sunday, Offset: 1},
 	}
 
@@ -80,19 +84,30 @@ var (
 		Func:    cal.CalcWeekdayOffset,
 	}
 
+	// National Day for Truth and Reconciliation on 30-Sep
+	NationalDayForTruthAndReconciliation = &cal.Holiday{
+		StartYear: 2021,
+		Name:      "National Day for Truth and Reconciliation",
+		Month:     time.September,
+		Day:       30,
+		Func:      cal.CalcDayOfMonth,
+		Observed:  weekendAlt,
+	}
+
 	// RemembranceDay represents Remembrance Day on 11-Nov
 	RemembranceDay = aa.ArmisticeDay.Clone(&cal.Holiday{Name: "Remembrance Day", Type: cal.ObservancePublic, Observed: weekendAlt})
 
 	// ChristmasDay represents Christmas Day on 25-Dec
 	ChristmasDay = aa.ChristmasDay.Clone(&cal.Holiday{Name: "Christmas Day", Type: cal.ObservanceBank,
-		Observed: []cal.AltDay{
-			{Day: time.Saturday, Offset: -1},
-			{Day: time.Sunday, Offset: 1},
-		}})
+		Observed: weekendAlt,
+	})
 
 	// BoxingDay represents Boxing Day on 26-Dec
 	BoxingDay = aa.ChristmasDay2.Clone(&cal.Holiday{Name: "Boxing Day", Type: cal.ObservanceBank,
-		Observed: []cal.AltDay{{Day: time.Monday, Offset: 1}}})
+		Observed: []cal.AltDay{
+			{Day: time.Saturday, Offset: 2},
+			{Day: time.Sunday, Offset: 2},
+			{Day: time.Monday, Offset: 1}}})
 
 	// Holidays provides a list of the standard national holidays
 	Holidays = []*cal.Holiday{
@@ -104,6 +119,7 @@ var (
 		CivicDay,
 		LabourDay,
 		ThanksgivingDay,
+		NationalDayForTruthAndReconciliation,
 		RemembranceDay,
 		ChristmasDay,
 		BoxingDay,
diff --git a/v2/ca/ca_holidays_test.go b/v2/ca/ca_holidays_test.go
index c6efe4a..f0190f0 100644
--- a/v2/ca/ca_holidays_test.go
+++ b/v2/ca/ca_holidays_test.go
@@ -58,7 +58,7 @@ func TestHolidays(t *testing.T) {
 
 		{CanadaDay, 2015, d(2015, 7, 1), d(2015, 7, 1)},
 		{CanadaDay, 2016, d(2016, 7, 1), d(2016, 7, 1)},
-		{CanadaDay, 2017, d(2017, 7, 1), d(2017, 7, 1)},
+		{CanadaDay, 2017, d(2017, 7, 1), d(2017, 7, 3)},
 		{CanadaDay, 2018, d(2018, 7, 1), d(2018, 7, 2)},
 		{CanadaDay, 2019, d(2019, 7, 1), d(2019, 7, 1)},
 		{CanadaDay, 2020, d(2020, 7, 1), d(2020, 7, 1)},
@@ -92,9 +92,17 @@ func TestHolidays(t *testing.T) {
 		{ThanksgivingDay, 2021, d(2021, 10, 11), d(2021, 10, 11)},
 		{ThanksgivingDay, 2022, d(2022, 10, 10), d(2022, 10, 10)},
 
+		{NationalDayForTruthAndReconciliation, 2021, d(2021, 9, 30), d(2021, 9, 30)},
+		{NationalDayForTruthAndReconciliation, 2022, d(2022, 9, 30), d(2022, 9, 30)},
+		{NationalDayForTruthAndReconciliation, 2023, d(2023, 9, 30), d(2023, 10, 2)},
+		{NationalDayForTruthAndReconciliation, 2024, d(2024, 9, 30), d(2024, 9, 30)},
+		{NationalDayForTruthAndReconciliation, 2025, d(2025, 9, 30), d(2025, 9, 30)},
+		{NationalDayForTruthAndReconciliation, 2026, d(2026, 9, 30), d(2026, 9, 30)},
+		{NationalDayForTruthAndReconciliation, 2027, d(2027, 9, 30), d(2027, 9, 30)},
+
 		{RemembranceDay, 2015, d(2015, 11, 11), d(2015, 11, 11)},
 		{RemembranceDay, 2016, d(2016, 11, 11), d(2016, 11, 11)},
-		{RemembranceDay, 2017, d(2017, 11, 11), d(2017, 11, 11)},
+		{RemembranceDay, 2017, d(2017, 11, 11), d(2017, 11, 13)},
 		{RemembranceDay, 2018, d(2018, 11, 11), d(2018, 11, 12)},
 		{RemembranceDay, 2019, d(2019, 11, 11), d(2019, 11, 11)},
 		{RemembranceDay, 2020, d(2020, 11, 11), d(2020, 11, 11)},
@@ -107,16 +115,16 @@ func TestHolidays(t *testing.T) {
 		{ChristmasDay, 2018, d(2018, 12, 25), d(2018, 12, 25)},
 		{ChristmasDay, 2019, d(2019, 12, 25), d(2019, 12, 25)},
 		{ChristmasDay, 2020, d(2020, 12, 25), d(2020, 12, 25)},
-		{ChristmasDay, 2021, d(2021, 12, 25), d(2021, 12, 24)},
+		{ChristmasDay, 2021, d(2021, 12, 25), d(2021, 12, 27)},
 		{ChristmasDay, 2022, d(2022, 12, 25), d(2022, 12, 26)},
 
-		{BoxingDay, 2015, d(2015, 12, 26), d(2015, 12, 26)},
+		{BoxingDay, 2015, d(2015, 12, 26), d(2015, 12, 28)},
 		{BoxingDay, 2016, d(2016, 12, 26), d(2016, 12, 27)},
 		{BoxingDay, 2017, d(2017, 12, 26), d(2017, 12, 26)},
 		{BoxingDay, 2018, d(2018, 12, 26), d(2018, 12, 26)},
 		{BoxingDay, 2019, d(2019, 12, 26), d(2019, 12, 26)},
-		{BoxingDay, 2020, d(2020, 12, 26), d(2020, 12, 26)},
-		{BoxingDay, 2021, d(2021, 12, 26), d(2021, 12, 26)},
+		{BoxingDay, 2020, d(2020, 12, 26), d(2020, 12, 28)},
+		{BoxingDay, 2021, d(2021, 12, 26), d(2021, 12, 28)},
 		{BoxingDay, 2022, d(2022, 12, 26), d(2022, 12, 27)},
 	}