Merge branch 'feature/2846-CheckoutRevisions' into 'master'

Исправлен транспортный слой сервиса Items

See merge request perxis/perxis-go!403

pkg/items/transport/grpc/client.go

@@ -28,6 +28,7 @@ func NewClient(conn *grpc.ClientConn, opts ...grpckit.ClientOption) transport.En
 		ArchiveEndpoint:            grpcerr.ClientMiddleware(c.ArchiveEndpoint),
 		FindArchivedEndpoint:       grpcerr.ClientMiddleware(c.FindArchivedEndpoint),
 		UnarchiveEndpoint:          grpcerr.ClientMiddleware(c.UnarchiveEndpoint),
+		CheckoutRevisionEndpoint:   grpcerr.ClientMiddleware(c.CheckoutRevisionEndpoint),
 		AggregateEndpoint:          grpcerr.ClientMiddleware(c.AggregateEndpoint),
 		AggregatePublishedEndpoint: grpcerr.ClientMiddleware(c.AggregatePublishedEndpoint),
 	}

pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -1063,11 +1063,11 @@ func _Encode_CheckoutRevision_Request(ctx context.Context, request interface{})
 		return nil, errors.New("nil CheckoutRevisionRequest")
 	}
 	req := request.(*transport.CheckoutRevisionRequest)
-	return &transport.CheckoutRevisionRequest{
-		CollId:  req.CollId,
+	return &pb.CheckoutRevisionRequest{
+		CollectionId: req.CollId,
 		EnvId:        req.EnvId,
-		Id:      req.Id,
-		RevId:   req.RevId,
+		ItemId:       req.Id,
+		RevisionId:   req.RevId,
 		SpaceId:      req.SpaceId,
 	}, nil
 }
@@ -1077,19 +1077,19 @@ func _Encode_CheckoutRevision_Response(ctx context.Context, response interface{}
 		return nil, errors.New("nil CheckoutRevisionResponse")
 	}
 	resp := response.(*transport.CheckoutRevisionResponse)
-	return &transport.CheckoutRevisionResponse{StoredRevId: resp.StoredRevId}, nil
+	return &pb.CheckoutRevisionResponse{StoredRevisionId: resp.StoredRevId}, nil
 }
 
 func _Decode_CheckoutRevision_Request(ctx context.Context, request interface{}) (interface{}, error) {
 	if request == nil {
 		return nil, errors.New("nil CheckoutRevisionRequest")
 	}
-	req := request.(*transport.CheckoutRevisionRequest)
+	req := request.(*pb.CheckoutRevisionRequest)
 	return &transport.CheckoutRevisionRequest{
-		CollId:  string(req.CollId),
+		CollId:  string(req.CollectionId),
 		EnvId:   string(req.EnvId),
-		Id:      string(req.Id),
-		RevId:   string(req.RevId),
+		Id:      string(req.ItemId),
+		RevId:   string(req.RevisionId),
 		SpaceId: string(req.SpaceId),
 	}, nil
 }
@@ -1098,6 +1098,6 @@ func _Decode_CheckoutRevision_Response(ctx context.Context, response interface{}
 	if response == nil {
 		return nil, errors.New("nil CheckoutRevisionResponse")
 	}
-	resp := response.(*transport.CheckoutRevisionResponse)
-	return &transport.CheckoutRevisionResponse{StoredRevId: string(resp.StoredRevId)}, nil
+	resp := response.(*pb.CheckoutRevisionResponse)
+	return &transport.CheckoutRevisionResponse{StoredRevId: string(resp.StoredRevisionId)}, nil
 }

pkg/items/transport/grpc/server.go

@@ -27,6 +27,7 @@ func NewServer(svc items.Items, opts ...grpckit.ServerOption) pb.ItemsServer {
 		ArchiveEndpoint:            grpcerr.ServerMiddleware(eps.ArchiveEndpoint),
 		FindArchivedEndpoint:       grpcerr.ServerMiddleware(eps.FindArchivedEndpoint),
 		UnarchiveEndpoint:          grpcerr.ServerMiddleware(eps.UnarchiveEndpoint),
+		CheckoutRevisionEndpoint:   grpcerr.ServerMiddleware(eps.CheckoutRevisionEndpoint),
 		AggregateEndpoint:          grpcerr.ServerMiddleware(eps.AggregateEndpoint),
 		AggregatePublishedEndpoint: grpcerr.ServerMiddleware(eps.AggregatePublishedEndpoint),
 	}