Fix validateRequired (#66)

Author: husnimun

changeset/validate_required.go

@@ -7,8 +7,13 @@ import (
 // ValidateRequiredErrorMessage is the default error message for ValidateRequired.
 var ValidateRequiredErrorMessage = "{field} is required"
 
+// isZeroer is the interface that wraps the basic isZero method.
+type isZeroer interface {
+	IsZero() bool
+}
+
 // ValidateRequired validates that one or more fields are present in the changeset.
-// It'll add error to changeset if field in the changes is nil or string made only of whitespace,
+// It'll add error to changeset if field in the changes is nil or string made only of whitespace.
 func ValidateRequired(ch *Changeset, fields []string, opts ...Option) {
 	options := Options{
 		message: ValidateRequiredErrorMessage,
@@ -24,7 +29,17 @@ func ValidateRequired(ch *Changeset, fields []string, opts ...Option) {
 		}
 
 		str, isStr := val.(string)
-		if exist && (isStr && strings.TrimSpace(str) != "") || (!isStr && val != nil) {
+		if exist && isStr && strings.TrimSpace(str) != "" {
+			continue
+		}
+
+		zero, isZeroer := val.(isZeroer)
+		if exist && isZeroer && !zero.IsZero() {
+			continue
+		}
+
+		// Only check zero value with isZero if val is not string since it has been checked before.
+		if exist && !isStr && !isZero(val) {
 			continue
 		}
 

changeset/validate_required_test.go

@@ -1,8 +1,11 @@
 package changeset
 
 import (
+	"fmt"
 	"testing"
+	"time"
 
+	"github.com/Fs02/grimoire/params"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,6 +24,22 @@ func TestValidateRequired(t *testing.T) {
 	assert.Nil(t, ch.Errors())
 }
 
+func TestValidateRequired_cast(t *testing.T) {
+	type customString string
+	type customType struct {
+		Field1    customString
+		Field2    customString
+		Field3    customString
+		FieldTime time.Time
+	}
+
+	ct := customType{Field1: "field1", FieldTime: time.Now()}
+	ch := Cast(ct, params.Map{"field2": "field2", "field3": "field3"}, []string{"field1", "field2", "field3", "field_time"})
+	ValidateRequired(ch, []string{"field1", "field2", "field3", "field_time"})
+
+	assert.Nil(t, ch.Errors())
+}
+
 func TestValidateRequired_error(t *testing.T) {
 	ch := &Changeset{
 		changes: map[string]interface{}{
@@ -34,6 +53,7 @@ func TestValidateRequired_error(t *testing.T) {
 	assert.Equal(t, 3, len(ch.Errors()))
 	assert.Equal(t, "field1 is required", ch.Errors()[0].Error())
 	assert.Equal(t, "field2 is required", ch.Errors()[1].Error())
+	assert.Equal(t, "field3 is required", ch.Errors()[2].Error())
 
 	// empty struct
 	ch = &Changeset{
@@ -53,3 +73,23 @@ func TestValidateRequired_error(t *testing.T) {
 	assert.Equal(t, "field2 is required", ch.Errors()[0].Error())
 	assert.Equal(t, "field3 is required", ch.Errors()[1].Error())
 }
+
+func TestValidateRequired_cast_error(t *testing.T) {
+	type customString string
+	type customType struct {
+		Field1    customString
+		Field2    customString
+		Field3    customString
+		FieldTime time.Time
+	}
+
+	ct := customType{Field1: "field1"}
+	fmt.Println(ct.FieldTime)
+	ch := Cast(ct, params.Map{"field2": "field2"}, []string{"field1", "field2", "field3", "field_time"})
+	ValidateRequired(ch, []string{"field1", "field2", "field3", "field_time"})
+
+	assert.NotNil(t, ch.Errors())
+	assert.Equal(t, 2, len(ch.Errors()))
+	assert.Equal(t, "field3 is required", ch.Errors()[0].Error())
+	assert.Equal(t, "field_time is required", ch.Errors()[1].Error())
+}