Merge branch 'yorkie-team:main' into feat-initialRoot

yorkie-team · Sep 7, 2024 · a307424 · a307424
2 parents 78bc646 + 3e49afb
commit a307424
Show file tree

Hide file tree

Showing 39 changed files with 1,689 additions and 447 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ and Yorkie adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 ## [Unreleased]
 
+## [0.5.0] - 2024-09-05
+
+### Added
+
+- Add Concurrency Tests between Array Operations by @cloneot in https://github.com/yorkie-team/yorkie/pull/985
+- Add metric for WatchDocument streams by @emplam27 in https://github.com/yorkie-team/yorkie/pull/998
+- Add Account Deletion and Change Password to CLI by @sigmaith in https://github.com/yorkie-team/yorkie/pull/983
+
+### Changed
+
+- Optimize FindChangeInfosBetweenServerSeqs to prevent unnecessary Query by @kokodak in https://github.com/yorkie-team/yorkie/pull/974
+- Rename SetByIndex to ArraySet by @hackerwins in https://github.com/yorkie-team/yorkie/pull/995
+
+### Fixed
+
+- Set `updated_at` with `created_at` when creating Document by @window9u in https://github.com/yorkie-team/yorkie/pull/977
+
 ## [0.4.31] - 2024-08-21
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-YORKIE_VERSION := 0.4.31
+YORKIE_VERSION := 0.5.0
 
 GO_PROJECT = github.com/yorkie-team/yorkie
 

diff --git a/admin/client.go b/admin/client.go
@@ -377,3 +377,30 @@ func withShardKey[T any](conn *connect.Request[T], keys ...string) *connect.Requ
 
 	return conn
 }
+
+// DeleteAccount deletes the user's account.
+func (c *Client) DeleteAccount(ctx context.Context, username, password string) error {
+	_, err := c.client.DeleteAccount(ctx, connect.NewRequest(&api.DeleteAccountRequest{
+		Username: username,
+		Password: password,
+	}))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ChangePassword changes the user's password.
+func (c *Client) ChangePassword(ctx context.Context, username, password, newPassword string) error {
+	_, err := c.client.ChangePassword(ctx, connect.NewRequest(&api.ChangePasswordRequest{
+		Username:        username,
+		CurrentPassword: password,
+		NewPassword:     newPassword,
+	}))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/api/converter/from_pb.go b/api/converter/from_pb.go
@@ -208,6 +208,8 @@ func FromOperations(pbOps []*api.Operation) ([]operations.Operation, error) {
 			op, err = fromTreeEdit(decoded.TreeEdit)
 		case *api.Operation_TreeStyle_:
 			op, err = fromTreeStyle(decoded.TreeStyle)
+		case *api.Operation_ArraySet_:
+			op, err = fromArraySet(decoded.ArraySet)
 		default:
 			return nil, ErrUnsupportedOperation
 		}
@@ -539,6 +541,31 @@ func fromTreeStyle(pbTreeStyle *api.Operation_TreeStyle) (*operations.TreeStyle,
 	), nil
 }
 
+func fromArraySet(pbSetByIndex *api.Operation_ArraySet) (*operations.ArraySet, error) {
+	parentCreatedAt, err := fromTimeTicket(pbSetByIndex.ParentCreatedAt)
+	if err != nil {
+		return nil, err
+	}
+	createdAt, err := fromTimeTicket(pbSetByIndex.CreatedAt)
+	if err != nil {
+		return nil, err
+	}
+	elem, err := fromElement(pbSetByIndex.Value)
+	if err != nil {
+		return nil, err
+	}
+	executedAt, err := fromTimeTicket(pbSetByIndex.ExecutedAt)
+	if err != nil {
+		return nil, err
+	}
+	return operations.NewArraySet(
+		parentCreatedAt,
+		createdAt,
+		elem,
+		executedAt,
+	), nil
+}
+
 func fromCreatedAtMapByActor(
 	pbCreatedAtMapByActor map[string]*api.TimeTicket,
 ) (map[string]*time.Ticket, error) {

diff --git a/api/converter/to_pb.go b/api/converter/to_pb.go
@@ -206,6 +206,8 @@ func ToOperations(ops []operations.Operation) ([]*api.Operation, error) {
 			pbOperation.Body, err = toTreeEdit(op)
 		case *operations.TreeStyle:
 			pbOperation.Body, err = toTreeStyle(op)
+		case *operations.ArraySet:
+			pbOperation.Body, err = toArraySet(op)
 		default:
 			return nil, ErrUnsupportedOperation
 		}
@@ -375,6 +377,22 @@ func toTreeStyle(style *operations.TreeStyle) (*api.Operation_TreeStyle_, error)
 	}, nil
 }
 
