Entire logging rework. Full error handling. Small improvements.
This commit is contained in:
@@ -2,9 +2,10 @@ package controllers
|
||||
|
||||
import (
|
||||
"InfantrySkillCalculator/models"
|
||||
"InfantrySkillCalculator/utils"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
@@ -21,7 +22,11 @@ type UpdateGameInput struct {
|
||||
// GetGames GET /game
|
||||
func GetGames(c *gin.Context) {
|
||||
var games []models.Game
|
||||
models.DB.Find(&games)
|
||||
if err := models.DB.Find(&games).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, games)
|
||||
}
|
||||
@@ -29,7 +34,11 @@ func GetGames(c *gin.Context) {
|
||||
// GetGamesHTML GET /game_html
|
||||
func GetGamesHTML(c *gin.Context) {
|
||||
var games []models.Game
|
||||
models.DB.Find(&games)
|
||||
if err := models.DB.Find(&games).Error; err != nil {
|
||||
c.String(http.StatusBadRequest, "")
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var htmlOptions string
|
||||
htmlOptions = `<option disabled selected value>Auswählen...</option>`
|
||||
@@ -46,6 +55,7 @@ func GetGameByID(c *gin.Context) {
|
||||
var game models.Game
|
||||
if err := models.DB.Where("id = ?", c.Param("id")).First(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -57,11 +67,16 @@ func AddGame(c *gin.Context) {
|
||||
var input AddGameInput
|
||||
if err := c.BindJSON(&input); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
game := models.Game{Name: input.Name, Tag: input.Tag}
|
||||
models.DB.Create(&game)
|
||||
if err := models.DB.Create(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, game)
|
||||
}
|
||||
@@ -71,12 +86,14 @@ func UpdateGameByID(c *gin.Context) {
|
||||
var game models.Game
|
||||
if err := models.DB.Where("id = ?", c.Param("id")).First(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
|
||||
utils.Logger.Errorf("[GAME] Record not found: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
var input UpdateGameInput
|
||||
if err := c.ShouldBindJSON(&input); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
utils.Logger.Errorf("[GAME] Could not parse input: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -88,20 +105,13 @@ func UpdateGameByID(c *gin.Context) {
|
||||
// DeleteGameByID DELETE /game/:id
|
||||
func DeleteGameByID(c *gin.Context) {
|
||||
var game models.Game
|
||||
if err := models.DB.Where("id = ?", c.Param("id")).First(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
|
||||
|
||||
if err := models.DB.Clauses(clause.Returning{}).Delete(&game).Error; err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
utils.Logger.Errorf("[GAME] Error while deleting game: %v", err)
|
||||
return
|
||||
}
|
||||
|
||||
models.DB.Delete(&game)
|
||||
|
||||
c.JSON(http.StatusOK, true)
|
||||
}
|
||||
|
||||
func FindGame(out interface{}, c *gin.Context) *gorm.DB {
|
||||
return models.DB.Where("id = ?", c.Param("id")).First(&out)
|
||||
}
|
||||
|
||||
func FindGameByTag(out interface{}, tag string) *gorm.DB {
|
||||
return models.DB.Where("tag = ?", tag).First(out)
|
||||
utils.Logger.Infof("[GAME] Deleted game: %s", game.Name)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user