Entire logging rework. Full error handling. Small improvements.

controllers/player_controller.go

@@ -24,7 +24,11 @@ type UpdatePlayerInput struct {
 // GetAllPlayers GET /player
 func GetAllPlayers(c *gin.Context) {
 	var players []models.Player
-	models.DB.Find(&players)
+	if err := models.DB.Find(&players).Error; err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
+		utils.Logger.Errorf("[PLAYER] Record not found! Error: %s", err.Error())
+		return
+	}
 
 	c.JSON(http.StatusOK, players)
 }
@@ -38,14 +42,14 @@ func GetPlayersByClanHTML(c *gin.Context) {
 		Find(&players).Error; err != nil {
 
 		c.String(http.StatusBadRequest, "")
-		utils.Logger.Fatal(err)
+		utils.Logger.Errorf("[PLAYER] Clan not found! Error: %s", err.Error())
 		return
 	}
 
 	game, err := GetActiveGame(c)
 	if err != nil {
 		c.String(http.StatusBadRequest, "")
-		utils.Logger.Fatal(err)
+		utils.Logger.Errorf("[PLAYER] No active game not found! Error: %s", err.Error())
 		return
 	}
 
@@ -57,7 +61,8 @@ func GetPlayersByClanHTML(c *gin.Context) {
 	scores, err := models.PlayerCache.GetScores(playerIDs, game.Tag)
 	if err != nil {
 		c.String(http.StatusBadRequest, "")
-		utils.Logger.Fatal(err)
+		utils.Logger.Errorf("[PLAYER] Could not get scores! Error: %s", err.Error())
+		return
 	}
 
 	userRole := GetUserRoleByCtx(c)
@@ -83,92 +88,95 @@ func GetPlayersByClanHTML(c *gin.Context) {
 
 	err = utils.PlayerItemTemplate.Execute(c.Writer, data)
 	if err != nil {
-		utils.Logger.Fatal(err)
+		utils.Logger.Errorf("[PLAYER] Could not execute template! Error: %s", err.Error())
 	}
 }
 
 // AddPlayer POST /player
 func AddPlayer(c *gin.Context) {
 	var input AddPlayerInput
+	var player models.Player
+
 	if err := c.BindJSON(&input); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-		return
-	}
-
-	var player models.Player
-	if err := models.DB.Where("name = ?", input.Name).First(&player).Error; err == nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Player with this name already exists!"})
+		utils.Logger.Errorf("[PLAYER] Could not bind JSON! Error: %s", err.Error())
 		return
 	}
 
 	player = models.Player{Name: input.Name, ClanID: input.ClanID}
-	models.DB.Create(&player)
+	if err := models.DB.Create(&player); err.Error != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error.Error()})
+		utils.Logger.Errorf("[PLAYER] Could not create player! Error: %s", err.Error.Error())
+		return
+	}
 
 	c.JSON(http.StatusOK, player)
 
-	utils.Logger.Infof("Added player '%s'", input.Name)
+	utils.Logger.Infof("[PLAYER] Added player '%s' in clan %d", input.Name, input.ClanID)
 }
 
 // GetPlayerByID GET /player/:id
 func GetPlayerByID(c *gin.Context) {
-	player := FindPlayerByID(utils.StringToUint(c.Param("id")))
-	if player == nil {
+	var player models.Player
+
+	if err := models.DB.Where("id = ?", c.Param("id")).First(&player).Error; err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
+		utils.Logger.Errorf("[PLAYER] Could not find player! Error: %s", err.Error())
 		return
 	}
 
 	c.JSON(http.StatusOK, player)
 }
 
-// GetPlayerIDByName GET /playerid/:name
-func GetPlayerIDByName(c *gin.Context) {
-	var player models.Player
-
-	if err := FindPlayerByName(&player, c).Error; err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
-		return
-	}
-
-	c.JSON(http.StatusOK, player.ID)
-}
-
 // UpdatePlayerByID PATCH /player/:id
 func UpdatePlayerByID(c *gin.Context) {
 	var input UpdatePlayerInput
+	var player models.Player
+
 	if err := c.ShouldBindJSON(&input); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		utils.Logger.Errorf("[PLAYER] Could not bind JSON! Error: %s", err.Error())
 		return
 	}
 
-	res := models.DB.Model(&models.Player{}).
-		Where("id = ?", utils.StringToUint(c.Param("id"))).
-		Updates(map[string]interface{}{
-			"Name":   input.Name,
-			"ClanID": input.ClanID,
-		})
-	if res.Error != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": res.Error.Error()})
+	if err := models.DB.First(&player, c.Param("id")).Error; err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
+		utils.Logger.Errorf("[PLAYER] Could not find player! Error: %s", err.Error())
+		return
+	}
+
+	oldValues := models.Player{
+		Name:   player.Name,
+		ClanID: player.ClanID,
+	}
+
+	player.Name = input.Name
+	player.ClanID = input.ClanID
+
+	if err := models.DB.Save(&player).Error; err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		utils.Logger.Errorf("[PLAYER] Could not update player! Error: %s", err.Error())
 		return
 	}
 
 	c.JSON(http.StatusOK, nil)
 
-	utils.Logger.Infof("Updated player '%s'", input.Name)
+	utils.Logger.Infof("[PLAYER] Updated player: %s -> %s", oldValues.Name, player.Name)
 }
 
 // DeletePlayerByID DELETE /player/:id
 func DeletePlayerByID(c *gin.Context) {
-	player := FindPlayerByID(utils.StringToUint(c.Param("id")))
-	if player == nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
+	var player models.Player
+
+	if err := models.DB.Clauses(clause.Returning{}).Delete(&player).Error; err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		utils.Logger.Errorf("[PLAYER] Could not delete player! Error: %s", err.Error())
 		return
 	}
 
-	models.DB.Delete(&player)
-
 	c.JSON(http.StatusOK, true)
 
-	utils.Logger.Infof("Deleted player '%s'", player.Name)
+	utils.Logger.Infof("[PLAYER] Deleted player: %s", player.Name)
 }
 
 // DeleteAllPlayers DELETE /admin/player
@@ -178,22 +186,12 @@ func DeleteAllPlayers(c *gin.Context) {
 		Session(&gorm.Session{AllowGlobalUpdate: true}).
 		Clauses(clause.Returning{}).
 		Delete(&players).Error; err != nil {
+
 		c.String(http.StatusBadRequest, "Purge failed! Error: "+err.Error())
+		utils.Logger.Errorf("[PLAYER] Could not purge players! Error: %s", err.Error())
 		return
 	}
 
 	c.String(http.StatusOK, "Purged "+utils.UintToString(uint(len(players)))+" players!")
-}
-
-func FindPlayerByID(id uint) *models.Player {
-	var res models.Player
-	if err := models.DB.Where("id = ?", id).First(&res).Error; err != nil {
-		return nil
-	} else {
-		return &res
-	}
-}
-
-func FindPlayerByName(out interface{}, c *gin.Context) *gorm.DB {
-	return models.DB.Where("name = ?", c.Param("name")).First(out)
+	utils.Logger.Infof("[PLAYER] Purged %d players!", len(players))
 }