From 3e000b6f9efcb1ab1de827ba35c2cac1799b8f65 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Wed, 7 Aug 2024 01:02:03 +0800 Subject: [PATCH] :zap: Optimize list attachment api --- pkg/internal/server/api/attachment_dir_api.go | 32 ++++++++++++------- pkg/internal/services/attachments.go | 4 +++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkg/internal/server/api/attachment_dir_api.go b/pkg/internal/server/api/attachment_dir_api.go index a2aa19a..59ae264 100644 --- a/pkg/internal/server/api/attachment_dir_api.go +++ b/pkg/internal/server/api/attachment_dir_api.go @@ -20,6 +20,8 @@ func listAttachment(c *fiber.Ctx) error { tx := database.C + needQuery := true + var result = make([]models.Attachment, take) var idxList []uint @@ -40,6 +42,7 @@ func listAttachment(c *fiber.Ctx) error { } } tx = tx.Where("id IN ?", pendingQueryId) + needQuery = len(pendingQueryId) > 0 } else { // Do sort this when doesn't filter by the id // Because the sort will mess up the result @@ -64,23 +67,30 @@ func listAttachment(c *fiber.Ctx) error { if err := countTx.Model(&models.Attachment{}).Count(&count).Error; err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } - var out []models.Attachment - if err := tx.Offset(offset).Limit(take).Preload("Account").Find(&out).Error; err != nil { - return fiber.NewError(fiber.StatusBadRequest, err.Error()) - } - if len(idxList) == 0 { - result = out - } else { - for _, item := range out { - for p, id := range idxList { - if item.ID == id { - result[p] = item + if needQuery { + var out []models.Attachment + if err := tx.Offset(offset).Limit(take).Preload("Account").Find(&out).Error; err != nil { + return fiber.NewError(fiber.StatusBadRequest, err.Error()) + } + + if len(idxList) == 0 { + result = out + } else { + for _, item := range out { + for p, id := range idxList { + if item.ID == id { + result[p] = item + } } } } } + for _, item := range result { + services.CacheAttachment(item.ID, item) + } + return c.JSON(fiber.Map{ "count": count, "data": result, diff --git a/pkg/internal/services/attachments.go b/pkg/internal/services/attachments.go index ab13318..fc5c1b2 100644 --- a/pkg/internal/services/attachments.go +++ b/pkg/internal/services/attachments.go @@ -55,6 +55,10 @@ func GetAttachmentCache(id uint) (models.Attachment, bool) { return models.Attachment{}, false } +func CacheAttachment(id uint, item models.Attachment) { + metadataCache.Store(id, item) +} + func NewAttachmentMetadata(tx *gorm.DB, user models.Account, file *multipart.FileHeader, attachment models.Attachment) (models.Attachment, error) { attachment.Uuid = uuid.NewString() attachment.Size = file.Size