From 317e0ab83d3224de0fe53bc852b3600867a060f3 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 19 Jan 2024 10:40:27 +1100 Subject: [PATCH] bugfix --- models/user.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/models/user.go b/models/user.go index 33eeb67..7683bb9 100644 --- a/models/user.go +++ b/models/user.go @@ -50,12 +50,16 @@ func (u *User) SaveUser() (*User, error) { var err error + if u.LastLogin.IsZero() { + u.LastLogin = time.Time{} + } + // Validate username not already in use _, err = UserGetByName(u.UserName) if err != nil && err.Error() == "user not found" { log.Printf("SaveUser confirmed no existing user, continuing with creation of user '%s'\n", u.UserName) //log.Printf("u: %v\n", u) - result, err := db.NamedExec((`INSERT INTO users (GroupId, UserName, Password, LdapUser, Admin) VALUES (:GroupId, :UserName, :Password, :LdapUser, :Admin)`), u) + result, err := db.NamedExec((`INSERT INTO users (GroupId, UserName, Password, LdapUser, Admin, LastLogin) VALUES (:GroupId, :UserName, :Password, :LdapUser, :Admin, :LastLogin)`), u) if err != nil { log.Printf("SaveUser error executing sql record : '%s'\n", err) @@ -474,7 +478,7 @@ func UserList() ([]User, error) { rows, err := db.Queryx("SELECT * FROM users") if err != nil { - log.Printf("QueryUsers error executing sql record : '%s'\n", err) + log.Printf("UserList error executing sql record : '%s'\n", err) return results, err } else { // parse all the results into a slice @@ -482,13 +486,13 @@ func UserList() ([]User, error) { var u User err = rows.StructScan(&u) if err != nil { - log.Printf("QueryUsers error parsing sql record : '%s'\n", err) + log.Printf("UserList error parsing sql record : '%s'\n", err) return results, err } results = append(results, u) } - log.Printf("QueryUsers retrieved '%d' results\n", len(results)) + log.Printf("UserList retrieved '%d' results\n", len(results)) } return results, nil