From 877812a1697188d0a7815d91c421d54174c0d077 Mon Sep 17 00:00:00 2001 From: Robindiddams Date: Thu, 30 Jul 2020 16:35:52 -0500 Subject: [PATCH 1/2] =?UTF-8?q?remove=20impossible=20error=20from=20NewDat?= =?UTF-8?q?eWithTime=E2=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datetime/time.go | 6 +++--- datetime/time_test.go | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/datetime/time.go b/datetime/time.go index 132ff6b..89090dd 100644 --- a/datetime/time.go +++ b/datetime/time.go @@ -340,13 +340,13 @@ func NewDate(val string) (*Date, error) { } // NewDateWithTime returns a new Date object from a time.Time value -func NewDateWithTime(tv time.Time) (*Date, error) { +func NewDateWithTime(tv time.Time) *Date { _, timezone := tv.Zone() return &Date{ Epoch: TimeToEpoch(tv), Rfc3339: tv.Round(time.Millisecond).Format(RFC3339), Offset: int64(timezone) / 60, - }, nil + } } // NewDateFromEpoch returns a new Date object from a epoch time value @@ -382,7 +382,7 @@ func ConvertToModel(ts time.Time, dateModel interface{}) { } // this always returns nil - date, _ := NewDateWithTime(ts) + date := NewDateWithTime(ts) t := reflect.ValueOf(dateModel).Elem() t.FieldByName("Rfc3339").Set(reflect.ValueOf(date.Rfc3339)) diff --git a/datetime/time_test.go b/datetime/time_test.go index 5fa5d6b..38fb022 100644 --- a/datetime/time_test.go +++ b/datetime/time_test.go @@ -163,8 +163,7 @@ func TestDateObject(t *testing.T) { dt3 := DateFromEpoch(date3.Epoch) assert.WithinDuration(dt3, time.Now(), time.Second) assert.Equal(int64(0), date3.Offset) // make sure ISO returns GMT timezone - dt4, err := NewDateWithTime(dt) - assert.NoError(err) + dt4 := NewDateWithTime(dt) assert.Equal(date1.Epoch, dt4.Epoch) } From b7a940ac87c1473f7dcca2030397a1f06b702d1c Mon Sep 17 00:00:00 2001 From: Robindiddams Date: Thu, 30 Jul 2020 16:50:41 -0500 Subject: [PATCH 2/2] =?UTF-8?q?remove=20comment=F0=9F=92=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datetime/time.go | 1 - 1 file changed, 1 deletion(-) diff --git a/datetime/time.go b/datetime/time.go index 89090dd..8dacc10 100644 --- a/datetime/time.go +++ b/datetime/time.go @@ -381,7 +381,6 @@ func ConvertToModel(ts time.Time, dateModel interface{}) { return } - // this always returns nil date := NewDateWithTime(ts) t := reflect.ValueOf(dateModel).Elem()