Merge branch 'main' into feat/allow_any_file_for_upload_object

Author: hunjixin

api/jiaozifs.gen.go

@@ -40,6 +40,14 @@ components:
       schema:
         type: string
         format: date-time 
+    
+    PaginationCommitAfter:
+      in: query
+      name: after
+      description: return items after this value
+      schema:
+        type: string
+        format: date-time-ns
 
     PaginationAmount:
       in: query
@@ -1260,6 +1268,8 @@ paths:
       operationId: getCommitsInRepository
       summary: get commits in repository
       parameters:
+        - $ref: "#/components/parameters/PaginationCommitAfter"
+        - $ref: "#/components/parameters/PaginationAmount"
         - in: query
           name: refName
           description: ref(branch/tag) name

api/swagger.yml

@@ -348,6 +348,7 @@ func (repositoryCtl RepositoryController) UpdateRepository(ctx context.Context,
 		w.Error(err)
 		return
 	}
+	w.OK()
 }
 
 func (repositoryCtl RepositoryController) GetCommitsInRepository(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, params api.GetCommitsInRepositoryParams) {
@@ -401,6 +402,19 @@ func (repositoryCtl RepositoryController) GetCommitsInRepository(ctx context.Con
 	for {
 		commit, err := iter.Next()
 		if err == nil {
+			if params.After != nil {
+				parseTime, err := time.Parse(time.RFC3339Nano, *params.After)
+				if err != nil {
+					w.Error(err)
+					return
+				}
+				if commit.Commit().Committer.When.Add(time.Nanosecond).After(parseTime) {
+					continue
+				}
+			}
+			if params.Amount != nil && len(commits) == *params.Amount {
+				break
+			}
 			modelCommit := commit.Commit()
 			commits = append(commits, api.Commit{
 				RepositoryId: modelCommit.RepositoryID,

controller/repository_ctl.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	apiimpl "github.com/jiaozifs/jiaozifs/api/api_impl"
@@ -394,6 +395,45 @@ func RepoSpec(ctx context.Context, urlStr string) func(c convey.C) {
 				convey.So(*result.JSON200, convey.ShouldHaveLength, 1)
 				convey.So((*result.JSON200)[0].Message, convey.ShouldEqual, "first commit")
 			})
+
+			uploadObject(ctx, c, client, "add sec object", userName, repoName, controller.DefaultBranchName, "b.txt")
+			commitWip(ctx, c, client, "commit sec object", userName, repoName, controller.DefaultBranchName, "second commit")
+			uploadObject(ctx, c, client, "add third object", userName, repoName, controller.DefaultBranchName, "c.txt")
+			commitWip(ctx, c, client, "commit third object", userName, repoName, controller.DefaultBranchName, "third commit")
+			c.Convey("success get commits by params", func() {
+				resp, err := client.GetCommitsInRepository(ctx, userName, repoName, &api.GetCommitsInRepositoryParams{
+					RefName: utils.String(controller.DefaultBranchName),
+				})
+				convey.So(err, convey.ShouldBeNil)
+				convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusOK)
+
+				result, err := api.ParseGetCommitsInRepositoryResponse(resp)
+				convey.So(err, convey.ShouldBeNil)
+				convey.So(*result.JSON200, convey.ShouldHaveLength, 3)
+				convey.So((*result.JSON200)[0].Message, convey.ShouldEqual, "third commit")
+
+				newResp, err := client.GetCommitsInRepository(ctx, userName, repoName, &api.GetCommitsInRepositoryParams{
+					After:   utils.String((*result.JSON200)[0].Committer.When.Format(time.RFC3339Nano)),
+					Amount:  utils.Int(1),
+					RefName: utils.String(controller.DefaultBranchName),
+				})
+				convey.So(err, convey.ShouldBeNil)
+				convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusOK)
+
+				newResult, err := api.ParseGetCommitsInRepositoryResponse(newResp)
+				convey.So(err, convey.ShouldBeNil)
+				convey.So(*newResult.JSON200, convey.ShouldHaveLength, 1)
+				convey.So((*newResult.JSON200)[0].Message, convey.ShouldEqual, "second commit")
+			})
+
+			c.Convey("failed get commits by wrong params", func() {
+				resp, err := client.GetCommitsInRepository(ctx, userName, repoName, &api.GetCommitsInRepositoryParams{
+					After:   utils.String("123"),
+					RefName: utils.String(controller.DefaultBranchName),
+				})
+				convey.So(err, convey.ShouldBeNil)
+				convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusInternalServerError)
+			})
 		})
 
 		c.Convey("delete repository", func(c convey.C) {