deploy prepare
This commit is contained in:
@@ -65,7 +65,7 @@ func (s *Server) CreateDriver(w http.ResponseWriter, r *http.Request) {
|
||||
ID: userid,
|
||||
Slug: s.GenerateUserSlug(req.FullName, userid),
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
UpdatedAt: &now,
|
||||
Role: "driver",
|
||||
Email: string(req.Email),
|
||||
PasswordHash: string(passwordHash),
|
||||
|
||||
@@ -53,7 +53,7 @@ func (s *Server) CreateManager(w http.ResponseWriter, r *http.Request) {
|
||||
ID: userid,
|
||||
Slug: s.GenerateUserSlug(req.FullName, userid),
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
UpdatedAt: &now,
|
||||
Role: "manager",
|
||||
Email: string(req.Email),
|
||||
PasswordHash: string(passwordHash),
|
||||
|
||||
@@ -54,7 +54,7 @@ func (s *Server) AuthLogin(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
now := time.Now()
|
||||
user.LastLoginAt = &now
|
||||
user.UpdatedAt = now
|
||||
user.UpdatedAt = &now
|
||||
if err := storage.Update(ctx, "users", user, s.DB, func(sb *sqlbuilder.UpdateBuilder) {
|
||||
sb.Where(sb.Equal("id", user.ID))
|
||||
}); err != nil {
|
||||
@@ -171,7 +171,7 @@ func (s *Server) AuthRegister(w http.ResponseWriter, r *http.Request) {
|
||||
ID: uuid,
|
||||
Slug: s.GenerateUserSlug(req.FullName, uuid),
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
UpdatedAt: &now,
|
||||
Role: "client",
|
||||
Email: string(req.Email),
|
||||
PasswordHash: string(passwordHash),
|
||||
@@ -302,7 +302,7 @@ func (s *Server) UpdateMe(w http.ResponseWriter, r *http.Request) {
|
||||
user.FullName = *req.FullName
|
||||
}
|
||||
if req.AvatarUrl != nil {
|
||||
user.AvatarURL = *req.AvatarUrl
|
||||
user.AvatarURL = req.AvatarUrl
|
||||
}
|
||||
if req.Password != nil {
|
||||
if req.CurrentPassword == nil {
|
||||
@@ -321,7 +321,8 @@ func (s *Server) UpdateMe(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
user.PasswordHash = string(hash)
|
||||
}
|
||||
user.UpdatedAt = time.Now()
|
||||
t := time.Now()
|
||||
user.UpdatedAt = &t
|
||||
|
||||
if err := storage.Update(ctx, "users", *user, s.DB, func(sb *sqlbuilder.UpdateBuilder) {
|
||||
sb.Where(sb.Equal("id", claims.ID))
|
||||
|
||||
@@ -12,9 +12,9 @@ type User struct {
|
||||
Slug string `db:"slug"`
|
||||
PasswordHash string `db:"password_hash"`
|
||||
FullName string `db:"full_name"`
|
||||
AvatarURL string `db:"avatar_url"`
|
||||
AvatarURL *string `db:"avatar_url"`
|
||||
Role string `db:"role"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at"`
|
||||
UpdatedAt *time.Time `db:"updated_at"`
|
||||
LastLoginAt *time.Time `db:"last_login_at"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user