Merge pull request #80 from jiaozifs/fix/many_fix

Fix/many fix

Author: TsumikiQAQ

api/jiaozifs.gen.go

@@ -202,6 +202,8 @@ components:
       properties:
         description:
           type: string
+        head:
+          type: string
     RepositoryList:
       type: object
       required:
@@ -355,6 +357,31 @@ components:
           type: string
         is_dir:
           type: boolean
+    FullTreeEntry:
+      type: object
+      required:
+        - name
+        - hash
+        - is_dir
+        - size
+        - created_at
+        - updated_at
+      properties:
+        name:
+          type: string
+        hash:
+          type: string
+        is_dir:
+          type: boolean
+        size:
+          type: integer
+          format: int64
+        created_at:
+          type: string
+          format: date-time
+        updated_at:
+          type: string
+          format: date-time
     TreeNode:
       type: object
       required:
@@ -1005,26 +1032,46 @@ paths:
           description: Unauthorized
         403:
           description: Forbidden
+
+  /wip/{owner}/{repository}/revert:
+    parameters:
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: owner
+        required: true
+        schema:
+          type: string
+      - in: query
+        name: refName
+        description: ref name
+        required: true
+        schema:
+          type: string
+      - in: query
+        name: pathPrefix
+        description: prefix of path
+        schema:
+          type: string
     post:
       tags:
         - wip
-      operationId: createWip
-      summary: create working in process
+      operationId: revertWipChanges
+      summary: revert changes in working in process, empty path will revert all
       responses:
-        201:
-          description: working in process created
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Wip"
+        200:
+          description: success to revert wip
         400:
           description: ValidationError
         401:
           description: Unauthorized
         403:
           description: Forbidden
-        502:
-          description: internal server error
+        500:
+          description: Server Internal Error
 
   /wip/{owner}/{repository}/changes:
     parameters:
@@ -1195,7 +1242,7 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: "#/components/schemas/TreeEntry"
+                  $ref: "#/components/schemas/FullTreeEntry"
         400:
           description: ValidationError
         401:
@@ -1225,8 +1272,8 @@ paths:
     get:
       tags:
         - commit
-      operationId: getCommitDiff
-      summary: get commit differences
+      operationId: compareCommit
+      summary: compare two commit
       parameters:
         - in: query
           name: path
@@ -1250,6 +1297,50 @@ paths:
         503:
           description: server internal error
 
+  /repos/{owner}/{repository}/changes/{commit_id}:
+    parameters:
+      - in: path
+        name: owner
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: repository
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: commit_id
+        required: true
+        schema:
+          type: string
+    get:
+      tags:
+        - commit
+      operationId: getCommitChanges
+      summary: get changes in commit
+      parameters:
+        - in: query
+          name: path
+          description: specific path, if not specific return entries in root
+          required: false
+          schema:
+            type: string
+      responses:
+        200:
+          description: commit diff
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/Change"
+        400:
+          description: ValidationError
+        401:
+          description: Unauthorized
+        503:
+          description: server internal error
   /repos/{owner}/{repository}/commits:
     parameters:
       - in: path

api/swagger.yml

@@ -7,13 +7,15 @@ import (
 	"net/http"
 	"regexp"
 	"strings"
-	"time"
+
+	"github.com/jiaozifs/jiaozifs/block/params"
+
+	"github.com/jiaozifs/jiaozifs/versionmgr"
 
 	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/jiaozifs/jiaozifs/auth"
 	"github.com/jiaozifs/jiaozifs/models"
 	"github.com/jiaozifs/jiaozifs/utils"
-	"github.com/jiaozifs/jiaozifs/utils/hash"
 	"go.uber.org/fx"
 )
 
@@ -36,16 +38,22 @@ func CheckBranchName(name string) error {
 		return fmt.Errorf("branch format must be <name> or <name>/<name>")
 	}
 
-	if !branchNameRegex.Match([]byte(seg[0])) || !branchNameRegex.Match([]byte(seg[1])) {
+	if !branchNameRegex.Match([]byte(seg[0])) {
 		return fmt.Errorf("branch name must be combination of number and letter or combine with '/'")
 	}
+	if len(seg) > 2 {
+		if !branchNameRegex.Match([]byte(seg[1])) {
+			return fmt.Errorf("branch name must be combination of number and letter or combine with '/'")
+		}
+	}
 	return nil
 }
 
 type BranchController struct {
 	fx.In
 
-	Repo models.IRepo
+	Repo                models.IRepo
+	PublicStorageConfig params.AdapterConfig
 }
 
 func (bct BranchController) ListBranches(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, params api.ListBranchesParams) {
@@ -148,42 +156,31 @@ func (bct BranchController) CreateBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	//check exit
-	_, err = bct.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetName(body.Name).SetRepositoryID(repository.ID))
-	if err == nil {
-		w.BadRequest(fmt.Sprintf("%s already exit", body.Name))
-		return
-	}
-	if err != nil && !errors.Is(err, models.ErrNotFound) {
-		w.Error(err)
-		return
-	}
 	//get source branch
 	sourceBranch, err := bct.Repo.BranchRepo().Get(ctx, models.NewGetBranchParams().SetName(body.Source).SetRepositoryID(repository.ID))
 	if err != nil && !errors.Is(err, models.ErrNotFound) {
 		w.Error(err)
 		return
 	}
 
