mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

fix: json marshalling of custom time (resolve #117)

Browse Source
This commit is contained in:
Ferdinand Mütsch 2021-02-07 12:37:51 +01:00
parent bb1d6c048d
commit 9e5847b66d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
models/shared.go
View File

@ -2,6 +2,7 @@ package models
import ( import (
"database/sql/driver" "database/sql/driver"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"gorm.io/gorm" "gorm.io/gorm"
@ -31,6 +32,10 @@ type Interval struct {
type CustomTime time.Time type CustomTime time.Time
func (j *CustomTime) MarshalJSON() ([]byte, error) {
return json.Marshal(j.String())
}
func (j *CustomTime) UnmarshalJSON(b []byte) error { func (j *CustomTime) UnmarshalJSON(b []byte) error {
s := strings.Replace(strings.Trim(string(b), "\""), ".", "", 1) s := strings.Replace(strings.Trim(string(b), "\""), ".", "", 1)
i, err := strconv.ParseInt(s, 10, 64) i, err := strconv.ParseInt(s, 10, 64)

2
models/user.go
View File

@ -34,7 +34,7 @@ type CredentialsReset struct {
type TimeByUser struct { type TimeByUser struct {
User string User string
Time CustomTime `swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"` Time CustomTime
} }
func (c *CredentialsReset) IsValid() bool { func (c *CredentialsReset) IsValid() bool {