From 10f2b392038c024c982fae898329ec03ad1425b3 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 7 Jun 2025 22:13:34 +0800 Subject: [PATCH] code refactor --- pkg/validators/fiscal_year_start_date.go | 9 +-------- pkg/validators/fiscal_year_start_date_test.go | 9 ++++++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkg/validators/fiscal_year_start_date.go b/pkg/validators/fiscal_year_start_date.go index 426344a5..44ee2cbe 100644 --- a/pkg/validators/fiscal_year_start_date.go +++ b/pkg/validators/fiscal_year_start_date.go @@ -1,8 +1,8 @@ package validators import ( - "github.com/gin-gonic/gin/binding" "github.com/go-playground/validator/v10" + "github.com/mayswind/ezbookkeeping/pkg/core" ) @@ -17,10 +17,3 @@ func ValidateFiscalYearStart(fl validator.FieldLevel) bool { _, _, err := date.GetMonthDay() return err == nil } - -// RegisterFiscalYearStartValidator registers the fiscal year start date validator -func RegisterFiscalYearStartValidator() { - if v, ok := binding.Validator.Engine().(*validator.Validate); ok { - v.RegisterValidation("validFiscalYearStart", ValidateFiscalYearStart) - } -} diff --git a/pkg/validators/fiscal_year_start_date_test.go b/pkg/validators/fiscal_year_start_date_test.go index 2c2d9dbb..f218ed2e 100644 --- a/pkg/validators/fiscal_year_start_date_test.go +++ b/pkg/validators/fiscal_year_start_date_test.go @@ -4,8 +4,9 @@ import ( "testing" "github.com/go-playground/validator/v10" - "github.com/mayswind/ezbookkeeping/pkg/core" "github.com/stretchr/testify/assert" + + "github.com/mayswind/ezbookkeeping/pkg/core" ) type fiscalYearStartContainer struct { @@ -14,7 +15,8 @@ type fiscalYearStartContainer struct { func TestValidateFiscalYearStart_ValidValues(t *testing.T) { validate := validator.New() - validate.RegisterValidation("validFiscalYearStart", ValidateFiscalYearStart) + err := validate.RegisterValidation("validFiscalYearStart", ValidateFiscalYearStart) + assert.Nil(t, err) testCases := []struct { name string @@ -37,7 +39,8 @@ func TestValidateFiscalYearStart_ValidValues(t *testing.T) { func TestValidateFiscalYearStart_InvalidValues(t *testing.T) { validate := validator.New() - validate.RegisterValidation("validFiscalYearStart", ValidateFiscalYearStart) + err := validate.RegisterValidation("validFiscalYearStart", ValidateFiscalYearStart) + assert.Nil(t, err) testCases := []struct { name string