Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

fix CI tests

Browse source
This commit is contained in:
Steffen Vogel 2021-10-19 14:18:23 +02:00
parent da0929411b
commit 515ef2de15
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
database/database.go
View file

@ -126,17 +126,14 @@ func DBAddAdminUser(cfg *config.Config) (string, error) {
// Check if admin user exists in DB // Check if admin user exists in DB
var users []User var users []User
err := DBpool.Where("Role = ?", "Admin").Find(&users).Error DBpool.Where("Role = ?", "Admin").Find(&users)
if err != nil {
return "", err
}
adminPW := "" adminPW := ""
adminName := ""
if len(users) == 0 { if len(users) == 0 {
fmt.Println("No admin user found in DB, adding default admin user.") fmt.Println("No admin user found in DB, adding default admin user.")
adminName, err = cfg.String("admin.user") adminName, err := cfg.String("admin.user")
if err != nil || adminName == "" { if err != nil || adminName == "" {
adminName = "admin" adminName = "admin"
} }

1
routes/user/user_test.go
View file

@ -650,7 +650,6 @@ func TestInvalidUserUpdate(t *testing.T) {
helper.KeyModels{"user": modRequest}) helper.KeyModels{"user": modRequest})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equalf(t, 400, code, "Response body: \n%v\n", resp) assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
} }
func TestModifyAddedUserAsAdmin(t *testing.T) { func TestModifyAddedUserAsAdmin(t *testing.T) {

2
routes/user/user_validators.go
View file

@ -100,7 +100,7 @@ func (r *updateUserRequest) updatedUser(callerID interface{}, role interface{},
// Update the username making sure it is NOT taken // Update the username making sure it is NOT taken
var testUser User var testUser User
if err := testUser.ByUsername(r.User.Username); err == nil { if err := testUser.ByUsername(r.User.Username); err == nil {
return u, fmt.Errorf("username is alreaday taken") return u, fmt.Errorf("username is already taken")
} }
if r.User.Username != "" { if r.User.Username != "" {