From 277edce302668a5667d461927e0e16a97d641355 Mon Sep 17 00:00:00 2001 From: Elmar Kresse Date: Mon, 10 Jun 2024 20:43:12 +0200 Subject: [PATCH] fix:#7 fixed models lint --- services/ical/model/eventModel_test.go | 5 +++-- services/ical/model/feedModel.go | 1 - services/ical/model/icalModel.go | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/ical/model/eventModel_test.go b/services/ical/model/eventModel_test.go index 6813cbd..e396b59 100644 --- a/services/ical/model/eventModel_test.go +++ b/services/ical/model/eventModel_test.go @@ -24,7 +24,8 @@ import ( ) func TestEvents_Contains(t *testing.T) { - specificTime, _ := time.Parse("2020-01-01 12:00:00.000Z", "2020-01-01 12:00:00.000Z") + // parse time for JSONTime "2020-01-01 12:00:00.000Z" + specificTime, _ := time.Parse("2020-01-01T12:00:00.000Z", "2020-01-01 12:00:00.000Z") specificJSONTime := JSONTime(specificTime) type args struct { @@ -72,7 +73,7 @@ func TestEvents_Contains(t *testing.T) { func TestEvent_Equals(t *testing.T) { - specificTime, _ := time.Parse("2020-01-01 12:00:00.000Z", "2020-01-01 12:00:00.000Z") + specificTime, _ := time.Parse("2020-01-01T12:00:00.000Z", "2020-01-01 12:00:00.000Z") specificJSONTime := JSONTime(specificTime) type fields struct { diff --git a/services/ical/model/feedModel.go b/services/ical/model/feedModel.go index 4202ec3..864d629 100644 --- a/services/ical/model/feedModel.go +++ b/services/ical/model/feedModel.go @@ -17,7 +17,6 @@ package model type BaseModel struct { - isNotNew bool Id string `db:"id" json:"id"` Created JSONTime `db:"created" json:"created"` Updated JSONTime `db:"updated" json:"updated"` diff --git a/services/ical/model/icalModel.go b/services/ical/model/icalModel.go index 4d4d036..a8b09ed 100644 --- a/services/ical/model/icalModel.go +++ b/services/ical/model/icalModel.go @@ -18,7 +18,6 @@ package model import ( "encoding/json" - "errors" "fmt" "strings" "time" @@ -79,5 +78,5 @@ func (jt *JSONTime) UnmarshalJSON(b []byte) error { *jt = JSONTime(t) return nil } - return errors.New(fmt.Sprintf("Invalid date format: %s", timeString)) + return fmt.Errorf("error parsing time string %s: %w", timeString, err) }