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

2024-01-22 16:03:18 +01:00
parent 7cdc18bd78
commit da1ff4e4e5
16 changed files with 348 additions and 280 deletions
--- a/controllers/cache_controller.go
+++ b/controllers/cache_controller.go
@@ -3,9 +3,7 @@ package controllers
 import (
 	"InfantrySkillCalculator/models"
 	"InfantrySkillCalculator/utils"
-	"fmt"
 	"github.com/gin-gonic/gin"
-	"log"
 	"net/http"
 )

@@ -95,61 +93,33 @@ func DeleteAllCaches(c *gin.Context) {
 	}
 }

-// GetScoreByPlayerID GET /score/:player_id
-func GetScoreByPlayerID(c *gin.Context) {
-	var player models.Player
-	var playerId = utils.StringToUint(c.Param("player_id"))
+func UpdateCacheAfterExpiry(key string) {
+	utils.Logger.Println("[KeepUpdated] Cache expired: " + key)

+	playerId, err := models.PlayerCache.GetPlayerIdFromCacheKey(key)
+	if err != nil {
+		utils.Logger.Fatal(err)
+	}
+
+	var player models.Player
 	if err := models.DB.
-		Model(&models.Player{}).
+		Preload("Clan").
 		Where("id = ?", playerId).
 		First(&player).Error; err != nil {

-		c.JSON(http.StatusBadRequest, gin.H{"error": "Player not found!"})
-		return
+		utils.Logger.Println("Failed to find player: " + err.Error())
 	}

-	game, err := GetActiveGame(c)
-	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "No active game available!"})
-		return
-	}
-
-	score, err := models.PlayerCache.GetScore(player.ID, game.Tag)
-	if err != nil || score == -1 {
-		score = utils.CalcPlayerScore(player.Name, game.Tag)
+	if player.Clan.KeepUpdated {
+		score := CalcPlayerScore(player.Name, "BF2042")
 		if score == score && score != -1 { // not NaN
-			if err := models.PlayerCache.SetScore(player.ID, game.Tag, score); err != nil {
-				log.Fatal(err)
+			if err := models.PlayerCache.SetScore(player.ID, "BF2042", score); err != nil {
+				utils.Logger.Println("Failed to update cache: " + err.Error())
+			} else {
+				utils.Logger.Println("[KeepUpdated] Updated cache for player " + player.Name)
 			}
+		} else {
+			utils.Logger.Println("[KeepUpdated] Received NaN for player " + player.Name)
 		}
 	}
-
-	if score != score || score == -1 { // NaN
-		c.String(http.StatusOK, "<i class=\"bi bi-person-x-fill me-2 text-danger fs-5\" style=\"margin-left: 0.69rem;\"></i>")
-	} else if score != -1 {
-		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
-	} else {
-		c.JSON(http.StatusBadRequest, "Invalid request!")
-	}
-}
-
-// 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!"})
-		return
-	}
-
-	score := utils.CalcPlayerScore(playerName, game.Tag)
-
-	if score != score || score == -1 { // NaN
-		c.String(http.StatusNotFound, "Spieler nicht gefunden!")
-	} else if score != -1 {
-		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
-	} else {
-		c.String(http.StatusBadRequest, "Ungültige Abfrage!")
-	}
 }
--- a/controllers/clan_controller.go
+++ b/controllers/clan_controller.go
@@ -7,7 +7,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	"log"
 	"net/http"
 )

