fix(emojis): remove pagination when query emojis list with codes

consolelabs · Jan 4, 2024 · ae91faf · ae91faf
1 parent d7d65ab
commit ae91faf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/pkg/entities/emojis.go b/pkg/entities/emojis.go
@@ -88,7 +88,7 @@ func (e *Entity) GetListEmojisByCode(req request.GetListEmojiRequest) ([]*model.
 		}
 	}
 
-	emojis, _, err := e.repo.Emojis.ListEmojis(emojis.Query{
+	emojis, total, err := e.repo.Emojis.ListEmojis(emojis.Query{
 		Codes: listCodeQuery,
 	})
 	if err != nil {
@@ -121,20 +121,7 @@ func (e *Entity) GetListEmojisByCode(req request.GetListEmojiRequest) ([]*model.
 		}
 	}
 
-	if req.Page >= 0 && req.Size >= 0 {
-		start := int(req.Page) * int(req.Size)
-		if start > len(emojiResponse) {
-			return nil, int64(len(req.ListCode)), nil
-		}
-		end := start + int(req.Size)
-		if end > len(emojiResponse) {
-			end = len(emojiResponse)
-		}
-
-		emojiResponse = emojiResponse[start:end]
-	}
-
-	return emojiResponse, int64(len(req.ListCode)), nil
+	return emojiResponse, total, nil
 }
 
 func (e *Entity) GetEmojiByCode(code string) (*model.EmojiData, error) {

diff --git a/pkg/handler/emojis/emojis.go b/pkg/handler/emojis/emojis.go
@@ -67,12 +67,18 @@ func (h *Handler) ListEmojis(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{
-		"data": emojis,
-		"pagination": gin.H{
-			"total": total,
-			"page":  req.Page,
-			"size":  req.Size,
-		},
-	})
+	if req.IsQueryAll {
+		c.JSON(http.StatusOK, gin.H{
+			"data": emojis,
+			"pagination": gin.H{
+				"total": total,
+				"page":  req.Page,
+				"size":  req.Size,
+			},
+		})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"data": emojis})
+
 }