From 515ef2de1567cc666092019dd6db8f28bba80127 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 19 Oct 2021 14:18:23 +0200
Subject: [PATCH] fix CI tests

---
 database/database.go           | 9 +++------
 routes/user/user_test.go       | 1 -
 routes/user/user_validators.go | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/database/database.go b/database/database.go
index b0da0e5..db2e074 100644
--- a/database/database.go
+++ b/database/database.go
@@ -126,17 +126,14 @@ func DBAddAdminUser(cfg *config.Config) (string, error) {
 
 	// Check if admin user exists in DB
 	var users []User
-	err := DBpool.Where("Role = ?", "Admin").Find(&users).Error
-	if err != nil {
-		return "", err
-	}
+	DBpool.Where("Role = ?", "Admin").Find(&users)
+
 	adminPW := ""
-	adminName := ""
 
 	if len(users) == 0 {
 		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 == "" {
 			adminName = "admin"
 		}
diff --git a/routes/user/user_test.go b/routes/user/user_test.go
index 62e4590..8231afb 100644
--- a/routes/user/user_test.go
+++ b/routes/user/user_test.go
@@ -650,7 +650,6 @@ func TestInvalidUserUpdate(t *testing.T) {
 		helper.KeyModels{"user": modRequest})
 	assert.NoError(t, err)
 	assert.Equalf(t, 400, code, "Response body: \n%v\n", resp)
-
 }
 
 func TestModifyAddedUserAsAdmin(t *testing.T) {
diff --git a/routes/user/user_validators.go b/routes/user/user_validators.go
index 49202ef..18fe56b 100644
--- a/routes/user/user_validators.go
+++ b/routes/user/user_validators.go
@@ -100,7 +100,7 @@ func (r *updateUserRequest) updatedUser(callerID interface{}, role interface{},
 	// Update the username making sure it is NOT taken
 	var testUser User
 	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 != "" {