Merge pull request #15 from winebarrel/fix_NestIF

Fix Next() retval

README.md

@@ -42,6 +42,9 @@ func main() {
 	yes, _ := client.IsHoliday(date)
 	fmt.Println(yes) //=> true
 
+	h, _ = client.Next(date)
+	fmt.Println(h) //=> 2023-07-17	海の日
+
 	holidays, _ := client.NextN(date, 3)
 	fmt.Println(holidays) //=> [2023-07-17	海の日 2023-08-11	山の日 2023-09-18	敬老の日]
 

client.go

@@ -13,10 +13,6 @@ const (
 	JaJapaneseHolidayCalendar = "ja.japanese#holiday@group.v.calendar.google.com"
 )
 
-var (
-	DefaultMaxResults = 10
-)
-
 type Client struct {
 	APIKey     string
 	CalendarID string
@@ -127,15 +123,25 @@ func (client *Client) NextN(ctx context.Context, t time.Time, n int) ([]*Holiday
 	return holidays, nil
 }
 
-func (client *Client) Next(ctx context.Context, t time.Time) ([]*Holiday, error) {
-	return client.NextN(ctx, t, DefaultMaxResults)
+func (client *Client) Next(ctx context.Context, t time.Time) (*Holiday, error) {
+	holidays, err := client.NextN(ctx, t, 1)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if len(holidays) == 0 {
+		return nil, nil
+	}
+
+	return holidays[0], nil
 }
 
 func (c *ClientWithoutContext) NextN(t time.Time, n int) ([]*Holiday, error) {
 	return c.client.NextN(context.Background(), t, n)
 }
 
-func (c *ClientWithoutContext) Next(t time.Time) ([]*Holiday, error) {
+func (c *ClientWithoutContext) Next(t time.Time) (*Holiday, error) {
 	return c.client.Next(context.Background(), t)
 }
 

client_next_test.go

@@ -136,3 +136,37 @@ func TestClientNextN_UTC(_t *testing.T) {
 		assert.Equal(expected, holidays)
 	}
 }
+
+func TestClientNext(_t *testing.T) {
+	assert := assert.New(_t)
+	client := jhol.NewClient(TestGCalAPIKey)
+
+	tests := []struct {
+		date         string
+		expectedDate string
+		expectedName string
+	}{
+		{"2022-01-01 00:00:00", "2022-01-01", "元日"},
+		{"2022-01-01 23:59:59", "2022-01-01", "元日"},
+		{"2022-01-02 00:00:00", "2022-01-10", "成人の日"},
+		{"2022-05-03 00:00:00", "2022-05-03", "憲法記念日"},
+		{"2022-05-03 23:59:59", "2022-05-03", "憲法記念日"},
+		{"2022-05-04 00:00:00", "2022-05-04", "みどりの日"},
+		{"2022-11-23 00:00:00", "2022-11-23", "勤労感謝の日"},
+		{"2022-11-23 23:59:59", "2022-11-23", "勤労感謝の日"},
+		{"2022-11-24 00:00:00", "2023-01-01", "元日"},
+	}
+
+	for _, t := range tests {
+		d, _ := time.ParseInLocation("2006-01-02 15:04:05", t.date, JST)
+		h, err := client.Next(context.Background(), d)
+
+		if !assert.NoErrorf(err, "%+v", t) {
+			continue
+		}
+
+		expectedDate, _ := time.ParseInLocation("2006-01-02", t.expectedDate, JST)
+		expected := &jhol.Holiday{Date: expectedDate, Name: t.expectedName}
+		assert.Equal(expected, h)
+	}
+}

example/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/winebarrel/jhol"
+)
+
+func parseDate(s string) time.Time {
+	d, _ := time.ParseInLocation("2006-01-02", s, time.Local)
+	return d
+}
+
+func main() {
+	apiKey := os.Getenv("GOOGLE_API_KEY")
+	client := jhol.NewClient(apiKey).WithoutContext()
+
+	date := parseDate("2023-07-17")
+	h, _ := client.Get(date)
+	fmt.Println(h) //=> 2023-07-17	海の日
+
+	yes, _ := client.IsHoliday(date)
+	fmt.Println(yes) //=> true
+
+	h, _ = client.Next(date)
+	fmt.Println(h) //=> 2023-07-17	海の日
+
+	holidays, _ := client.NextN(date, 3)
+	fmt.Println(holidays) //=> [2023-07-17	海の日 2023-08-11	山の日 2023-09-18	敬老の日]
+
+	holidays, _ = client.Between(date, parseDate("2023-08-11"))
+	fmt.Println(holidays) //=> [2023-07-17	海の日 2023-08-11	山の日]
+}