Fixed json response of GetDeckCardsDue

kioku-project · Nov 27, 2023 · e291a47 · e291a47
1 parent 56fd142
commit e291a47
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/backend/api-documentation/decks/get due cards.bru b/backend/api-documentation/decks/get due cards.bru
@@ -15,5 +15,5 @@ auth:bearer {
 }
 
 assert {
-  res.body: isNumber 
+  res.body.dueCards: isNumber
 }
diff --git a/backend/pkg/converter/fiberSerializerTypes.go b/backend/pkg/converter/fiberSerializerTypes.go
@@ -63,9 +63,9 @@ type FiberGetGroupDecksResponseBody struct {
 	Decks []FiberDeck `json:"decks"`
 }
 
-type FiberGetUserDueCardsResponseBody struct {
+type FiberGetDueResponseBody struct {
 	DueCards int64 `json:"dueCards"`
-	DueDecks int64 `json:"dueDecks"`
+	DueDecks int64 `json:"dueDecks,omitempty"`
 }
 
 type FiberGetUserGroupsResponseBody struct {

diff --git a/backend/services/frontend/handler/frontend.go b/backend/services/frontend/handler/frontend.go
@@ -824,10 +824,9 @@ func (e *Frontend) SrsDeckDueHandler(c *fiber.Ctx) error {
 	if err != nil {
 		return err
 	}
-	if rspSrsDue.DueCards == 0 {
-		return c.JSON(0)
-	}
-	return c.JSON(rspSrsDue)
+	return c.JSON(converter.FiberGetDueResponseBody{
+		DueCards: rspSrsDue.DueCards,
+	})
 }
 
 func (e *Frontend) SrsUserDueHandler(c *fiber.Ctx) error {
@@ -838,7 +837,7 @@ func (e *Frontend) SrsUserDueHandler(c *fiber.Ctx) error {
 	if err != nil {
 		return err
 	}
-	return c.JSON(converter.FiberGetUserDueCardsResponseBody{
+	return c.JSON(converter.FiberGetDueResponseBody{
 		DueCards: dueCards.DueCards,
 		DueDecks: dueCards.DueDecks,
 	})