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

Entire logging rework. Full error handling. Small improvements.

Browse Source
This commit is contained in:
MaxJa4
2024-01-22 17:24:17 +01:00
parent da1ff4e4e5
commit ca697da0da
18 changed files with 278 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
controllers/clan_controller.go
View File

@@ -25,7 +25,11 @@ type UpdateClanInput struct {
// GetAllClans GET /clan
func GetAllClans(c *gin.Context) {
var clans []models.Clan
models.DB.Find(&clans)
if err := models.DB.Find(&clans).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
utils.Logger.Errorf("[CLAN] Error while getting all clans: %s", err.Error())
return
}
c.JSON(http.StatusOK, clans)
}
@@ -33,7 +37,11 @@ func GetAllClans(c *gin.Context) {
// GetAllClansHTML GET /clans_html
func GetAllClansHTML(c *gin.Context) {
var clans []models.Clan
models.DB.Find(&clans)
if err := models.DB.Find(&clans).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
utils.Logger.Errorf("[CLAN] Error while getting all clans: %s", err.Error())
return
}
var htmlOptions string
htmlOptions = `<option disabled selected value>Auswählen...</option>`
@@ -48,34 +56,34 @@ func GetAllClansHTML(c *gin.Context) {
// AddClan POST /clan
func AddClan(c *gin.Context) {
var input AddClanInput
var clan models.Clan
if err := c.BindJSON(&input); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
var clan models.Clan
if err := FindClanByName(&clan, input.Name).Error; err == nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Clan with this name already exists!"})
return
} else if err := FindClanByTag(&clan, input.Tag).Error; err == nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Clan with this tag already exists!"})
utils.Logger.Errorf("[CLAN] Error while binding JSON: %s", err.Error())
return
}
clan = models.Clan{Name: input.Name, Tag: input.Tag, KeepUpdated: input.KeepUpdated}
models.DB.Create(&clan)
if err := models.DB.Create(&clan).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
utils.Logger.Errorf("[CLAN] Error while adding clan '[%s] %s': %s", input.Tag, input.Name, err.Error())
return
}
c.JSON(http.StatusOK, clan)
utils.Logger.Infof("Added clan '%s' with tag '%s'", clan.Name, clan.Tag)
utils.Logger.Infof("[CLAN] Added clan: [%s] %s", clan.Tag, clan.Name)
}
// GetClanByID GET /clan/:id
func GetClanByID(c *gin.Context) {
var clan models.Clan
if err := FindClanByID(&clan, c).Error; err != nil {
if err := models.DB.Where("id = ?", c.Param("id")).First(&clan).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
utils.Logger.Errorf("[CLAN] Error while getting clan by ID: %s", err.Error())
return
}
@@ -85,41 +93,57 @@ func GetClanByID(c *gin.Context) {
// UpdateClanByID PATCH /clan/:id
func UpdateClanByID(c *gin.Context) {
var input UpdateClanInput
var clan models.Clan
if err := c.ShouldBindJSON(&input); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
utils.Logger.Errorf("[CLAN] Error while binding JSON: %s", err.Error())
return
}
res := models.DB.Model(&models.Clan{}).
Where("id = ?", c.Param("id")).
Updates(map[string]interface{}{
"Name": input.Name,
"Tag": input.Tag,
"KeepUpdated": input.KeepUpdated,
})
if res.Error != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": res.Error.Error()})
if err := models.DB.First(&clan, c.Param("id")).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
utils.Logger.Errorf("[CLAN] Error while getting clan by ID: %s", err.Error())
return
}
oldValues := models.Clan{
Name: clan.Name,
Tag: clan.Tag,
KeepUpdated: clan.KeepUpdated,
}
clan.Name = input.Name
clan.Tag = input.Tag
clan.KeepUpdated = input.KeepUpdated
if err := models.DB.Save(&clan).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
utils.Logger.Errorf("[CLAN] Error while updating clan '%s': %s", input.Name, err.Error())
return
}
c.JSON(http.StatusOK, nil)
utils.Logger.Infof("Updated clan '%s' with tag '%s'", input.Name, input.Tag)
utils.Logger.Infof("[CLAN] Updated clan: [%s] %s -> [%s] %s", oldValues.Tag, oldValues.Name, clan.Tag, clan.Name)
}
// DeleteClanByID DELETE /clan/:id
func DeleteClanByID(c *gin.Context) {
var clan models.Clan
if err := FindClanByID(&clan, c).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Record not found!"})
if err := models.DB.Clauses(clause.Returning{}).
Where("id = ?", c.Param("id")).
Delete(&clan).Error; err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
utils.Logger.Errorf("[CLAN] Error while deleting clan '%s': %s", clan.Name, err.Error())
return
}
models.DB.Delete(&clan)
c.JSON(http.StatusOK, true)
utils.Logger.Infof("Deleted clan '%s' with tag '%s'", clan.Name, clan.Tag)
utils.Logger.Infof("[CLAN] Deleted clan: [%s] %s", clan.Tag, clan.Name)
}
// DeleteAllClans DELETE /admin/clan
@@ -129,21 +153,12 @@ func DeleteAllClans(c *gin.Context) {
Session(&gorm.Session{AllowGlobalUpdate: true}).
Clauses(clause.Returning{}).
Delete(&clans).Error; err != nil {
c.String(http.StatusBadRequest, "Purge failed! Error: "+err.Error())
utils.Logger.Errorf("[CLAN] Error while purging all clans: %s", err.Error())
return
}
c.String(http.StatusOK, "Purged "+utils.UintToString(uint(len(clans)))+" clans!")
}
func FindClanByName(out interface{}, name string) *gorm.DB {
return models.DB.Where("name = ?", name).First(out)
}
func FindClanByTag(out interface{}, tag string) *gorm.DB {
return models.DB.Where("tag = ?", tag).First(out)
}
func FindClanByID(out interface{}, c *gin.Context) *gorm.DB {
return models.DB.Where("id = ?", c.Param("id")).First(out)
utils.Logger.Infof("[CLAN] Purged %d clans!", len(clans))
}