Support another forecast data

goark · Jun 12, 2021 · a2d1071 · a2d1071
1 parent e0f6677
commit a2d1071
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/entity/entity.go b/entity/entity.go
@@ -45,7 +45,7 @@ type Entity struct {
 }
 
 func Decode(elements []string) (*Entity, error) {
-	if len(elements) != CSVCols {
+	if len(elements) < CSVCols {
 		return nil, errs.Wrap(ecode.ErrInvalidRecord)
 	}
 	return &Entity{

diff --git a/fetch/import.go b/fetch/import.go
@@ -12,7 +12,8 @@ import (
 //Import function returns slice of entity.Entity
 func Import(r io.Reader, f *filter.Filter) ([]*entity.Entity, error) {
 	list := entity.NewList(nil)
-	cr := csvdata.New(r, true).WithFieldsPerRecord(entity.CSVCols)
+	//cr := csvdata.New(r, true).WithFieldsPerRecord(entity.CSVCols)
+	cr := csvdata.New(r, true)
 	for {
 		if err := cr.Next(); err != nil {
 			if errs.Is(err, io.EOF) {

diff --git a/values/date/date.go b/values/date/date.go
@@ -15,6 +15,7 @@ var (
 	defaultDateForm = "2006-01-02"
 	timeTemplate    = []string{
 		defaultDateForm,
+		"2006-01-02 15:04:05 MST",
 		time.RFC3339,
 	}
 	Zero = FromTime(time.Time{}) //Zero value of Date

diff --git a/values/date/date_test.go b/values/date/date_test.go
@@ -17,6 +17,7 @@ func TestUnmarshal(t *testing.T) {
 		str string
 		jsn string
 	}{
+		{s: `{"date_taken": "2005-03-26 00:00:00 UTC"}`, str: "2005-03-26", jsn: `{"date_taken":"2005-03-26"}`},
 		{s: `{"date_taken": "2005-03-26T00:00:00+09:00"}`, str: "2005-03-26", jsn: `{"date_taken":"2005-03-26"}`},
 		{s: `{"date_taken": "2005-03-26"}`, str: "2005-03-26", jsn: `{"date_taken":"2005-03-26"}`},
 		{s: `{"date_taken": ""}`, str: "", jsn: `{"date_taken":""}`},