From 62b8ba05c6eb540ddbb35860f3b09aa5d23200ca Mon Sep 17 00:00:00 2001 From: Semyon Krestyaninov <krestyaninov@perx.ru> Date: Wed, 27 Nov 2024 15:21:17 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=82=D1=80=D0=B0=D0=BD=D1=81=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=B9=20=D1=81=D0=BB=D0=BE=D0=B9=20=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0=20Items?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/items/transport/grpc/client.go | 1 + .../protobuf_endpoint_converters.microgen.go | 26 +++++++++---------- pkg/items/transport/grpc/server.go | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkg/items/transport/grpc/client.go b/pkg/items/transport/grpc/client.go index faea7cc6..fdaf060c 100644 --- a/pkg/items/transport/grpc/client.go +++ b/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), } diff --git a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go index e1934829..6afbf9b1 100644 --- a/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/pkg/items/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -1063,12 +1063,12 @@ 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, - EnvId: req.EnvId, - Id: req.Id, - RevId: req.RevId, - SpaceId: req.SpaceId, + return &pb.CheckoutRevisionRequest{ + CollectionId: req.CollId, + EnvId: req.EnvId, + 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 } diff --git a/pkg/items/transport/grpc/server.go b/pkg/items/transport/grpc/server.go index 4ac8a3b0..676027f9 100644 --- a/pkg/items/transport/grpc/server.go +++ b/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), } -- GitLab