Merge branch 'hotfix/empty-fills' into hotfix/empty-swap2

orbs-network · Mar 27, 2024 · 8389146 · 8389146
2 parents 5779805 + c36327c
commit 8389146
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/service/get_orders_for_user.go b/service/get_orders_for_user.go
@@ -53,7 +53,7 @@ func (s *Service) GetSwapFills(ctx context.Context, userId uuid.UUID, symbol mod
 
 	if len(swapIds) == 0 {
 		logctx.Warn(ctx, "user has no resolved swaps", logger.Error(err), logger.String("user_id", userId.String()))
-		return []models.Fill{}, models.ErrNotFound
+		return []models.Fill{}, nil
 	}
 
 	fills := []models.Fill{}

diff --git a/transport/rest/get_orders_for_user.go b/transport/rest/get_orders_for_user.go
@@ -102,12 +102,14 @@ func (h *Handler) GetSwapFills(w http.ResponseWriter, r *http.Request) {
 	fills, err := h.svc.GetSwapFills(r.Context(), user.Id, symbol, startAt, endAt)
 	if err != nil {
 		logctx.Error(r.Context(), "failed GetSwapFills", logger.Error(err), logger.String("userId", user.Id.String()))
-		if err == models.ErrMaxRecExceeded {
+		switch err {
+		case models.ErrMaxRecExceeded:
 			// narrow down the time range, 256 exceeded
 			restutils.WriteJSONError(ctx, w, http.StatusRequestEntityTooLarge, err.Error())
-		} else {
+		default:
 			restutils.WriteJSONError(ctx, w, http.StatusInternalServerError, "Error getting swaps. Try again later")
 		}
+		return
 	}
 	jsonData, err := json.Marshal(fills)
 	if err != nil {