Entire logging rework. Full error handling. Small improvements.

controllers/score_controller.go

@@ -15,20 +15,17 @@ import (
 // GetScoreByPlayerID GET /score/:player_id
 func GetScoreByPlayerID(c *gin.Context) {
 	var player models.Player
-	var playerId = utils.StringToUint(c.Param("player_id"))
-
-	if err := models.DB.
-		Model(&models.Player{}).
-		Where("id = ?", playerId).
-		First(&player).Error; err != nil {
 
+	if err := models.DB.Where("id = ?", c.Param("player_id")).First(&player).Error; err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "Player not found!"})
+		utils.Logger.Errorf("[SCORE] Player not found: %s", err.Error())
 		return
 	}
 
 	game, err := GetActiveGame(c)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "No active game available!"})
+		utils.Logger.Errorf("[SCORE] No active game available: %s", err.Error())
 		return
 	}
 
@@ -37,7 +34,8 @@ func GetScoreByPlayerID(c *gin.Context) {
 		score = CalcPlayerScore(player.Name, game.Tag)
 		if score == score && score != -1 { // not NaN
 			if err := models.PlayerCache.SetScore(player.ID, game.Tag, score); err != nil {
-				utils.Logger.Fatal(err)
+				utils.Logger.Errorf("[SCORE] Failed to cache player score: %s", err.Error())
+				return
 			}
 		}
 	}
@@ -48,19 +46,20 @@ func GetScoreByPlayerID(c *gin.Context) {
 		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
 	} else {
 		c.JSON(http.StatusBadRequest, "Invalid request!")
+		utils.Logger.Warnf("[SCORE] Invalid request! Player: %s, Game: %s | Score: %f", player.Name, game.Tag, score)
 	}
 }
 
 // GetScoreByPlayerName POST /score/:player_name
 func GetScoreByPlayerName(c *gin.Context) {
-	playerName := c.Param("player_name")
 	game, err := GetActiveGame(c)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "No active game available!"})
+		utils.Logger.Errorf("[SCORE] No active game available: %s", err.Error())
 		return
 	}
 
-	score := CalcPlayerScore(playerName, game.Tag)
+	score := CalcPlayerScore(c.Param("player_name"), game.Tag)
 
 	if score != score || score == -1 { // NaN
 		c.String(http.StatusNotFound, "Spieler nicht gefunden!")
@@ -68,18 +67,19 @@ func GetScoreByPlayerName(c *gin.Context) {
 		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
 	} else {
 		c.String(http.StatusBadRequest, "Ungültige Abfrage!")
+		utils.Logger.Warnf("[SCORE] Invalid request! Player: %s, Game: %s | Score: %f", c.Param("player_name"), game.Tag, score)
 	}
 }
 
 func CalcPlayerScore(playerName string, gameTag string) float32 {
 	if gameTag != "BF5" && gameTag != "BF2042" {
-		utils.Logger.Errorf("Invalid game tag '%s'", gameTag)
+		utils.Logger.Errorf("[SCORE] Invalid game tag '%s'", gameTag)
 		return -1
 	}
 
 	gameMetrics := GetGameMetric(gameTag)
 	if gameMetrics == nil {
-		utils.Logger.Errorf("No game metrics specified for '%s'", gameTag)
+		utils.Logger.Errorf("[SCORE] No game metrics specified for '%s'", gameTag)
 		return -1
 	}
 
@@ -97,7 +97,7 @@ func CalcPlayerScore(playerName string, gameTag string) float32 {
 
 	req, err := http.NewRequest("GET", reqUri, nil)
 	if err != nil {
-		utils.Logger.Errorf("Failed to create request: %s", err)
+		utils.Logger.Errorf("[SCORE] Failed to create request: %s", err.Error())
 		return -1
 	}
 
@@ -105,7 +105,7 @@ func CalcPlayerScore(playerName string, gameTag string) float32 {
 
 	res, err := c.Do(req)
 	if err != nil {
-		utils.Logger.Errorf("Failed to send request: %s", err)
+		utils.Logger.Errorf("[SCORE] Failed to send request: %s", err.Error())
 		return -1
 	}
 
@@ -113,16 +113,18 @@ func CalcPlayerScore(playerName string, gameTag string) float32 {
 		_ = Body.Close()
 	}(res.Body)
 	if res.StatusCode == 404 {
-		utils.Logger.Errorf("User '%s' does not exist!", playerName)
+		utils.Logger.Errorf("[SCORE] User '%s' does not exist!", playerName)
 		return -1
 	} else if res.StatusCode != 200 {
-		utils.Logger.Fatalf("Status code error: %d %s", res.StatusCode, res.Status)
+		utils.Logger.Errorf("[SCORE] Status code error: %d %s", res.StatusCode, res.Status)
+		return -1
 	}
 
 	var data models.TrackerWeaponJSON
 	var body, _ = io.ReadAll(res.Body)
 	if err := json.Unmarshal(body, &data); err != nil {
-		utils.Logger.Fatalf("Failed to deserialize tracker API response: %s", err)
+		utils.Logger.Errorf("Failed to deserialize tracker API response: %s", err)
+		return -1
 	}
 
 	sort.SliceStable(data.Weapons, func(i, j int) bool { return data.Weapons[i].Kills > data.Weapons[j].Kills })
@@ -141,7 +143,7 @@ func CalcPlayerScore(playerName string, gameTag string) float32 {
 
 		weaponMetrics := FindWeaponMetric(gameMetrics.WeaponMetrics, weapon.Type)
 		if weaponMetrics == nil {
-			utils.Logger.Error("No weapon metrics specified for '" + gameTag + "', WType '" + weapon.Type + "'! Skipping...")
+			utils.Logger.Errorf("[SCORE] No weapon metrics specified for '%s'", weapon.Type)
 			continue
 		}