Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

au: Fix FridayBeforeAflFinal holiday #101

Merged
merged 1 commit into from Sep 29, 2022
Merged

au: Fix FridayBeforeAflFinal holiday #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions v2/au/au_holidays.go
View file
Open in desktop
Expand Up @@ -180,13 +180,10 @@ var (
}

// FridayBeforeAflFinal represents the Friday before the AFL Grand Final;
// normally on the last Friday of September but subject to AFL schedules
// normally on the Friday before the last Saturday of September but subject to AFL schedules
FridayBeforeAflFinal = &cal.Holiday{
Name: "Friday before the AFL Grand Final",
Type: cal.ObservancePublic,
Month: time.September,
Weekday: time.Friday,
Offset: -1,
Func: calcFridayBeforeAflFinal,
StartYear: 2015,
}
Expand Down Expand Up @@ -379,13 +376,16 @@ var (
}
)

func calcFridayBeforeAflFinal(h *cal.Holiday, year int) time.Time {
func calcFridayBeforeAflFinal(_ *cal.Holiday, year int) time.Time {
switch year {
case 2015:
return time.Date(year, time.October, 2, 0, 0, 0, 0, cal.DefaultLoc)
case 2016:
return time.Date(year, time.September, 30, 0, 0, 0, 0, cal.DefaultLoc)
case 2020:
return time.Date(year, time.October, 23, 0, 0, 0, 0, cal.DefaultLoc)
default:
return cal.CalcWeekdayOffset(h, year)
aflFinalDay := cal.DayStart(cal.WeekdayN(year, time.September, time.Saturday, -1))
return aflFinalDay.AddDate(0, 0, -1)
}
}
2 changes: 1 addition & 1 deletion v2/au/au_holidays_test.go
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ func TestHolidays(t *testing.T) {
{FridayBeforeAflFinal, 2019, d(2019, 9, 27), d(2019, 9, 27)},
{FridayBeforeAflFinal, 2020, d(2020, 10, 23), d(2020, 10, 23)},
{FridayBeforeAflFinal, 2021, d(2021, 9, 24), d(2021, 9, 24)},
{FridayBeforeAflFinal, 2022, d(2022, 9, 30), d(2022, 9, 30)},
{FridayBeforeAflFinal, 2022, d(2022, 9, 23), d(2022, 9, 23)},

{QueensBirthdayQld, 2015, d(2015, 10, 5), d(2015, 10, 5)},
{QueensBirthdayQld, 2016, d(2016, 10, 3), d(2016, 10, 3)},
Expand Down