+func toArraySet(setByIndex *operations.ArraySet) (*api.Operation_ArraySet_, error) {
+	pbElem, err := toJSONElementSimple(setByIndex.Value())
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.Operation_ArraySet_{
+		ArraySet: &api.Operation_ArraySet{
+			ParentCreatedAt: ToTimeTicket(setByIndex.ParentCreatedAt()),
+			CreatedAt:       ToTimeTicket(setByIndex.CreatedAt()),
+			Value:           pbElem,
+			ExecutedAt:      ToTimeTicket(setByIndex.ExecutedAt()),
+		},
+	}, nil
+}
+
 func toJSONElementSimple(elem crdt.Element) (*api.JSONElementSimple, error) {
 	switch elem := elem.(type) {
 	case *crdt.Object:

diff --git a/api/docs/yorkie.base.yaml b/api/docs/yorkie.base.yaml
@@ -2,7 +2,7 @@ openapi: 3.1.0
 info:
   title: Yorkie
   description: "Yorkie is an open source document store for building collaborative editing applications."
-  version: v0.4.31
+  version: v0.5.0
 servers:
   - url: https://api.yorkie.dev
     description: Production server

diff --git a/api/docs/yorkie/v1/admin.openapi.yaml b/api/docs/yorkie/v1/admin.openapi.yaml
@@ -3,7 +3,7 @@ info:
   description: Yorkie is an open source document store for building collaborative
     editing applications.
   title: Yorkie
-  version: v0.4.31
+  version: v0.5.0
 servers:
 - description: Production server
   url: https://api.yorkie.dev
@@ -1171,6 +1171,12 @@ components:
           description: ""
           title: add
           type: object
+        arraySet:
+          $ref: '#/components/schemas/yorkie.v1.Operation.ArraySet'
+          additionalProperties: false
+          description: ""
+          title: array_set
+          type: object
         edit:
           $ref: '#/components/schemas/yorkie.v1.Operation.Edit'
           additionalProperties: false
@@ -1257,6 +1263,36 @@ components:
           type: object
       title: Add
       type: object
+    yorkie.v1.Operation.ArraySet:
+      additionalProperties: false
+      description: ""
+      properties:
+        createdAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: created_at
+          type: object
+        executedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: executed_at
+          type: object
+        parentCreatedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: parent_created_at
+          type: object
+        value:
+          $ref: '#/components/schemas/yorkie.v1.JSONElementSimple'
+          additionalProperties: false
+          description: ""
+          title: value
+          type: object
+      title: ArraySet
+      type: object
     yorkie.v1.Operation.Edit:
       additionalProperties: false
       description: ""

diff --git a/api/docs/yorkie/v1/resources.openapi.yaml b/api/docs/yorkie/v1/resources.openapi.yaml
@@ -3,7 +3,7 @@ info:
   description: Yorkie is an open source document store for building collaborative
     editing applications.
   title: Yorkie
-  version: v0.4.31
+  version: v0.5.0
 servers:
 - description: Production server
   url: https://api.yorkie.dev
@@ -680,6 +680,12 @@ components:
           description: ""
           title: add
           type: object
+        arraySet:
+          $ref: '#/components/schemas/yorkie.v1.Operation.ArraySet'
+          additionalProperties: false
+          description: ""
+          title: array_set
+          type: object
         edit:
           $ref: '#/components/schemas/yorkie.v1.Operation.Edit'
           additionalProperties: false
@@ -766,6 +772,36 @@ components:
           type: object
       title: Add
       type: object
+    yorkie.v1.Operation.ArraySet:
+      additionalProperties: false
+      description: ""
+      properties:
+        createdAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: created_at
+          type: object
+        executedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: executed_at
+          type: object
+        parentCreatedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: parent_created_at
+          type: object
+        value:
+          $ref: '#/components/schemas/yorkie.v1.JSONElementSimple'
+          additionalProperties: false
+          description: ""
+          title: value
+          type: object
+      title: ArraySet
+      type: object
     yorkie.v1.Operation.Edit:
       additionalProperties: false
       description: ""

diff --git a/api/docs/yorkie/v1/yorkie.openapi.yaml b/api/docs/yorkie/v1/yorkie.openapi.yaml
@@ -3,7 +3,7 @@ info:
   description: Yorkie is an open source document store for building collaborative
     editing applications.
   title: Yorkie
-  version: v0.4.31
+  version: v0.5.0
 servers:
 - description: Production server
   url: https://api.yorkie.dev
@@ -664,6 +664,12 @@ components:
           description: ""
           title: add
           type: object
+        arraySet:
+          $ref: '#/components/schemas/yorkie.v1.Operation.ArraySet'
+          additionalProperties: false
+          description: ""
+          title: array_set
+          type: object
         edit:
           $ref: '#/components/schemas/yorkie.v1.Operation.Edit'
           additionalProperties: false
@@ -750,6 +756,36 @@ components:
           type: object
       title: Add
       type: object
+    yorkie.v1.Operation.ArraySet:
+      additionalProperties: false
+      description: ""
+      properties:
+        createdAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: created_at
+          type: object
+        executedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: executed_at
+          type: object
+        parentCreatedAt:
+          $ref: '#/components/schemas/yorkie.v1.TimeTicket'
+          additionalProperties: false
+          description: ""
+          title: parent_created_at
+          type: object
+        value:
+          $ref: '#/components/schemas/yorkie.v1.JSONElementSimple'
+          additionalProperties: false
+          description: ""
+          title: value
+          type: object
+      title: ArraySet
+      type: object
     yorkie.v1.Operation.Edit:
       additionalProperties: false
       description: ""