@@ -68,10 +67,7 @@ func AddClan(c *gin.Context) {

 	c.JSON(http.StatusOK, clan)

-	_, err := fmt.Fprintf(utils.GinWriter, "Added clan '"+clan.Name+"' with tag '"+clan.Tag+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Added clan '%s' with tag '%s'", clan.Name, clan.Tag)
 }

 // GetClanByID GET /clan/:id
@@ -108,10 +104,7 @@ func UpdateClanByID(c *gin.Context) {

 	c.JSON(http.StatusOK, nil)

-	_, err := fmt.Fprintf(utils.GinWriter, "Updated clan '"+input.Name+"' with tag '"+input.Tag+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Updated clan '%s' with tag '%s'", input.Name, input.Tag)
 }

 // DeleteClanByID DELETE /clan/:id
@@ -126,10 +119,7 @@ func DeleteClanByID(c *gin.Context) {

 	c.JSON(http.StatusOK, true)

-	_, err := fmt.Fprintf(utils.GinWriter, "Deleted clan '"+clan.Name+"' with tag '"+clan.Tag+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Deleted clan '%s' with tag '%s'", clan.Name, clan.Tag)
 }

 // DeleteAllClans DELETE /admin/clan
--- a/controllers/metrics_controller.go
+++ b/controllers/metrics_controller.go
@@ -5,14 +5,15 @@ import (
 	"InfantrySkillCalculator/utils"
 	"encoding/json"
 	"io"
-	"log"
 	"os"
 )

+var gameMetrics models.GameMetrics
+
 func LoadMetrics() {
 	f, err := os.Open("./config/metrics.json")
 	if err != nil {
-		log.Fatal("Failed to open metrics.json: ", err)
+		utils.Logger.Fatal("Failed to open metrics.json: ", err)
 	}
 	defer func(f *os.File) {
 		_ = f.Close()
@@ -20,13 +21,31 @@ func LoadMetrics() {

 	data, err := io.ReadAll(f)
 	if err != nil {
-		log.Fatal("Failed to read metrics.json: ", err)
+		utils.Logger.Fatal("Failed to read metrics.json: ", err)
 	}

 	var metrics models.GameMetrics
 	if err := json.Unmarshal(data, &metrics); err != nil {
-		log.Fatal("Failed to deserialize metrics.json: ", err)
+		utils.Logger.Fatal("Failed to deserialize metrics.json: ", err)
 	}

-	utils.GameMetrics = metrics
+	gameMetrics = metrics
+}
+
+func GetGameMetric(gameTag string) *models.GameMetric {
+	for _, metric := range gameMetrics.GameMetrics {
+		if metric.GameName == gameTag {
+			return &metric
+		}
+	}
+	return nil
+}
+
+func FindWeaponMetric(weaponMetrics []models.WeaponMetric, weaponCategory string) *models.WeaponMetric {
+	for _, metric := range weaponMetrics {
+		if metric.WeaponCategory == weaponCategory {
+			return &metric
+		}
+	}
+	return nil
 }
--- a/controllers/player_controller.go
+++ b/controllers/player_controller.go
@@ -8,7 +8,6 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"html/template"
-	"log"
 	"net/http"
 )

@@ -39,14 +38,14 @@ func GetPlayersByClanHTML(c *gin.Context) {
 		Find(&players).Error; err != nil {

 		c.String(http.StatusBadRequest, "")
-		log.Fatal(err)
+		utils.Logger.Fatal(err)
 		return
 	}

 	game, err := GetActiveGame(c)
 	if err != nil {
 		c.String(http.StatusBadRequest, "")
-		log.Fatal(err)
+		utils.Logger.Fatal(err)
 		return
 	}

@@ -58,7 +57,7 @@ func GetPlayersByClanHTML(c *gin.Context) {
 	scores, err := models.PlayerCache.GetScores(playerIDs, game.Tag)
 	if err != nil {
 		c.String(http.StatusBadRequest, "")
-		log.Fatal(err)
+		utils.Logger.Fatal(err)
 	}

 	userRole := GetUserRoleByCtx(c)
@@ -84,7 +83,7 @@ func GetPlayersByClanHTML(c *gin.Context) {

 	err = utils.PlayerItemTemplate.Execute(c.Writer, data)
 	if err != nil {
-		log.Fatal(err)
+		utils.Logger.Fatal(err)
 	}
 }

@@ -107,10 +106,7 @@ func AddPlayer(c *gin.Context) {

 	c.JSON(http.StatusOK, player)

-	_, err := fmt.Fprintf(utils.GinWriter, "Added player '"+player.Name+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Added player '%s'", input.Name)
 }

 // GetPlayerByID GET /player/:id
@@ -157,10 +153,7 @@ func UpdatePlayerByID(c *gin.Context) {

 	c.JSON(http.StatusOK, nil)

-	_, err := fmt.Fprintf(utils.GinWriter, "Updated player '"+input.Name+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Updated player '%s'", input.Name)
 }

 // DeletePlayerByID DELETE /player/:id
@@ -175,10 +168,7 @@ func DeletePlayerByID(c *gin.Context) {

 	c.JSON(http.StatusOK, true)

-	_, err := fmt.Fprintf(utils.GinWriter, "Deleted player '"+player.Name+"'\n")
-	if err != nil {
-		log.Fatal(err)
-	}
+	utils.Logger.Infof("Deleted player '%s'", player.Name)
 }

 // DeleteAllPlayers DELETE /admin/player
--- a/controllers/score_controller.go
+++ b/controllers/score_controller.go
@@ -0,0 +1,171 @@
+package controllers
+
+import (
+	"InfantrySkillCalculator/models"
+	"InfantrySkillCalculator/utils"
+	"encoding/json"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"io"
+	"math"
+	"net/http"
+	"sort"
+)
+
+// 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 {
+
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Player not found!"})
+		return
+	}
+
+	game, err := GetActiveGame(c)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "No active game available!"})
+		return
+	}
+
+	score, err := models.PlayerCache.GetScore(player.ID, game.Tag)
+	if err != nil || score == -1 {
+		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)
+			}
+		}
+	}
+
+	if score != score || score == -1 { // NaN
+		c.String(http.StatusOK, "<i class=\"bi bi-person-x-fill me-2 text-danger fs-5\" style=\"margin-left: 0.69rem;\"></i>")
+	} else if score != -1 {
+		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
+	} else {
+		c.JSON(http.StatusBadRequest, "Invalid request!")
+	}
+}
+
+// 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!"})
+		return
+	}
+
+	score := CalcPlayerScore(playerName, game.Tag)
+
+	if score != score || score == -1 { // NaN
+		c.String(http.StatusNotFound, "Spieler nicht gefunden!")
+	} else if score != -1 {
+		c.String(http.StatusOK, fmt.Sprintf("%.2f", score))
+	} else {
+		c.String(http.StatusBadRequest, "Ungültige Abfrage!")
+	}
+}
+
+func CalcPlayerScore(playerName string, gameTag string) float32 {
+	if gameTag != "BF5" && gameTag != "BF2042" {
+		utils.Logger.Errorf("Invalid game tag '%s'", gameTag)
+		return -1
+	}
+
+	gameMetrics := GetGameMetric(gameTag)
+	if gameMetrics == nil {
+		utils.Logger.Errorf("No game metrics specified for '%s'", gameTag)
+		return -1
+	}
+
+	normalizeFactor := gameMetrics.NormalizeFactor
+	topWeaponCount := gameMetrics.TopWeaponCount
+
+	c := http.Client{}
+
+	var reqUri string
+	if gameTag == "BF5" {
+		reqUri = "https://api.gametools.network/bfv/weapons/?raw=false&format_values=false&name=" + playerName + "&platform=pc"
+	} else if gameTag == "BF2042" {
+		reqUri = "https://api.gametools.network/bf2042/stats/?raw=false&format_values=false&name=" + playerName + "&platform=pc"
+	}
+
+	req, err := http.NewRequest("GET", reqUri, nil)
+	if err != nil {
+		utils.Logger.Errorf("Failed to create request: %s", err)
+		return -1
+	}
+
+	req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36")
+
+	res, err := c.Do(req)
+	if err != nil {
+		utils.Logger.Errorf("Failed to send request: %s", err)
+		return -1
+	}
+
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(res.Body)
+	if res.StatusCode == 404 {
+		utils.Logger.Errorf("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)
+	}
+
+	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)
+	}
+
+	sort.SliceStable(data.Weapons, func(i, j int) bool { return data.Weapons[i].Kills > data.Weapons[j].Kills })
+	var top []models.Weapon
+
+	for _, weapon := range data.Weapons {
+		if len(top) >= topWeaponCount {
+			break
+		}
+		if gameTag == "BF2042" && weapon.Kills < 100 {
+			break
+		}
+
+		acc := (float64(weapon.ShotsHit) / float64(weapon.ShotsFired)) * 100
+		kpm := weapon.KPM
+
+		weaponMetrics := FindWeaponMetric(gameMetrics.WeaponMetrics, weapon.Type)
+		if weaponMetrics == nil {
+			utils.Logger.Error("No weapon metrics specified for '" + gameTag + "', WType '" + weapon.Type + "'! Skipping...")
+			continue
+		}
+
+		accFactor := weaponMetrics.AccuracyFactor
+		kpmFactor := weaponMetrics.KpmFactor
+
+		acc /= accFactor
+		kpm /= kpmFactor
+		weapon.Accuracy = acc
+		weapon.KPM = kpm
+
+		top = append(top, weapon)
+	}
+
+	sumAcc := 0.0
+	sumKpm := 0.0
+
+	for _, w := range top {
+		sumAcc += w.Accuracy
+		sumKpm += w.KPM
+	}
+	accAvg := sumAcc / float64(len(top))
+	kpmAvg := sumKpm / float64(len(top))
+	score := math.Round(((accAvg*kpmAvg)/normalizeFactor)*100) / 100
+
+	return float32(score)
+}
--- a/controllers/user_controller.go
+++ b/controllers/user_controller.go
@@ -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