Maxi/InfantrySkillCalculator
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Activity

Implement KeepUpdated. Switch to Logrus logger. Relocate score-related functions.

Browse Source
This commit is contained in:
MaxJa4
2024-01-22 16:03:18 +01:00
parent 7cdc18bd78
commit da1ff4e4e5
16 changed files with 348 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
controllers/user_controller.go
View File

@@ -2,8 +2,8 @@ package controllers
import (
"InfantrySkillCalculator/models"
"InfantrySkillCalculator/utils"
"github.com/gin-gonic/gin"
"log"
"session"
)
@@ -11,7 +11,7 @@ func CreateUser(username string, hashedPassword string, enabled bool, usedCode s
user := models.User{Username: username, Password: hashedPassword, Enabled: enabled}
err := models.DB.Create(&user).Error
if err != nil {
log.Fatalf("Error while creating user: %v", err)
utils.Logger.Fatalf("Error while creating user: %v", err)
}
var code models.ActivationCode
@@ -20,19 +20,19 @@ func CreateUser(username string, hashedPassword string, enabled bool, usedCode s
Where("code = ?", usedCode).
First(&code).Error
if err != nil {
log.Fatalf("Error while getting activation code: %v", err)
utils.Logger.Fatalf("Error while getting activation code: %v", err)
}
code.UsedForUsername = username
err = models.DB.Save(&code).Error
if err != nil {
log.Fatalf("Error while updating activation code: %v", err)
utils.Logger.Fatalf("Error while updating activation code: %v", err)
}
user.UserRole = code.UserRole
err = models.DB.Save(&user).Error
if err != nil {
log.Fatalf("Error while updating user role: %v", err)
utils.Logger.Fatalf("Error while updating user role: %v", err)
}
var bf2042 models.Game
@@ -40,7 +40,7 @@ func CreateUser(username string, hashedPassword string, enabled bool, usedCode s
Where("tag = ?", "BF2042").
First(&bf2042).Error
if err != nil {
log.Fatalf("Error while getting game: %v", err)
utils.Logger.Fatalf("Error while getting game: %v", err)
}
userSettings := models.UserSettings{
Username: username,
@@ -62,7 +62,7 @@ func GetUserRole(username string) models.Role {
var user models.User
err := models.DB.Where("username = ?", username).First(&user).Error
if err != nil {
log.Fatal(err)
utils.Logger.Fatal(err)
}
return user.UserRole
}
@@ -79,7 +79,7 @@ func IsUserAdmin(username string) bool {
var user models.User
err := models.DB.Where("username = ?", username).First(&user).Error
if err != nil {
log.Fatal(err)
utils.Logger.Fatal(err)
return false
}
return user.UserRole == models.AdminRole