Hydrogen/Paperclip
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Just forgot to add pagination data into response

Browse Source
This commit is contained in:
LittleSheep 2024-08-03 22:45:50 +08:00
parent 75ab320bf1
commit c381b53a29
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/internal/server/api/sticker_packs_api.go
View File

@ -17,11 +17,20 @@ func listStickerManifest(c *fiber.Ctx) error {
take = 100 take = 100
} }
var count int64
if err := database.C.Model(&models.StickerPack{}).Count(&count).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
stickers, err := services.ListStickerPackWithStickers(take, offset) stickers, err := services.ListStickerPackWithStickers(take, offset)
if err != nil { if err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error()) return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} }
return c.JSON(stickers)
return c.JSON(fiber.Map{
"count": count,
"data": stickers,
})
} }
func listStickerPacks(c *fiber.Ctx) error { func listStickerPacks(c *fiber.Ctx) error {
@ -43,11 +52,20 @@ func listStickerPacks(c *fiber.Ctx) error {
} }
} }
var count int64
if err := database.C.Model(&models.StickerPack{}).Count(&count).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
var packs []models.StickerPack var packs []models.StickerPack
if err := tx.Limit(take).Offset(offset).Find(&packs).Error; err != nil { if err := tx.Limit(take).Offset(offset).Find(&packs).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error()) return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} }
return c.JSON(packs)
return c.JSON(fiber.Map{
"count": count,
"data": packs,
})
} }
func createStickerPack(c *fiber.Ctx) error { func createStickerPack(c *fiber.Ctx) error {

11
pkg/internal/server/api/stickers_api.go
View File

@ -35,11 +35,20 @@ func listStickers(c *fiber.Ctx) error {
tx = tx.Where("pack_id = ?", val) tx = tx.Where("pack_id = ?", val)
} }
var count int64
if err := database.C.Model(&models.Sticker{}).Count(&count).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
}
var stickers []models.Sticker var stickers []models.Sticker
if err := tx.Limit(take).Offset(offset).Preload("Attachment").Find(&stickers).Error; err != nil { if err := tx.Limit(take).Offset(offset).Preload("Attachment").Find(&stickers).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error()) return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} }
return c.JSON(stickers)
return c.JSON(fiber.Map{
"count": count,
"data": stickers,
})
} }
func getSticker(c *fiber.Ctx) error { func getSticker(c *fiber.Ctx) error {