Add boundary type 'none'

yorkie-team · Sep 15, 2023 · ac6c2ab · ac6c2ab
1 parent f14c165
commit ac6c2ab
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 204 deletions.
diff --git a/api/converter/from_pb.go b/api/converter/from_pb.go
@@ -598,8 +598,8 @@ func fromTextNodeBoundary(
 		boundaryType = crdt.Start
 	case api.BoundaryType_BOUNDARY_TYPE_END:
 		boundaryType = crdt.End
-	default:
-		boundaryType = ""
+	case api.BoundaryType_BOUNDARY_TYPE_NONE:
+		boundaryType = crdt.None
 	}
 
 	return crdt.NewRGATreeSplitNodeBoundary(

diff --git a/api/converter/to_pb.go b/api/converter/to_pb.go
@@ -471,36 +471,11 @@ func toTextNodePos(pos *crdt.RGATreeSplitNodePos) *api.TextNodePos {
 }
 
 func toTextNodeBoundary(boundary *crdt.RGATreeSplitNodeBoundary) *api.TextNodeBoundary {
-	switch boundary.Type() {
-	case crdt.Before:
-		return &api.TextNodeBoundary{
-			CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
-			Offset:    int32(boundary.ID().Offset()),
-			Type:      api.BoundaryType_BOUNDARY_TYPE_BEFORE,
-		}
-	case crdt.After:
-		return &api.TextNodeBoundary{
-			CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
-			Offset:    int32(boundary.ID().Offset()),
-			Type:      api.BoundaryType_BOUNDARY_TYPE_AFTER,
-		}
-	case crdt.Start:
-		return &api.TextNodeBoundary{
-			CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
-			Offset:    int32(boundary.ID().Offset()),
-			Type:      api.BoundaryType_BOUNDARY_TYPE_START,
-		}
-	case crdt.End:
-		return &api.TextNodeBoundary{
-			CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
-			Offset:    int32(boundary.ID().Offset()),
-			Type:      api.BoundaryType_BOUNDARY_TYPE_END,
-		}
-	default:
-		return &api.TextNodeBoundary{
-			CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
-			Offset:    int32(boundary.ID().Offset()),
-		}
+	pbBoundaryType := toBoundaryType(boundary.Type())
+	return &api.TextNodeBoundary{
+		CreatedAt: ToTimeTicket(boundary.ID().CreatedAt()),
+		Offset:    int32(boundary.ID().Offset()),
+		Type:      pbBoundaryType,
 	}
 }
 
@@ -548,6 +523,21 @@ func toCounterType(valueType crdt.CounterType) (api.ValueType, error) {
 	return 0, fmt.Errorf("%d, %w", valueType, ErrUnsupportedCounterType)
 }
 
+func toBoundaryType(boundaryType crdt.BoundaryType) api.BoundaryType {
+	switch boundaryType {
+	case crdt.Before:
+		return api.BoundaryType_BOUNDARY_TYPE_BEFORE
+	case crdt.After:
+		return api.BoundaryType_BOUNDARY_TYPE_AFTER
+	case crdt.Start:
+		return api.BoundaryType_BOUNDARY_TYPE_START
+	case crdt.End:
+		return api.BoundaryType_BOUNDARY_TYPE_END
+	default:
+		return api.BoundaryType_BOUNDARY_TYPE_NONE
+	}
+}
+
 // ToUpdatableProjectFields converts the given model format to Protobuf format.
 func ToUpdatableProjectFields(fields *types.UpdatableProjectFields) (*api.UpdatableProjectFields, error) {
 	pbUpdatableProjectFields := &api.UpdatableProjectFields{}