From 309044f6515115e960ecd42b970ebbf10c84678c Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Sun, 5 Feb 2023 16:28:55 +0400 Subject: [PATCH] Dates are now of type time.Time. --- database/sqlite/database.go | 8 +++++++- guestbook/entry.go | 16 ++++++++-------- guestbook/reply.go | 8 ++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/database/sqlite/database.go b/database/sqlite/database.go index c1a6d35..2d5b14e 100644 --- a/database/sqlite/database.go +++ b/database/sqlite/database.go @@ -4,6 +4,7 @@ import ( "database/sql" _ "embed" "fmt" + "time" "git.arav.top/Arav/justguestbook/guestbook" _ "github.com/mattn/go-sqlite3" @@ -137,9 +138,14 @@ func (d *SQLiteDatabase) Entries(page, pageSize int64) (entries []*guestbook.Ent } if reply_message.Valid /* reply_created is also valid if reply is */ { + date, err := time.Parse(guestbook.DateFormat, reply_created.String) + if err != nil { + return nil, err + } + entry.Reply = &guestbook.Reply{ ID: entry.ID, - Created: reply_created.String, + Created: date, Message: reply_message.String} } diff --git a/guestbook/entry.go b/guestbook/entry.go index 55e36b5..6e082dd 100644 --- a/guestbook/entry.go +++ b/guestbook/entry.go @@ -6,13 +6,13 @@ import ( ) type Entry struct { - ID int64 `json:"entry_id"` - Created string `json:"created"` - Name string `json:"name"` - Website string `json:"website,omitempty"` - Message string `json:"message"` - HideWebsite bool `json:"hide_website,omitempty"` - Reply *Reply `json:"reply,omitempty"` + ID int64 `json:"entry_id"` + Created time.Time `json:"created"` + Name string `json:"name"` + Website string `json:"website,omitempty"` + Message string `json:"message"` + HideWebsite bool `json:"hide_website,omitempty"` + Reply *Reply `json:"reply,omitempty"` } func NewEntry(name, message, website string, hideWebsite bool) (*Entry, error) { @@ -21,7 +21,7 @@ func NewEntry(name, message, website string, hideWebsite bool) (*Entry, error) { } return &Entry{ - Created: time.Now().UTC().Format(DateFormat), + Created: time.Now().UTC(), Name: name, Website: website, HideWebsite: hideWebsite, diff --git a/guestbook/reply.go b/guestbook/reply.go index ebef0cd..e8cce6c 100644 --- a/guestbook/reply.go +++ b/guestbook/reply.go @@ -6,9 +6,9 @@ import ( ) type Reply struct { - ID int64 `json:"-"` - Created string `json:"created,omitempty"` - Message string `json:"message"` + ID int64 `json:"-"` + Created time.Time `json:"created,omitempty"` + Message string `json:"message"` } func NewReply(entryID int64, message string) (*Reply, error) { @@ -18,6 +18,6 @@ func NewReply(entryID int64, message string) (*Reply, error) { return &Reply{ ID: entryID, - Created: time.Now().UTC().Format(DateFormat), + Created: time.Now().UTC(), Message: message}, nil }