Merge pull request #71 from jiaozifs/feat/ensure_subobject_exit

feat: ensure subobjects exist

Author: TsumikiQAQ

api/jiaozifs.gen.go

@@ -1563,10 +1563,10 @@ paths:
             schema:
               type: object
               required:
-                - username
+                - name
                 - password
               properties:
-                username:
+                name:
                   type: string
                 password:
                   type: string

api/swagger.yml

@@ -44,7 +44,7 @@ func (commitCtl CommitController) GetEntriesInRef(ctx context.Context, w *api.Ji
 	}
 
 	refName := repository.HEAD
-	if params.Path != nil {
+	if params.Ref != nil {
 		refName = *params.Ref
 	}
 

controller/commit_ctl.go

@@ -35,7 +35,7 @@ type UserController struct {
 func (userCtl UserController) Login(ctx context.Context, w *api.JiaozifsResponse, r *http.Request, body api.LoginJSONRequestBody) {
 
 	// get user encryptedPassword by username
-	ep, err := userCtl.Repo.UserRepo().GetEPByName(ctx, body.Username)
+	ep, err := userCtl.Repo.UserRepo().GetEPByName(ctx, body.Name)
 	if err != nil {
 		w.Code(http.StatusUnauthorized)
 		return
@@ -56,13 +56,13 @@ func (userCtl UserController) Login(ctx context.Context, w *api.JiaozifsResponse
 		return
 	}
 
-	tokenString, err := auth.GenerateJWTLogin(secretKey, body.Username, loginTime, expires)
+	tokenString, err := auth.GenerateJWTLogin(secretKey, body.Name, loginTime, expires)
 	if err != nil {
 		w.Error(err)
 		return
 	}
 
-	userCtlLog.Infof("usert %s login successful", body.Username)
+	userCtlLog.Infof("user %s login successful", body.Name)
 
 	internalAuthSession, _ := userCtl.SessionStore.Get(r, auth.InternalAuthSessionName)
 	internalAuthSession.Values[auth.TokenSessionKeyName] = tokenString

controller/user_ctl.go

@@ -117,7 +117,7 @@ func createUser(ctx context.Context, c convey.C, client *api.Client, userName st
 func loginAndSwitch(ctx context.Context, c convey.C, client *api.Client, userName string) {
 	c.Convey("login "+userName, func() {
 		resp, err := client.Login(ctx, api.LoginJSONRequestBody{
-			Username: userName,
+			Name:     userName,
 			Password: "12345678",
 		})
 		convey.So(err, convey.ShouldBeNil)

integrationtest/helper_test.go

@@ -23,7 +23,7 @@ func UserSpec(ctx context.Context, urlStr string) func(c convey.C) {
 
 		c.Convey("login fail", func() {
 			resp, err := client.Login(ctx, api.LoginJSONRequestBody{
-				Username: "admin",
+				Name:     "admin",
 				Password: " vvvvvvvv",
 			})
 			convey.So(err, convey.ShouldBeNil)

integrationtest/user_test.go

@@ -43,8 +43,9 @@ func SortSubObjects(subObjects []TreeEntry) []TreeEntry {
 
 func NewRootTreeEntry(hash hash.Hash) TreeEntry {
 	return TreeEntry{
-		Name: "",
-		Hash: hash,
+		Name:  "",
+		Hash:  hash,
+		IsDir: true,
 	}
 }
 func (treeEntry TreeEntry) Equal(other TreeEntry) bool {
@@ -158,6 +159,9 @@ type TreeNode struct {
 }
 
 func NewTreeNode(props Property, repoID uuid.UUID, subObjects ...TreeEntry) (*TreeNode, error) {
+	if subObjects == nil {
+		subObjects = make([]TreeEntry, 0) //to ensure tree entry not null
+	}
 	newTree := &TreeNode{
 		Type:         TreeObject,
 		RepositoryID: repoID,
@@ -226,7 +230,7 @@ type FileTree struct {
 	Size          int64      `bun:"size"`
 	Properties    Property   `bun:"properties,type:jsonb,notnull"`
 	//tree
-	SubObjects []TreeEntry `bun:"sub_objects,type:jsonb" json:"sub_objects"`
+	SubObjects []TreeEntry `bun:"sub_objects,type:jsonb,notnull" json:"sub_objects"`
 
 	CreatedAt time.Time `bun:"created_at,notnull" json:"created_at"`
 	UpdatedAt time.Time `bun:"updated_at,notnull" json:"updated_at"`

models/tree.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"testing"
 
+	"github.com/jiaozifs/jiaozifs/utils/hash"
+
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"
@@ -72,3 +74,25 @@ func TestObjectRepo_Insert(t *testing.T) {
 		require.ErrorIs(t, err, models.ErrRepoIDMisMatch)
 	})
 }
+
+func TestNewTreeNode(t *testing.T) {
+	id, err := uuid.Parse("a91ef678-1980-4b26-9bb9-eadc9f366429")
+	require.NoError(t, err)
+
+	t.Run("no subobjects", func(t *testing.T) {
+		node, err := models.NewTreeNode(models.Property{Mode: filemode.Dir}, id)
+		require.NoError(t, err)
+		require.NotNil(t, node.SubObjects)
+		require.Equal(t, "03c2737fb833f979f2bb5398248e8e64", node.Hash.Hex())
+	})
+
+	t.Run("no subobjects", func(t *testing.T) {
+		node, err := models.NewTreeNode(models.Property{Mode: filemode.Dir}, id, models.TreeEntry{
+			Name: "a.txt",
+			Hash: hash.Hash("aaa"),
+		})
+		require.NoError(t, err)
+		require.NotNil(t, node.SubObjects)
+		require.Equal(t, "27d9fbf6d43195f34404a94c0de707a2", node.Hash.Hex())
+	})
+}

models/tree_test.go

@@ -17,8 +17,9 @@ import (
 )
 
 var EmptyRoot = &models.TreeNode{
-	Hash: hash.Hash([]byte{}),
-	Type: models.TreeObject,
+	Hash:       hash.Hash([]byte{}),
+	Type:       models.TreeObject,
+	SubObjects: make([]models.TreeEntry, 0),
 }
 
 var EmptyDirEntry = models.TreeEntry{
@@ -69,11 +70,11 @@ func (workTree *WorkTree) RepositoryID() uuid.UUID {
 }
 
 func (workTree *WorkTree) AppendDirectEntry(ctx context.Context, treeEntry models.TreeEntry) (*models.TreeNode, error) {
-	chilren, err := workTree.root.Children()
+	children, err := workTree.root.Children()
 	if err != nil {
 		return nil, err
 	}
-	for _, node := range chilren {
+	for _, node := range children {
 		if node.Name() == treeEntry.Name {
 			return nil, ErrEntryExit
 		}
@@ -94,7 +95,7 @@ func (workTree *WorkTree) AppendDirectEntry(ctx context.Context, treeEntry model
 }
 
 func (workTree *WorkTree) DeleteDirectEntry(ctx context.Context, name string) (*models.TreeNode, bool, error) {
-	var subObjects []models.TreeEntry
+	subObjects := []models.TreeEntry{} //ensure subobject not nul
 	for _, sub := range workTree.root.SubObjects() {
 		if sub.Name != name { //filter tree entry by name
 			subObjects = append(subObjects, sub)