Refactoring Date type

Author: spiegel-im-spiegel

values-date.go

@@ -1,7 +1,7 @@
 package openbd
 
 import (
-	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -34,7 +34,10 @@ var timeTemplate3 = []string{
 
 //UnmarshalJSON returns result of Unmarshal for json.Unmarshal()
 func (t *Date) UnmarshalJSON(b []byte) error {
-	s := strings.Trim(string(b), "\"")
+	s := string(b)
+	if ss, err := strconv.Unquote(s); err == nil {
+		s = ss
+	}
 	if len(s) == 0 || strings.ToLower(s) == "null" {
 		*t = Date{time.Time{}}
 		return nil
@@ -44,44 +47,41 @@ func (t *Date) UnmarshalJSON(b []byte) error {
 		if strings.Contains(s, ":") {
 			for _, tmplt := range timeTemplate1 {
 				if tm, err := time.Parse(tmplt, s); err != nil {
-					lastErr = err
+					lastErr = errs.Wrap(err, "", errs.WithParam("time_string", s), errs.WithParam("time_template", tmplt))
 				} else {
 					*t = Date{tm}
 					return nil
 				}
 			}
-			return errs.Wrap(lastErr, "error in Date.UnmarshalJSON() function")
+			return lastErr
 		}
 		for _, tmplt := range timeTemplate2 {
 			if tm, err := time.Parse(tmplt, s); err != nil {
-				lastErr = err
+				lastErr = errs.Wrap(err, "", errs.WithParam("time_string", s), errs.WithParam("time_template", tmplt))
 			} else {
 				*t = Date{tm}
 				return nil
 			}
 		}
-		return errs.Wrap(lastErr, "error in Date.UnmarshalJSON() function")
+		return lastErr
 	}
 	for _, tmplt := range timeTemplate3 {
 		if tm, err := time.Parse(tmplt, s); err != nil {
-			lastErr = err
+			lastErr = errs.Wrap(err, "", errs.WithParam("time_string", s), errs.WithParam("time_template", tmplt))
 		} else {
 			*t = Date{tm}
 			return nil
 		}
 	}
-	return errs.Wrap(lastErr, "error in Date.UnmarshalJSON() function")
+	return lastErr
 }
 
 //MarshalJSON returns time string with RFC3339 format
 func (t *Date) MarshalJSON() ([]byte, error) {
-	if t == nil {
-		return []byte("\"\""), nil
-	}
-	if t.IsZero() {
+	if t == nil || t.IsZero() {
 		return []byte("\"\""), nil
 	}
-	return []byte(fmt.Sprintf("\"%v\"", t)), nil
+	return []byte(strconv.Quote(t.String())), nil
 }
 
 func (t Date) String() string {

values-date_test.go

@@ -51,12 +51,18 @@ func TestUnmarshal(t *testing.T) {
 }
 
 func TestUnmarshalErr(t *testing.T) {
-	data := `{"date_taken": "2005/03/26"}`
-	tst := &ForTestStruct{}
-	if err := json.Unmarshal([]byte(data), tst); err == nil {
-		t.Error("Unmarshal() error = nil, not want nil.")
-	} else {
-		fmt.Printf("Info: %+v\n", err)
+	testCases := []string{
+		`{"date_taken": "2005/03/26"}`,
+		`{"date_taken": "2005-03-26 00:00"}`,
+		`{"date_taken": "2005-03-26+0900"}`,
+	}
+	for _, tcStr := range testCases {
+		tst := &ForTestStruct{}
+		if err := json.Unmarshal([]byte(tcStr), tst); err == nil {
+			t.Error("Unmarshal() error = nil, not want nil.")
+		} else {
+			fmt.Printf("Info: %+v\n", err)
+		}
 	}
 }