-	commitHash := hash.EmptyHash
-	if sourceBranch != nil {
-		commitHash = sourceBranch.CommitHash
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, bct.Repo, bct.PublicStorageConfig)
+	if err != nil {
+		w.Error(err)
+		return
 	}
 
-	// Create branch
-	newBranch := &models.Branch{
-		RepositoryID: repository.ID,
-		CommitHash:   commitHash,
-		Name:         body.Name,
-		CreatorID:    operator.ID,
-		CreatedAt:    time.Now(),
-		UpdatedAt:    time.Now(),
+	err = workRepo.CheckOut(ctx, versionmgr.InCommit, sourceBranch.CommitHash.Hex())
+	if err != nil {
+		w.Error(err)
+		return
 	}
-	newBranch, err = bct.Repo.BranchRepo().Insert(ctx, newBranch)
+
+	newBranch, err := workRepo.CreateBranch(ctx, body.Name)
 	if err != nil {
 		w.Error(err)
 		return
 	}
+
 	w.JSON(api.Branch{
 		CommitHash:   newBranch.CommitHash.Hex(),
 		CreatedAt:    newBranch.CreatedAt,
@@ -221,14 +218,21 @@ func (bct BranchController) DeleteBranch(ctx context.Context, w *api.JiaozifsRes
 		return
 	}
 
-	// Delete branch
-	affectedRows, err := bct.Repo.BranchRepo().Delete(ctx, models.NewDeleteBranchParams().SetName(params.RefName).SetRepositoryID(repository.ID))
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, bct.Repo, bct.PublicStorageConfig)
 	if err != nil {
 		w.Error(err)
 		return
 	}
-	if affectedRows == 0 {
-		w.NotFound()
+
+	err = workRepo.CheckOut(ctx, versionmgr.InBranch, params.RefName)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	err = workRepo.DeleteBranch(ctx)
+	if err != nil {
+		w.Error(err)
 		return
 	}
 	w.OK()

controller/branch_ctl.go

@@ -106,7 +106,7 @@ func (commitCtl CommitController) GetEntriesInRef(ctx context.Context, w *api.Ji
 	w.JSON(treeEntry)
 }
 
-func (commitCtl CommitController) GetCommitDiff(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, basehead string, params api.GetCommitDiffParams) {
+func (commitCtl CommitController) CompareCommit(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, basehead string, params api.CompareCommitParams) {
 	operator, err := auth.GetOperator(ctx)
 	if err != nil {
 		w.Error(err)
@@ -154,35 +154,63 @@ func (commitCtl CommitController) GetCommitDiff(ctx context.Context, w *api.Jiao
 		return
 	}
 
-	changes, err := workRepo.DiffCommit(ctx, toCommitHash)
+	changes, err := workRepo.DiffCommit(ctx, toCommitHash, utils.StringValue(params.Path))
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	path := versionmgr.CleanPath(utils.StringValue(params.Path))
-	var changesResp []api.Change
-	err = changes.ForEach(func(change versionmgr.IChange) error {
-		action, err := change.Action()
-		if err != nil {
-			return err
-		}
-		fullPath := change.Path()
-		if strings.HasPrefix(fullPath, path) {
-			apiChange := api.Change{
-				Action: api.ChangeAction(action),
-				Path:   fullPath,
-			}
-			if change.From() != nil {
-				apiChange.BaseHash = utils.String(hex.EncodeToString(change.From().Hash()))
-			}
-			if change.To() != nil {
-				apiChange.ToHash = utils.String(hex.EncodeToString(change.To().Hash()))
-			}
-			changesResp = append(changesResp, apiChange)
-		}
-		return nil
-	})
+	changesResp, err := changesToDTO(changes)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+	w.JSON(changesResp)
+}
+
+func (commitCtl CommitController) GetCommitChanges(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, ownerName string, repositoryName string, commitID string, params api.GetCommitChangesParams) {
+	operator, err := auth.GetOperator(ctx)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	owner, err := commitCtl.Repo.UserRepo().Get(ctx, models.NewGetUserParams().SetName(ownerName))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	repository, err := commitCtl.Repo.RepositoryRepo().Get(ctx, models.NewGetRepoParams().SetName(repositoryName).SetOwnerID(owner.ID))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	if operator.ID != owner.ID { //todo check permission
+		w.Forbidden()
+		return
+	}
+
+	workRepo, err := versionmgr.NewWorkRepositoryFromConfig(ctx, operator, repository, commitCtl.Repo, commitCtl.PublicStorageConfig)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	err = workRepo.CheckOut(ctx, versionmgr.InCommit, commitID)
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	changes, err := workRepo.GetCommitChanges(ctx, utils.StringValue(params.Path))
+	if err != nil {
+		w.Error(err)
+		return
+	}
+
+	changesResp, err := changesToDTO(changes)
 	if err != nil {
 		w.Error(err)
 		return