From 75ab320bf18eab7d15ec34ab533d30851540165b Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sat, 3 Aug 2024 22:04:44 +0800 Subject: [PATCH] :sparkles: Sticker will preload attachment --- pkg/internal/server/api/stickers_api.go | 2 +- pkg/internal/services/sticker_packs.go | 2 +- pkg/internal/services/stickers.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/internal/server/api/stickers_api.go b/pkg/internal/server/api/stickers_api.go index de62eda..28193fd 100644 --- a/pkg/internal/server/api/stickers_api.go +++ b/pkg/internal/server/api/stickers_api.go @@ -36,7 +36,7 @@ func listStickers(c *fiber.Ctx) error { } var stickers []models.Sticker - if err := tx.Limit(take).Offset(offset).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 c.JSON(stickers) diff --git a/pkg/internal/services/sticker_packs.go b/pkg/internal/services/sticker_packs.go index ad2d1b9..474eeb0 100644 --- a/pkg/internal/services/sticker_packs.go +++ b/pkg/internal/services/sticker_packs.go @@ -15,7 +15,7 @@ func GetStickerPackWithUser(id, userId uint) (models.StickerPack, error) { func ListStickerPackWithStickers(take, offset int) ([]models.StickerPack, error) { var packs []models.StickerPack - if err := database.C.Limit(take).Offset(offset).Preload("Stickers").Find(&packs).Error; err != nil { + if err := database.C.Limit(take).Offset(offset).Preload("Stickers").Preload("Stickers.Attachment").Find(&packs).Error; err != nil { return packs, err } return packs, nil diff --git a/pkg/internal/services/stickers.go b/pkg/internal/services/stickers.go index ec0e659..cfc2d64 100644 --- a/pkg/internal/services/stickers.go +++ b/pkg/internal/services/stickers.go @@ -7,7 +7,7 @@ import ( func GetSticker(id uint) (models.Sticker, error) { var sticker models.Sticker - if err := database.C.Where("id = ?", id).First(&sticker).Error; err != nil { + if err := database.C.Where("id = ?", id).Preload("Attachment").First(&sticker).Error; err != nil { return sticker, err } return sticker, nil