add cleanup test over 200

Author: yeyuanjie

routers/web/shared/packages/packages.go

@@ -14,6 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/templates"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
@@ -159,15 +160,10 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) {
 		lastVersionID := int64(0)
 		for {
 			pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
-				PackageID:  p.ID,
-				IsInternal: optional.Some(false),
-				Sort:       packages_model.SortCreatedDesc,
-				Paginator: db.NewAbsoluteListOptions(func() int {
-					if lastVersionID > 0 {
-						return 0
-					}
-					return pcr.KeepCount
-				}(), limit),
+				PackageID:   p.ID,
+				IsInternal:  optional.Some(false),
+				Sort:        packages_model.SortCreatedDesc,
+				Paginator:   db.NewAbsoluteListOptions(util.Iif(lastVersionID > 0, 0, pcr.KeepCount), limit),
 				LtVersionID: lastVersionID,
 			})
 			if err != nil {

services/packages/cleanup/cleanup.go

@@ -14,6 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	packages_module "code.gitea.io/gitea/modules/packages"
+	"code.gitea.io/gitea/modules/util"
 	packages_service "code.gitea.io/gitea/services/packages"
 	alpine_service "code.gitea.io/gitea/services/packages/alpine"
 	arch_service "code.gitea.io/gitea/services/packages/arch"
@@ -63,15 +64,10 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
 			lastVersionID := int64(0)
 			for {
 				pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
-					PackageID:  p.ID,
-					IsInternal: optional.Some(false),
-					Sort:       packages_model.SortCreatedDesc,
-					Paginator: db.NewAbsoluteListOptions(func() int {
-						if lastVersionID > 0 {
-							return 0
-						}
-						return pcr.KeepCount
-					}(), limit),
+					PackageID:   p.ID,
+					IsInternal:  optional.Some(false),
+					Sort:        packages_model.SortCreatedDesc,
+					Paginator:   db.NewAbsoluteListOptions(util.Iif(lastVersionID > 0, 0, pcr.KeepCount), limit),
 					LtVersionID: lastVersionID,
 				})
 				if err != nil {

tests/integration/api_packages_test.go

@@ -636,12 +636,16 @@ func TestPackageCleanup(t *testing.T) {
 			},
 			{
 				Name: "Mixed",
-				Versions: []version{
-					{Version: "keep", ShouldExist: true, Created: time.Now().Add(time.Duration(10000)).Unix()},
-					{Version: "dummy", ShouldExist: true, Created: 1},
-					{Version: "test-3", ShouldExist: true},
-					{Version: "test-4", ShouldExist: false, Created: 1},
-				},
+				Versions: func(limit, removeDays int) []version {
+					aa := []version{
+						{Version: "keep", ShouldExist: true, Created: time.Now().Add(time.Duration(10000)).Unix()},
+						{Version: "dummy", ShouldExist: true, Created: 1},
+					}
+					for i := range limit {
+						aa = append(aa, version{Version: fmt.Sprintf("test-%v", i+3), ShouldExist: util.Iif(i < removeDays, true, false), Created: time.Now().AddDate(0, 0, -i).Unix()})
+					}
+					return aa
+				}(220, 7),
 				Rule: &packages_model.PackageCleanupRule{
 					Enabled:       true,
 					KeepCount:     1,