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

Fix: Handle Mountain Day Holiday Correctly in Jp #142

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Fix: Handle Mountain Day Holiday Correctly in Jp #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30dae38
Fix: Handle Mountain Day Holiday Correctly in Jp
ryu0114h Dec 2, 2024
384ff9e
fix test
ryu0114h Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions v2/jp/jp_holidays.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
package jp

import (
"github.com/rickar/cal/v2"
"github.com/rickar/cal/v2/aa"
"math"
"time"

"github.com/rickar/cal/v2"
"github.com/rickar/cal/v2/aa"
)

var (
Expand Down Expand Up @@ -141,12 +142,24 @@ var (

// MountainDay represents Mountain Day on 11-August
MountainDay = &cal.Holiday{
Name: "Mountain Day",
Type: cal.ObservancePublic,
Month: time.August,
Day: 11,
Observed: weekendAlt,
Func: cal.CalcDayOfMonth,
Name: "Mountain Day",
Type: cal.ObservancePublic,
Month: time.August,
Day: 11,
Observed: weekendAlt,
Func: func(h *cal.Holiday, year int) time.Time {
switch year {
case 2020:
// Mountain Day is observed on August 10 in 2020
return time.Date(year, time.August, 10, 0, 0, 0, 0, time.Local)
case 2021:
// Mountain Day is observed on August 8 from 2021
return time.Date(year, time.August, 8, 0, 0, 0, 0, time.Local)
default:
// For all other years, Mountain Day is observed on August 11
return time.Date(year, time.August, 11, 0, 0, 0, 0, time.Local)
}
},
StartYear: 2016,
}

Expand Down
9 changes: 6 additions & 3 deletions v2/jp/jp_holidays_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
package jp

import (
"github.com/rickar/cal/v2"
"testing"
"time"

"github.com/rickar/cal/v2"
)

func d(y, m, d int) time.Time {
Expand Down Expand Up @@ -130,9 +131,11 @@ func TestHolidays(t *testing.T) {
{MountainDay, 2017, d(2017, 8, 11), d(2017, 8, 11)},
{MountainDay, 2018, d(2018, 8, 11), d(2018, 8, 11)},
{MountainDay, 2019, d(2019, 8, 11), d(2019, 8, 12)},
{MountainDay, 2020, d(2020, 8, 11), d(2020, 8, 11)},
{MountainDay, 2021, d(2021, 8, 11), d(2021, 8, 11)},
{MountainDay, 2020, d(2020, 8, 10), d(2020, 8, 10)},
{MountainDay, 2021, d(2021, 8, 8), d(2021, 8, 9)},
{MountainDay, 2022, d(2022, 8, 11), d(2022, 8, 11)},
{MountainDay, 2023, d(2023, 8, 11), d(2023, 8, 11)},
{MountainDay, 2024, d(2024, 8, 11), d(2024, 8, 12)},

{RespectForTheAgedDay, 2015, d(2015, 9, 21), d(2015, 9, 21)},
{RespectForTheAgedDay, 2016, d(2016, 9, 19), d(2016, 9, 19)},
Expand Down
Loading