From d51474badc7d7c3887d3148d4f7adf4a6d80ba7e Mon Sep 17 00:00:00 2001 From: Karan Saraswat Date: Mon, 27 Jan 2025 08:06:38 +0000 Subject: [PATCH] fix: [CODE-3057]: Revert "temporary fix for listing more than 30 repos in a single request" (#3324) * Revert "fix: [code-2875]: temporary fix for listing more than 30 repos in a single request (#3134) (#3308)" This reverts commit 636f6f2750c29f461b179b950a2019acdfbedfa0. --- app/api/request/common.go | 13 ------------- app/api/request/repo.go | 2 +- app/store/database/repo.go | 3 +-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/api/request/common.go b/app/api/request/common.go index 116d81e3d..92c3acfe5 100644 --- a/app/api/request/common.go +++ b/app/api/request/common.go @@ -109,19 +109,6 @@ func ParseLimit(r *http.Request) int { return i } -// ParseLimit1000 extracts the limit parameter from the url. -// TODO: remove this ASAP, quick fix for issue: CODE-2875 -func ParseLimit1000(r *http.Request) int { - s := r.URL.Query().Get(QueryParamLimit) - i, _ := strconv.Atoi(s) - if i <= 0 { - i = 500 - } else if i > PerPageMax { - i = PerPageMax - } - return i -} - // ParseOrder extracts the order parameter from the url. func ParseOrder(r *http.Request) enum.Order { return enum.ParseOrder( diff --git a/app/api/request/repo.go b/app/api/request/repo.go index f6794ccfd..0e665ed37 100644 --- a/app/api/request/repo.go +++ b/app/api/request/repo.go @@ -70,7 +70,7 @@ func ParseRepoFilter(r *http.Request) (*types.RepoFilter, error) { Order: ParseOrder(r), Page: ParsePage(r), Sort: ParseSortRepo(r), - Size: ParseLimit1000(r), + Size: ParseLimit(r), Recursive: recursive, DeletedAt: deletedAt, DeletedBeforeOrAt: deletedBeforeOrAt, diff --git a/app/store/database/repo.go b/app/store/database/repo.go index 472b060f6..4d5b215a8 100644 --- a/app/store/database/repo.go +++ b/app/store/database/repo.go @@ -15,7 +15,6 @@ package database import ( - "cmp" "context" "fmt" "time" @@ -870,7 +869,7 @@ func applyQueryFilter(stmt squirrel.SelectBuilder, filter *types.RepoFilter) squ } func applySortFilter(stmt squirrel.SelectBuilder, filter *types.RepoFilter) squirrel.SelectBuilder { - stmt = stmt.Limit(uint64(cmp.Or(filter.Size, 500))) + stmt = stmt.Limit(database.Limit(filter.Size)) stmt = stmt.Offset(database.Offset(filter.Page, filter.Size)) switch filter.Sort {