Fix 404 & clean code

This commit is contained in:
William Bouzourène 2025-01-20 15:40:03 +01:00
parent 1dc135f8f9
commit 1d390cf7ff
Signed by: bouzoure
SSH key fingerprint: SHA256:19MbXpLua4rUtk8tunMesD8KUKb91LXLHg8E/qTooww
9 changed files with 192 additions and 184 deletions

View file

@ -40,14 +40,14 @@ func ListShow(c *fiber.Ctx) error {
var list models.List
result := db.Find(&list, "id = ?", id)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
if result.Error != nil {
return result.Error
}
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
title := fmt.Sprintf(
"%s | Listes",
list.Name,
@ -90,12 +90,12 @@ func ListAdd(c *fiber.Ctx) error {
result := db.Create(&list)
if result.Error != nil {
return result.Error
} else {
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
}
@ -117,14 +117,14 @@ func ListEdit(c *fiber.Ctx) error {
var list models.List
result := db.Find(&list, "id = ?", id)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
if result.Error != nil {
return result.Error
}
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
title := fmt.Sprintf(
"%s | Modifier liste",
list.Name,
@ -148,29 +148,29 @@ func ListEdit(c *fiber.Ctx) error {
}
if len(errors) == 0 {
result := db.Save(&list)
result = db.Save(&list)
if result.Error != nil {
return result.Error
} else {
if !list.Multi && multiOriginal {
var listItems []models.ListItem
result2 := db.Find(&listItems,
"list_id = ? AND `default` = ?",
list.ID, true,
)
if result2.RowsAffected > 1 {
db.Model(&models.ListItem{}).Where(
"list_id = ?", list.ID,
).Update("default", false)
}
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
if !list.Multi && multiOriginal {
var listItems []models.ListItem
result = db.Find(&listItems,
"list_id = ? AND `default` = ?",
list.ID, true,
)
if result.RowsAffected > 1 {
db.Model(&models.ListItem{}).Where(
"list_id = ?", list.ID,
).Update("default", false)
}
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
}
@ -208,14 +208,14 @@ func ListItemAdd(c *fiber.Ctx) error {
var list models.List
result := db.Find(&list, "id = ?", id)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
if result.Error != nil {
return result.Error
}
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
title := fmt.Sprintf(
"%s | Ajouter un élément à la liste",
list.Name,
@ -244,19 +244,19 @@ func ListItemAdd(c *fiber.Ctx) error {
result := db.Create(&listItem)
if result.Error != nil {
return result.Error
} else {
if listItem.Default && !list.Multi {
db.Model(&models.ListItem{}).Where(
"list_id = ? AND id <> ?",
list.ID, listItem.ID,
).Update("default", false)
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
if listItem.Default && !list.Multi {
db.Model(&models.ListItem{}).Where(
"list_id = ? AND id <> ?",
list.ID, listItem.ID,
).Update("default", false)
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
}
@ -280,25 +280,25 @@ func ListItemEdit(c *fiber.Ctx) error {
var list models.List
result := db.Find(&list, "id = ?", id)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
if result.Error != nil {
return result.Error
}
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
var listItem models.ListItem
result = db.Find(&listItem, "id = ?", itemid)
if result.Error != nil {
return result.Error
}
var listItem models.ListItem
result2 := db.Find(&listItem, "id = ?", itemid)
if errors.Is(result2.Error, gorm.ErrRecordNotFound) {
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
if result2.Error != nil {
return result2.Error
}
title := fmt.Sprintf(
"%s | Modifier un élément de la liste",
list.Name,
@ -320,22 +320,22 @@ func ListItemEdit(c *fiber.Ctx) error {
}
if len(errors) == 0 {
result3 := db.Save(&listItem)
if result3.Error != nil {
return result3.Error
} else {
if listItem.Default && !list.Multi {
db.Model(&models.ListItem{}).Where(
"list_id = ? AND id <> ?",
list.ID, listItem.ID,
).Update("default", false)
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
result = db.Save(&listItem)
if result.Error != nil {
return result.Error
}
if listItem.Default && !list.Multi {
db.Model(&models.ListItem{}).Where(
"list_id = ? AND id <> ?",
list.ID, listItem.ID,
).Update("default", false)
}
c.Redirect(fmt.Sprintf(
"/admin/lists/%d",
list.ID,
))
}
}
@ -359,17 +359,17 @@ func ListItemDelete(c *fiber.Ctx) error {
var list models.List
result := db.Find(&list, "id = ?", id)
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
if result.Error != nil {
return result.Error
}
result2 := db.Delete(&models.ListItem{}, itemid)
if result2.Error != nil {
return result2.Error
if result.RowsAffected < 1 {
return fiber.NewError(fiber.StatusNotFound, "Not found")
}
result = db.Delete(&models.ListItem{}, itemid)
if result.Error != nil {
return result.Error
}
return c.Redirect(fmt.Sprintf(