Merge remote-tracking branch 'origin/develop' into develop

Author: marle3003

schema/json/generator/date.go

@@ -1,8 +1,9 @@
 package generator
 
 import (
-	"github.com/brianvoe/gofakeit/v6"
 	"time"
+
+	"github.com/brianvoe/gofakeit/v6"
 )
 
 func dates() []*Node {
@@ -155,13 +156,17 @@ func fakeDateWithYearRange(r *Request, min time.Time, maxYear int) (any, error)
 	year := gofakeit.IntRange(min.Year(), maxYear)
 	minMonth := int(min.Month())
 	month := gofakeit.Number(minMonth, 12)
-	if year == time.Now().Year() {
-		month = gofakeit.Number(minMonth, 12)
-	}
 	minDay := min.Day() + 1
 	if minDay > maxDayInMonth[month-1] {
 		minDay = 1
-		month += 1
+		if month == 12 {
+			month = 1
+			if year == min.Year() {
+				year++
+			}
+		} else {
+			month += 1
+		}
 	}
 	day := gofakeit.Number(minDay, maxDayInMonth[month-1])
 

schema/json/generator/date_test.go

@@ -2,6 +2,7 @@ package generator
 
 import (
 	"mokapi/schema/json/schema/schematest"
+	"strings"
 	"testing"
 	"time"
 
@@ -168,3 +169,10 @@ func TestStringDate(t *testing.T) {
 		})
 	}
 }
+
+func TestFakeDateWithYearRange_NewYearsEve(t *testing.T) {
+	r, err := fakeDateWithYearRange(&Request{}, time.Date(2026, 12, 31, 0, 0, 0, 0, time.UTC), 2027)
+	require.NoError(t, err)
+	require.NotEqual(t, "", r)
+	require.True(t, strings.HasPrefix(r.(string), "2027"))
+}