Compare commits

..
3 Commits
Author SHA1 Message Date
Dustin Pianalto 5400d6acd9 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 14:48:59 -09:00
Dustin Pianalto 74edd574b3 fix bug in user service
CI / build (push) Has been cancelled
2021-01-23 14:46:25 -09:00
Dustin Pianalto 266cde6468 fix bug in running migrations
CI / build (push) Has been cancelled
2021-01-23 04:27:34 -09:00
2 changed files with 11 additions and 2 deletions
+4
View File
@@ -49,8 +49,12 @@ func ConnectDatabase(dbConnString string) {
} }
err = m.Up() err = m.Up()
if err != nil { if err != nil {
if err.Error() == "no change" {
log.Println(err)
} else {
log.Fatal(err) log.Fatal(err)
} }
}
log.Println("Migrations Run") log.Println("Migrations Run")
initServices() initServices()
log.Println("Services Initialized") log.Println("Services Initialized")
+6 -1
View File
@@ -20,7 +20,12 @@ func (s userService) User(id string) (geeksbot.User, error) {
func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) { func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) {
queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)" queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)"
_, err := s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin) var err error
if u.SteamID.Valid {
_, err = s.db.Exec(queryString, u.ID, u.SteamID.String, u.IsActive, u.IsStaff, u.IsAdmin)
} else {
_, err = s.db.Exec(queryString, u.ID, nil, u.IsActive, u.IsStaff, u.IsAdmin)
}
return u, err return u, err
} }