checking nil or zero data

Author: mfdeveloper508

field/binary.go

@@ -145,49 +145,31 @@ func (f *Binary) Unmarshal(v interface{}) error {
 }
 
 func (f *Binary) Marshal(v interface{}) error {
+	if v == nil || reflect.ValueOf(v).IsZero() {
+		f.value = nil
+		return nil
+	}
+
 	switch v := v.(type) {
 	case *Binary:
-		if v == nil {
-			return nil
-		}
 		f.value = v.value
 	case string:
-		if v == "" {
-			f.value = nil
-			return nil
-		}
-
 		buf, err := hex.DecodeString(v)
 		if err != nil {
 			return fmt.Errorf("failed to convert string to byte: %w", err)
 		}
 
 		f.value = buf
 	case *string:
-		if v == nil {
-			f.value = nil
-			return nil
-		}
-
 		buf, err := hex.DecodeString(*v)
 		if err != nil {
 			return fmt.Errorf("failed to convert string to byte: %w", err)
 		}
 
 		f.value = buf
 	case []byte:
-		if v == nil || len(v) == 0 {
-			f.value = nil
-			return nil
-		}
-
 		f.SetBytes(v)
 	case *[]byte:
-		if v == nil {
-			f.value = nil
-			return nil
-		}
-
 		f.SetBytes(*v)
 	default:
 		return fmt.Errorf("data does not match required *Binary or (string, *string, []byte, *[]byte) type")

field/binary_test.go

@@ -208,6 +208,9 @@ func TestBinaryFieldMarshal(t *testing.T) {
 	require.Equal(t, testValue, str.Value())
 
 	err = str.Marshal(nil)
+	require.NoError(t, err)
+
+	err = str.Marshal(123456)
 	require.Error(t, err)
 	require.Equal(t, "data does not match required *Binary or (string, *string, []byte, *[]byte) type", err.Error())
 }

field/hex.go

@@ -158,38 +158,21 @@ func (f *Hex) Unmarshal(v interface{}) error {
 }
 
 func (f *Hex) Marshal(v interface{}) error {
+	if v == nil || reflect.ValueOf(v).IsZero() {
+		f.value = ""
+		return nil
+	}
+
 	switch v := v.(type) {
 	case *Hex:
-		if v == nil {
-			return nil
-		}
 		f.value = v.value
 	case string:
-		if v == "" {
-			f.value = ""
-			return nil
-		}
-
 		f.value = v
 	case *string:
-		if v == nil {
-			f.value = ""
-			return nil
-		}
-
 		f.value = *v
 	case []byte:
-		if v == nil || len(v) == 0 {
-			f.value = ""
-			return nil
-		}
-
 		f.SetBytes(v)
 	case *[]byte:
-		if v == nil {
-			f.value = ""
-			return nil
-		}
 		f.SetBytes(*v)
 	default:
 		return fmt.Errorf("data does not match required *Hex or (string, *string, []byte, *[]byte) type")

field/hex_test.go

@@ -220,6 +220,9 @@ func TestHexFieldMarshal(t *testing.T) {
 	require.Equal(t, testValue, buf)
 
 	err = str.Marshal(nil)
+	require.NoError(t, err)
+
+	err = str.Marshal(123456)
 	require.Error(t, err)
 	require.Equal(t, "data does not match required *Hex or (string, *string, []byte, *[]byte) type", err.Error())
 }

field/numeric.go

@@ -159,38 +159,26 @@ func (f *Numeric) Unmarshal(v interface{}) error {
 	return nil
 }
 
-func (f *Numeric) Marshal(data interface{}) error {
-	switch v := data.(type) {
+func (f *Numeric) Marshal(v interface{}) error {
+	if v == nil || reflect.ValueOf(v).IsZero() {
+		f.value = 0
+		return nil
+	}
+
+	switch v := v.(type) {
 	case *Numeric:
-		if v == nil {
-			f.value = 0
-			return nil
-		}
 		f.value = v.value
 	case int:
 		f.value = v
 	case *int:
-		if v == nil {
-			f.value = 0
-			return nil
-		}
 		f.value = *v
 	case string:
-		if v == "" {
-			f.value = 0
-			return nil
-		}
 		val, err := strconv.Atoi(v)
 		if err != nil {
 			return utils.NewSafeError(err, "failed to convert sting value into number")
 		}
 		f.value = val
 	case *string:
-		if v == nil {
-			f.value = 0
-			return nil
-		}
-
 		val, err := strconv.Atoi(*v)
 		if err != nil {
 			return utils.NewSafeError(err, "failed to convert sting value into number")

field/numeric_test.go

@@ -155,6 +155,9 @@ func TestNumericFieldMarshal(t *testing.T) {
 	require.Equal(t, 123456, vNumeric.Value())
 
 	err := str.Marshal(nil)
+	require.NoError(t, err)
+
+	err = str.Marshal([]byte("123456"))
 	require.Error(t, err)
 	require.Equal(t, "data does not match require *Numeric or (int, *int, string, *string) type", err.Error())
 }

field/string.go

@@ -153,24 +153,17 @@ func (f *String) Unmarshal(v interface{}) error {
 }
 
 func (f *String) Marshal(v interface{}) error {
+	if v == nil || reflect.ValueOf(v).IsZero() {
+		f.value = ""
+		return nil
+	}
+
 	switch v := v.(type) {
 	case *String:
-		if v == nil {
-			f.value = ""
-			return nil
-		}
 		f.value = v.value
 	case string:
-		if v == "" {
-			f.value = ""
-			return nil
-		}
 		f.value = v
 	case *string:
-		if v == nil {
-			f.value = ""
-			return nil
-		}
 		f.value = *v
 	case int:
 		f.value = strconv.FormatInt(int64(v), 10)

field/string_test.go

@@ -156,6 +156,9 @@ func TestStringFieldMarshal(t *testing.T) {
 	require.Equal(t, "123456", str.Value())
 
 	err := str.Marshal(nil)
+	require.NoError(t, err)
+
+	err = str.Marshal([]byte("123456"))
 	require.Error(t, err)
 	require.Equal(t, "data does not match required *String or (string, *string, int, *int) type", err.Error())
 }