diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..71380f7 --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,65 @@ +name: Build and Push Docker Image + +on: + push: + tags: + - "*" + branches: + - main + - dev + +jobs: + build_and_push: + runs-on: ubuntu-latest + + steps: + - name: Install Docker + run: | + apt-get update + apt-get install -y docker.io + + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set Kubernetes Context + uses: azure/k8s-set-context@v4 + with: + method: kubeconfig + kubeconfig: ${{secrets.buildx_kubeconfig}} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver: kubernetes + driver-opts: | + namespace=gitea + + - name: Login to Docker Registry + uses: docker/login-action@v3 + with: + registry: git.coopgo.io + username: ${{ secrets.REGISTRY_USER }} + password: ${{ secrets.REGISTRY_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker image + id: metadata + uses: docker/metadata-action@v3 + with: + images: git.coopgo.io/${{gitea.repository}} + tags: | + type=ref,event=branch + type=ref,event=tag + type=ref,event=pr + flavor: | + latest=auto + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: | + ${{ steps.metadata.outputs.tags }} + build-args: | + ACCESS_TOKEN_USR=${{gitea.actor}} + ACCESS_TOKEN_PWD=${{gitea.token}} diff --git a/servers/grpc/proto/carpool-service-types.pb.go b/servers/grpc/proto/carpool-service-types.pb.go index 972a2ba..cc9c4df 100644 --- a/servers/grpc/proto/carpool-service-types.pb.go +++ b/servers/grpc/proto/carpool-service-types.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.1 +// protoc v4.24.4 // source: carpool-service-types.proto package proto diff --git a/servers/grpc/proto/carpool-service.pb.go b/servers/grpc/proto/carpool-service.pb.go index d55c25a..904cbb1 100644 --- a/servers/grpc/proto/carpool-service.pb.go +++ b/servers/grpc/proto/carpool-service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 -// protoc v3.19.6 +// protoc-gen-go v1.34.1 +// protoc v4.24.4 // source: carpool-service.proto package proto @@ -1195,7 +1195,7 @@ func (x *PassengerRegularTripsResponse) GetDriverRegularTrips() []*CarpoolServic return nil } -type CreateBookingRequest struct { +type CreateCarpoolBookingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1203,8 +1203,8 @@ type CreateBookingRequest struct { Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } -func (x *CreateBookingRequest) Reset() { - *x = CreateBookingRequest{} +func (x *CreateCarpoolBookingRequest) Reset() { + *x = CreateCarpoolBookingRequest{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1212,13 +1212,13 @@ func (x *CreateBookingRequest) Reset() { } } -func (x *CreateBookingRequest) String() string { +func (x *CreateCarpoolBookingRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CreateBookingRequest) ProtoMessage() {} +func (*CreateCarpoolBookingRequest) ProtoMessage() {} -func (x *CreateBookingRequest) ProtoReflect() protoreflect.Message { +func (x *CreateCarpoolBookingRequest) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1230,19 +1230,19 @@ func (x *CreateBookingRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CreateBookingRequest.ProtoReflect.Descriptor instead. -func (*CreateBookingRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use CreateCarpoolBookingRequest.ProtoReflect.Descriptor instead. +func (*CreateCarpoolBookingRequest) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{18} } -func (x *CreateBookingRequest) GetBooking() *CarpoolServiceBooking { +func (x *CreateCarpoolBookingRequest) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } return nil } -type CreateBookingResponse struct { +type CreateCarpoolBookingResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1250,8 +1250,8 @@ type CreateBookingResponse struct { Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } -func (x *CreateBookingResponse) Reset() { - *x = CreateBookingResponse{} +func (x *CreateCarpoolBookingResponse) Reset() { + *x = CreateCarpoolBookingResponse{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1259,13 +1259,13 @@ func (x *CreateBookingResponse) Reset() { } } -func (x *CreateBookingResponse) String() string { +func (x *CreateCarpoolBookingResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*CreateBookingResponse) ProtoMessage() {} +func (*CreateCarpoolBookingResponse) ProtoMessage() {} -func (x *CreateBookingResponse) ProtoReflect() protoreflect.Message { +func (x *CreateCarpoolBookingResponse) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1277,19 +1277,19 @@ func (x *CreateBookingResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use CreateBookingResponse.ProtoReflect.Descriptor instead. -func (*CreateBookingResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use CreateCarpoolBookingResponse.ProtoReflect.Descriptor instead. +func (*CreateCarpoolBookingResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{19} } -func (x *CreateBookingResponse) GetBooking() *CarpoolServiceBooking { +func (x *CreateCarpoolBookingResponse) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } return nil } -type UpdateBookingRequest struct { +type UpdateCarpoolBookingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1299,8 +1299,8 @@ type UpdateBookingRequest struct { Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` } -func (x *UpdateBookingRequest) Reset() { - *x = UpdateBookingRequest{} +func (x *UpdateCarpoolBookingRequest) Reset() { + *x = UpdateCarpoolBookingRequest{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1308,13 +1308,13 @@ func (x *UpdateBookingRequest) Reset() { } } -func (x *UpdateBookingRequest) String() string { +func (x *UpdateCarpoolBookingRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UpdateBookingRequest) ProtoMessage() {} +func (*UpdateCarpoolBookingRequest) ProtoMessage() {} -func (x *UpdateBookingRequest) ProtoReflect() protoreflect.Message { +func (x *UpdateCarpoolBookingRequest) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1326,40 +1326,40 @@ func (x *UpdateBookingRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UpdateBookingRequest.ProtoReflect.Descriptor instead. -func (*UpdateBookingRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use UpdateCarpoolBookingRequest.ProtoReflect.Descriptor instead. +func (*UpdateCarpoolBookingRequest) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{20} } -func (x *UpdateBookingRequest) GetBookingId() string { +func (x *UpdateCarpoolBookingRequest) GetBookingId() string { if x != nil { return x.BookingId } return "" } -func (x *UpdateBookingRequest) GetStatus() CarpoolServiceBookingStatus { +func (x *UpdateCarpoolBookingRequest) GetStatus() CarpoolServiceBookingStatus { if x != nil { return x.Status } return CarpoolServiceBookingStatus_INITIATED } -func (x *UpdateBookingRequest) GetMessage() string { +func (x *UpdateCarpoolBookingRequest) GetMessage() string { if x != nil { return x.Message } return "" } -type UpdateBookingResponse struct { +type UpdateCarpoolBookingResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *UpdateBookingResponse) Reset() { - *x = UpdateBookingResponse{} +func (x *UpdateCarpoolBookingResponse) Reset() { + *x = UpdateCarpoolBookingResponse{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1367,13 +1367,13 @@ func (x *UpdateBookingResponse) Reset() { } } -func (x *UpdateBookingResponse) String() string { +func (x *UpdateCarpoolBookingResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*UpdateBookingResponse) ProtoMessage() {} +func (*UpdateCarpoolBookingResponse) ProtoMessage() {} -func (x *UpdateBookingResponse) ProtoReflect() protoreflect.Message { +func (x *UpdateCarpoolBookingResponse) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1385,12 +1385,12 @@ func (x *UpdateBookingResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use UpdateBookingResponse.ProtoReflect.Descriptor instead. -func (*UpdateBookingResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use UpdateCarpoolBookingResponse.ProtoReflect.Descriptor instead. +func (*UpdateCarpoolBookingResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{21} } -type GetBookingRequest struct { +type GetCarpoolBookingRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1398,8 +1398,8 @@ type GetBookingRequest struct { BookingId string `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"` } -func (x *GetBookingRequest) Reset() { - *x = GetBookingRequest{} +func (x *GetCarpoolBookingRequest) Reset() { + *x = GetCarpoolBookingRequest{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1407,13 +1407,13 @@ func (x *GetBookingRequest) Reset() { } } -func (x *GetBookingRequest) String() string { +func (x *GetCarpoolBookingRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetBookingRequest) ProtoMessage() {} +func (*GetCarpoolBookingRequest) ProtoMessage() {} -func (x *GetBookingRequest) ProtoReflect() protoreflect.Message { +func (x *GetCarpoolBookingRequest) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1425,19 +1425,19 @@ func (x *GetBookingRequest) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use GetBookingRequest.ProtoReflect.Descriptor instead. -func (*GetBookingRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use GetCarpoolBookingRequest.ProtoReflect.Descriptor instead. +func (*GetCarpoolBookingRequest) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{22} } -func (x *GetBookingRequest) GetBookingId() string { +func (x *GetCarpoolBookingRequest) GetBookingId() string { if x != nil { return x.BookingId } return "" } -type GetBookingResponse struct { +type GetCarpoolBookingResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1445,8 +1445,8 @@ type GetBookingResponse struct { Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } -func (x *GetBookingResponse) Reset() { - *x = GetBookingResponse{} +func (x *GetCarpoolBookingResponse) Reset() { + *x = GetCarpoolBookingResponse{} if protoimpl.UnsafeEnabled { mi := &file_carpool_service_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1454,13 +1454,13 @@ func (x *GetBookingResponse) Reset() { } } -func (x *GetBookingResponse) String() string { +func (x *GetCarpoolBookingResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetBookingResponse) ProtoMessage() {} +func (*GetCarpoolBookingResponse) ProtoMessage() {} -func (x *GetBookingResponse) ProtoReflect() protoreflect.Message { +func (x *GetCarpoolBookingResponse) ProtoReflect() protoreflect.Message { mi := &file_carpool_service_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1472,12 +1472,12 @@ func (x *GetBookingResponse) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use GetBookingResponse.ProtoReflect.Descriptor instead. -func (*GetBookingResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use GetCarpoolBookingResponse.ProtoReflect.Descriptor instead. +func (*GetCarpoolBookingResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{23} } -func (x *GetBookingResponse) GetBooking() *CarpoolServiceBooking { +func (x *GetCarpoolBookingResponse) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } @@ -1728,96 +1728,101 @@ var file_carpool_service_proto_rawDesc = []byte{ 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x52, 0x12, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, - 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x22, 0x48, 0x0a, 0x14, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x30, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, - 0x69, 0x6e, 0x67, 0x22, 0x49, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, - 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x07, - 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, - 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, - 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x85, - 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, + 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x22, 0x4f, 0x0a, 0x1b, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x61, 0x72, 0x70, + 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x50, 0x0a, 0x1c, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x07, 0x62, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x61, + 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x22, 0x8c, 0x01, 0x0a, + 0x1b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, + 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x43, 0x61, + 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x1e, 0x0a, 0x1c, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, + 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, 0x0a, 0x18, 0x47, + 0x65, 0x74, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6f, 0x6f, - 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x18, 0x0a, 0x07, - 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x32, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x5f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x07, 0x62, 0x6f, 0x6f, - 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x61, 0x72, - 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, - 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0x88, 0x07, 0x0a, 0x0e, - 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x52, - 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1b, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, - 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, - 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, - 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, 0x1b, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, - 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, - 0x72, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x55, - 0x73, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x6e, - 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, - 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x69, 0x70, - 0x12, 0x16, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x69, - 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6c, - 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x6f, - 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x12, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, - 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x18, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, - 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, - 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, - 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x4c, 0x0a, 0x11, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x4a, 0x6f, 0x75, - 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x19, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, - 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1a, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, - 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, - 0x0a, 0x12, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, - 0x72, 0x69, 0x70, 0x73, 0x12, 0x1a, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, - 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1b, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, - 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x58, 0x0a, 0x15, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, - 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, - 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, - 0x67, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x15, 0x2e, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x15, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, 0x6b, - 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x37, 0x0a, - 0x0a, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x12, 0x2e, 0x47, 0x65, - 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x13, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x2e, 0x63, 0x6f, - 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2d, 0x70, - 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x63, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x2d, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x73, 0x2f, - 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6b, 0x69, 0x6e, 0x67, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x43, 0x61, 0x72, + 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x07, 0x62, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x62, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x32, 0xb2, 0x07, 0x0a, 0x0e, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, + 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x52, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x12, + 0x1b, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x13, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x73, 0x12, 0x1b, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, + 0x6c, 0x61, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x1c, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x46, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x6e, 0x6e, + 0x69, 0x6e, 0x67, 0x12, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6c, 0x61, + 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x47, + 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, + 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x69, 0x70, 0x12, 0x16, 0x2e, 0x47, 0x65, 0x74, + 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, 0x72, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x54, + 0x72, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a, + 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, + 0x12, 0x17, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x47, 0x65, 0x74, 0x55, + 0x73, 0x65, 0x72, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, + 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, 0x16, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x17, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x11, 0x50, 0x61, + 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x12, + 0x19, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, + 0x65, 0x79, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x4a, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x79, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x12, 0x44, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x12, 0x1a, + 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, + 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x44, 0x72, 0x69, + 0x76, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x15, 0x50, 0x61, 0x73, + 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, + 0x70, 0x73, 0x12, 0x1d, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, + 0x67, 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1e, 0x2e, 0x50, 0x61, 0x73, 0x73, 0x65, 0x6e, 0x67, 0x65, 0x72, 0x52, 0x65, 0x67, + 0x75, 0x6c, 0x61, 0x72, 0x54, 0x72, 0x69, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, + 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, + 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, + 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x6f, 0x6f, + 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1c, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, + 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x72, 0x70, 0x6f, + 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, + 0x67, 0x12, 0x19, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, + 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x47, + 0x65, 0x74, 0x43, 0x61, 0x72, 0x70, 0x6f, 0x6f, 0x6c, 0x42, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, + 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x70, 0x67, 0x6f, 0x2e, 0x69, 0x6f, 0x2f, 0x63, 0x6f, 0x6f, 0x70, + 0x67, 0x6f, 0x2d, 0x70, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x2f, 0x63, 0x61, 0x72, 0x70, + 0x6f, 0x6f, 0x6c, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x65, 0x72, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1852,12 +1857,12 @@ var file_carpool_service_proto_goTypes = []interface{}{ (*DriverRegularTripsResponse)(nil), // 15: DriverRegularTripsResponse (*PassengerRegularTripsRequest)(nil), // 16: PassengerRegularTripsRequest (*PassengerRegularTripsResponse)(nil), // 17: PassengerRegularTripsResponse - (*CreateBookingRequest)(nil), // 18: CreateBookingRequest - (*CreateBookingResponse)(nil), // 19: CreateBookingResponse - (*UpdateBookingRequest)(nil), // 20: UpdateBookingRequest - (*UpdateBookingResponse)(nil), // 21: UpdateBookingResponse - (*GetBookingRequest)(nil), // 22: GetBookingRequest - (*GetBookingResponse)(nil), // 23: GetBookingResponse + (*CreateCarpoolBookingRequest)(nil), // 18: CreateCarpoolBookingRequest + (*CreateCarpoolBookingResponse)(nil), // 19: CreateCarpoolBookingResponse + (*UpdateCarpoolBookingRequest)(nil), // 20: UpdateCarpoolBookingRequest + (*UpdateCarpoolBookingResponse)(nil), // 21: UpdateCarpoolBookingResponse + (*GetCarpoolBookingRequest)(nil), // 22: GetCarpoolBookingRequest + (*GetCarpoolBookingResponse)(nil), // 23: GetCarpoolBookingResponse nil, // 24: GetUserPlanningResponse.RoutesByDatesEntry (*CarpoolFeatureCollection)(nil), // 25: CarpoolFeatureCollection (*timestamppb.Timestamp)(nil), // 26: google.protobuf.Timestamp @@ -1887,10 +1892,10 @@ var file_carpool_service_proto_depIdxs = []int32{ 26, // 15: PassengerRegularTripsRequest.min_departure_date:type_name -> google.protobuf.Timestamp 26, // 16: PassengerRegularTripsRequest.max_departure_date:type_name -> google.protobuf.Timestamp 30, // 17: PassengerRegularTripsResponse.driver_regular_trips:type_name -> CarpoolServiceDriverRegularTrip - 27, // 18: CreateBookingRequest.booking:type_name -> CarpoolServiceBooking - 27, // 19: CreateBookingResponse.booking:type_name -> CarpoolServiceBooking - 31, // 20: UpdateBookingRequest.status:type_name -> CarpoolServiceBookingStatus - 27, // 21: GetBookingResponse.booking:type_name -> CarpoolServiceBooking + 27, // 18: CreateCarpoolBookingRequest.booking:type_name -> CarpoolServiceBooking + 27, // 19: CreateCarpoolBookingResponse.booking:type_name -> CarpoolServiceBooking + 31, // 20: UpdateCarpoolBookingRequest.status:type_name -> CarpoolServiceBookingStatus + 27, // 21: GetCarpoolBookingResponse.booking:type_name -> CarpoolServiceBooking 32, // 22: GetUserPlanningResponse.RoutesByDatesEntry.value:type_name -> CarpoolRoutesCollection 0, // 23: CarpoolService.CreateRegularRoutes:input_type -> CreateRegularRoutesRequest 2, // 24: CarpoolService.DeleteRegularRoutes:input_type -> DeleteRegularRoutesRequest @@ -1901,9 +1906,9 @@ var file_carpool_service_proto_depIdxs = []int32{ 12, // 29: CarpoolService.PassengerJourneys:input_type -> PassengerJourneysRequest 14, // 30: CarpoolService.DriverRegularTrips:input_type -> DriverRegularTripsRequest 16, // 31: CarpoolService.PassengerRegularTrips:input_type -> PassengerRegularTripsRequest - 18, // 32: CarpoolService.CreateBooking:input_type -> CreateBookingRequest - 20, // 33: CarpoolService.UpdateBooking:input_type -> UpdateBookingRequest - 22, // 34: CarpoolService.GetBooking:input_type -> GetBookingRequest + 18, // 32: CarpoolService.CreateBooking:input_type -> CreateCarpoolBookingRequest + 20, // 33: CarpoolService.UpdateBooking:input_type -> UpdateCarpoolBookingRequest + 22, // 34: CarpoolService.GetBooking:input_type -> GetCarpoolBookingRequest 1, // 35: CarpoolService.CreateRegularRoutes:output_type -> CreateRegularRoutesResponse 3, // 36: CarpoolService.DeleteRegularRoutes:output_type -> DeleteRegularRoutesResponse 5, // 37: CarpoolService.GetUserPlanning:output_type -> GetUserPlanningResponse @@ -1913,9 +1918,9 @@ var file_carpool_service_proto_depIdxs = []int32{ 13, // 41: CarpoolService.PassengerJourneys:output_type -> PassengerJourneysResponse 15, // 42: CarpoolService.DriverRegularTrips:output_type -> DriverRegularTripsResponse 17, // 43: CarpoolService.PassengerRegularTrips:output_type -> PassengerRegularTripsResponse - 19, // 44: CarpoolService.CreateBooking:output_type -> CreateBookingResponse - 21, // 45: CarpoolService.UpdateBooking:output_type -> UpdateBookingResponse - 23, // 46: CarpoolService.GetBooking:output_type -> GetBookingResponse + 19, // 44: CarpoolService.CreateBooking:output_type -> CreateCarpoolBookingResponse + 21, // 45: CarpoolService.UpdateBooking:output_type -> UpdateCarpoolBookingResponse + 23, // 46: CarpoolService.GetBooking:output_type -> GetCarpoolBookingResponse 35, // [35:47] is the sub-list for method output_type 23, // [23:35] is the sub-list for method input_type 23, // [23:23] is the sub-list for extension type_name @@ -2147,7 +2152,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateBookingRequest); i { + switch v := v.(*CreateCarpoolBookingRequest); i { case 0: return &v.state case 1: @@ -2159,7 +2164,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateBookingResponse); i { + switch v := v.(*CreateCarpoolBookingResponse); i { case 0: return &v.state case 1: @@ -2171,7 +2176,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateBookingRequest); i { + switch v := v.(*UpdateCarpoolBookingRequest); i { case 0: return &v.state case 1: @@ -2183,7 +2188,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateBookingResponse); i { + switch v := v.(*UpdateCarpoolBookingResponse); i { case 0: return &v.state case 1: @@ -2195,7 +2200,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetBookingRequest); i { + switch v := v.(*GetCarpoolBookingRequest); i { case 0: return &v.state case 1: @@ -2207,7 +2212,7 @@ func file_carpool_service_proto_init() { } } file_carpool_service_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetBookingResponse); i { + switch v := v.(*GetCarpoolBookingResponse); i { case 0: return &v.state case 1: diff --git a/servers/grpc/proto/carpool-service.proto b/servers/grpc/proto/carpool-service.proto index 0bcaee7..f856722 100644 --- a/servers/grpc/proto/carpool-service.proto +++ b/servers/grpc/proto/carpool-service.proto @@ -19,9 +19,9 @@ service CarpoolService { rpc PassengerJourneys(PassengerJourneysRequest) returns (PassengerJourneysResponse) {} rpc DriverRegularTrips(DriverRegularTripsRequest) returns (DriverRegularTripsResponse) {} rpc PassengerRegularTrips(PassengerRegularTripsRequest) returns (PassengerRegularTripsResponse) {} - rpc CreateBooking(CreateBookingRequest) returns (CreateBookingResponse) {} - rpc UpdateBooking(UpdateBookingRequest) returns (UpdateBookingResponse) {} - rpc GetBooking(GetBookingRequest) returns (GetBookingResponse) {} + rpc CreateBooking(CreateCarpoolBookingRequest) returns (CreateCarpoolBookingResponse) {} + rpc UpdateBooking(UpdateCarpoolBookingRequest) returns (UpdateCarpoolBookingResponse) {} + rpc GetBooking(GetCarpoolBookingRequest) returns (GetCarpoolBookingResponse) {} } // Internal trips and journeys management messages @@ -139,26 +139,26 @@ message PassengerRegularTripsResponse { repeated CarpoolServiceDriverRegularTrip driver_regular_trips = 1; } -message CreateBookingRequest { +message CreateCarpoolBookingRequest { CarpoolServiceBooking booking = 1; } -message CreateBookingResponse { +message CreateCarpoolBookingResponse { CarpoolServiceBooking booking = 1; } -message UpdateBookingRequest { +message UpdateCarpoolBookingRequest { string booking_id = 1; CarpoolServiceBookingStatus status = 2; string message = 3; } -message UpdateBookingResponse {} +message UpdateCarpoolBookingResponse {} -message GetBookingRequest { +message GetCarpoolBookingRequest { string booking_id = 1; } -message GetBookingResponse { +message GetCarpoolBookingResponse { CarpoolServiceBooking booking = 1; -} \ No newline at end of file +} diff --git a/servers/grpc/proto/carpool-service_grpc.pb.go b/servers/grpc/proto/carpool-service_grpc.pb.go index 01f5cd2..d09e596 100644 --- a/servers/grpc/proto/carpool-service_grpc.pb.go +++ b/servers/grpc/proto/carpool-service_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.2.0 -// - protoc v3.19.6 +// - protoc-gen-go-grpc v1.3.0 +// - protoc v4.24.4 // source: carpool-service.proto package proto @@ -18,6 +18,21 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 +const ( + CarpoolService_CreateRegularRoutes_FullMethodName = "/CarpoolService/CreateRegularRoutes" + CarpoolService_DeleteRegularRoutes_FullMethodName = "/CarpoolService/DeleteRegularRoutes" + CarpoolService_GetUserPlanning_FullMethodName = "/CarpoolService/GetUserPlanning" + CarpoolService_GetPlannedTrip_FullMethodName = "/CarpoolService/GetPlannedTrip" + CarpoolService_GetUserBookings_FullMethodName = "/CarpoolService/GetUserBookings" + CarpoolService_DriverJourneys_FullMethodName = "/CarpoolService/DriverJourneys" + CarpoolService_PassengerJourneys_FullMethodName = "/CarpoolService/PassengerJourneys" + CarpoolService_DriverRegularTrips_FullMethodName = "/CarpoolService/DriverRegularTrips" + CarpoolService_PassengerRegularTrips_FullMethodName = "/CarpoolService/PassengerRegularTrips" + CarpoolService_CreateBooking_FullMethodName = "/CarpoolService/CreateBooking" + CarpoolService_UpdateBooking_FullMethodName = "/CarpoolService/UpdateBooking" + CarpoolService_GetBooking_FullMethodName = "/CarpoolService/GetBooking" +) + // CarpoolServiceClient is the client API for CarpoolService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. @@ -34,9 +49,9 @@ type CarpoolServiceClient interface { PassengerJourneys(ctx context.Context, in *PassengerJourneysRequest, opts ...grpc.CallOption) (*PassengerJourneysResponse, error) DriverRegularTrips(ctx context.Context, in *DriverRegularTripsRequest, opts ...grpc.CallOption) (*DriverRegularTripsResponse, error) PassengerRegularTrips(ctx context.Context, in *PassengerRegularTripsRequest, opts ...grpc.CallOption) (*PassengerRegularTripsResponse, error) - CreateBooking(ctx context.Context, in *CreateBookingRequest, opts ...grpc.CallOption) (*CreateBookingResponse, error) - UpdateBooking(ctx context.Context, in *UpdateBookingRequest, opts ...grpc.CallOption) (*UpdateBookingResponse, error) - GetBooking(ctx context.Context, in *GetBookingRequest, opts ...grpc.CallOption) (*GetBookingResponse, error) + CreateBooking(ctx context.Context, in *CreateCarpoolBookingRequest, opts ...grpc.CallOption) (*CreateCarpoolBookingResponse, error) + UpdateBooking(ctx context.Context, in *UpdateCarpoolBookingRequest, opts ...grpc.CallOption) (*UpdateCarpoolBookingResponse, error) + GetBooking(ctx context.Context, in *GetCarpoolBookingRequest, opts ...grpc.CallOption) (*GetCarpoolBookingResponse, error) } type carpoolServiceClient struct { @@ -49,7 +64,7 @@ func NewCarpoolServiceClient(cc grpc.ClientConnInterface) CarpoolServiceClient { func (c *carpoolServiceClient) CreateRegularRoutes(ctx context.Context, in *CreateRegularRoutesRequest, opts ...grpc.CallOption) (*CreateRegularRoutesResponse, error) { out := new(CreateRegularRoutesResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/CreateRegularRoutes", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_CreateRegularRoutes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -58,7 +73,7 @@ func (c *carpoolServiceClient) CreateRegularRoutes(ctx context.Context, in *Crea func (c *carpoolServiceClient) DeleteRegularRoutes(ctx context.Context, in *DeleteRegularRoutesRequest, opts ...grpc.CallOption) (*DeleteRegularRoutesResponse, error) { out := new(DeleteRegularRoutesResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/DeleteRegularRoutes", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_DeleteRegularRoutes_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -67,7 +82,7 @@ func (c *carpoolServiceClient) DeleteRegularRoutes(ctx context.Context, in *Dele func (c *carpoolServiceClient) GetUserPlanning(ctx context.Context, in *GetUserPlanningRequest, opts ...grpc.CallOption) (*GetUserPlanningResponse, error) { out := new(GetUserPlanningResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/GetUserPlanning", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_GetUserPlanning_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -76,7 +91,7 @@ func (c *carpoolServiceClient) GetUserPlanning(ctx context.Context, in *GetUserP func (c *carpoolServiceClient) GetPlannedTrip(ctx context.Context, in *GetPlannedTripRequest, opts ...grpc.CallOption) (*GetPlannedTripResponse, error) { out := new(GetPlannedTripResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/GetPlannedTrip", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_GetPlannedTrip_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -85,7 +100,7 @@ func (c *carpoolServiceClient) GetPlannedTrip(ctx context.Context, in *GetPlanne func (c *carpoolServiceClient) GetUserBookings(ctx context.Context, in *GetUserBookingsRequest, opts ...grpc.CallOption) (*GetUserBookingsResponse, error) { out := new(GetUserBookingsResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/GetUserBookings", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_GetUserBookings_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -94,7 +109,7 @@ func (c *carpoolServiceClient) GetUserBookings(ctx context.Context, in *GetUserB func (c *carpoolServiceClient) DriverJourneys(ctx context.Context, in *DriverJourneysRequest, opts ...grpc.CallOption) (*DriverJourneysResponse, error) { out := new(DriverJourneysResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/DriverJourneys", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_DriverJourneys_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -103,7 +118,7 @@ func (c *carpoolServiceClient) DriverJourneys(ctx context.Context, in *DriverJou func (c *carpoolServiceClient) PassengerJourneys(ctx context.Context, in *PassengerJourneysRequest, opts ...grpc.CallOption) (*PassengerJourneysResponse, error) { out := new(PassengerJourneysResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/PassengerJourneys", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_PassengerJourneys_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -112,7 +127,7 @@ func (c *carpoolServiceClient) PassengerJourneys(ctx context.Context, in *Passen func (c *carpoolServiceClient) DriverRegularTrips(ctx context.Context, in *DriverRegularTripsRequest, opts ...grpc.CallOption) (*DriverRegularTripsResponse, error) { out := new(DriverRegularTripsResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/DriverRegularTrips", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_DriverRegularTrips_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -121,34 +136,34 @@ func (c *carpoolServiceClient) DriverRegularTrips(ctx context.Context, in *Drive func (c *carpoolServiceClient) PassengerRegularTrips(ctx context.Context, in *PassengerRegularTripsRequest, opts ...grpc.CallOption) (*PassengerRegularTripsResponse, error) { out := new(PassengerRegularTripsResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/PassengerRegularTrips", in, out, opts...) + err := c.cc.Invoke(ctx, CarpoolService_PassengerRegularTrips_FullMethodName, in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *carpoolServiceClient) CreateBooking(ctx context.Context, in *CreateBookingRequest, opts ...grpc.CallOption) (*CreateBookingResponse, error) { - out := new(CreateBookingResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/CreateBooking", in, out, opts...) +func (c *carpoolServiceClient) CreateBooking(ctx context.Context, in *CreateCarpoolBookingRequest, opts ...grpc.CallOption) (*CreateCarpoolBookingResponse, error) { + out := new(CreateCarpoolBookingResponse) + err := c.cc.Invoke(ctx, CarpoolService_CreateBooking_FullMethodName, in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *carpoolServiceClient) UpdateBooking(ctx context.Context, in *UpdateBookingRequest, opts ...grpc.CallOption) (*UpdateBookingResponse, error) { - out := new(UpdateBookingResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/UpdateBooking", in, out, opts...) +func (c *carpoolServiceClient) UpdateBooking(ctx context.Context, in *UpdateCarpoolBookingRequest, opts ...grpc.CallOption) (*UpdateCarpoolBookingResponse, error) { + out := new(UpdateCarpoolBookingResponse) + err := c.cc.Invoke(ctx, CarpoolService_UpdateBooking_FullMethodName, in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *carpoolServiceClient) GetBooking(ctx context.Context, in *GetBookingRequest, opts ...grpc.CallOption) (*GetBookingResponse, error) { - out := new(GetBookingResponse) - err := c.cc.Invoke(ctx, "/CarpoolService/GetBooking", in, out, opts...) +func (c *carpoolServiceClient) GetBooking(ctx context.Context, in *GetCarpoolBookingRequest, opts ...grpc.CallOption) (*GetCarpoolBookingResponse, error) { + out := new(GetCarpoolBookingResponse) + err := c.cc.Invoke(ctx, CarpoolService_GetBooking_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -171,9 +186,9 @@ type CarpoolServiceServer interface { PassengerJourneys(context.Context, *PassengerJourneysRequest) (*PassengerJourneysResponse, error) DriverRegularTrips(context.Context, *DriverRegularTripsRequest) (*DriverRegularTripsResponse, error) PassengerRegularTrips(context.Context, *PassengerRegularTripsRequest) (*PassengerRegularTripsResponse, error) - CreateBooking(context.Context, *CreateBookingRequest) (*CreateBookingResponse, error) - UpdateBooking(context.Context, *UpdateBookingRequest) (*UpdateBookingResponse, error) - GetBooking(context.Context, *GetBookingRequest) (*GetBookingResponse, error) + CreateBooking(context.Context, *CreateCarpoolBookingRequest) (*CreateCarpoolBookingResponse, error) + UpdateBooking(context.Context, *UpdateCarpoolBookingRequest) (*UpdateCarpoolBookingResponse, error) + GetBooking(context.Context, *GetCarpoolBookingRequest) (*GetCarpoolBookingResponse, error) mustEmbedUnimplementedCarpoolServiceServer() } @@ -208,13 +223,13 @@ func (UnimplementedCarpoolServiceServer) DriverRegularTrips(context.Context, *Dr func (UnimplementedCarpoolServiceServer) PassengerRegularTrips(context.Context, *PassengerRegularTripsRequest) (*PassengerRegularTripsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PassengerRegularTrips not implemented") } -func (UnimplementedCarpoolServiceServer) CreateBooking(context.Context, *CreateBookingRequest) (*CreateBookingResponse, error) { +func (UnimplementedCarpoolServiceServer) CreateBooking(context.Context, *CreateCarpoolBookingRequest) (*CreateCarpoolBookingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateBooking not implemented") } -func (UnimplementedCarpoolServiceServer) UpdateBooking(context.Context, *UpdateBookingRequest) (*UpdateBookingResponse, error) { +func (UnimplementedCarpoolServiceServer) UpdateBooking(context.Context, *UpdateCarpoolBookingRequest) (*UpdateCarpoolBookingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateBooking not implemented") } -func (UnimplementedCarpoolServiceServer) GetBooking(context.Context, *GetBookingRequest) (*GetBookingResponse, error) { +func (UnimplementedCarpoolServiceServer) GetBooking(context.Context, *GetCarpoolBookingRequest) (*GetCarpoolBookingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBooking not implemented") } func (UnimplementedCarpoolServiceServer) mustEmbedUnimplementedCarpoolServiceServer() {} @@ -240,7 +255,7 @@ func _CarpoolService_CreateRegularRoutes_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/CreateRegularRoutes", + FullMethod: CarpoolService_CreateRegularRoutes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).CreateRegularRoutes(ctx, req.(*CreateRegularRoutesRequest)) @@ -258,7 +273,7 @@ func _CarpoolService_DeleteRegularRoutes_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/DeleteRegularRoutes", + FullMethod: CarpoolService_DeleteRegularRoutes_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).DeleteRegularRoutes(ctx, req.(*DeleteRegularRoutesRequest)) @@ -276,7 +291,7 @@ func _CarpoolService_GetUserPlanning_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/GetUserPlanning", + FullMethod: CarpoolService_GetUserPlanning_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).GetUserPlanning(ctx, req.(*GetUserPlanningRequest)) @@ -294,7 +309,7 @@ func _CarpoolService_GetPlannedTrip_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/GetPlannedTrip", + FullMethod: CarpoolService_GetPlannedTrip_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).GetPlannedTrip(ctx, req.(*GetPlannedTripRequest)) @@ -312,7 +327,7 @@ func _CarpoolService_GetUserBookings_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/GetUserBookings", + FullMethod: CarpoolService_GetUserBookings_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).GetUserBookings(ctx, req.(*GetUserBookingsRequest)) @@ -330,7 +345,7 @@ func _CarpoolService_DriverJourneys_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/DriverJourneys", + FullMethod: CarpoolService_DriverJourneys_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).DriverJourneys(ctx, req.(*DriverJourneysRequest)) @@ -348,7 +363,7 @@ func _CarpoolService_PassengerJourneys_Handler(srv interface{}, ctx context.Cont } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/PassengerJourneys", + FullMethod: CarpoolService_PassengerJourneys_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).PassengerJourneys(ctx, req.(*PassengerJourneysRequest)) @@ -366,7 +381,7 @@ func _CarpoolService_DriverRegularTrips_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/DriverRegularTrips", + FullMethod: CarpoolService_DriverRegularTrips_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).DriverRegularTrips(ctx, req.(*DriverRegularTripsRequest)) @@ -384,7 +399,7 @@ func _CarpoolService_PassengerRegularTrips_Handler(srv interface{}, ctx context. } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/PassengerRegularTrips", + FullMethod: CarpoolService_PassengerRegularTrips_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CarpoolServiceServer).PassengerRegularTrips(ctx, req.(*PassengerRegularTripsRequest)) @@ -393,7 +408,7 @@ func _CarpoolService_PassengerRegularTrips_Handler(srv interface{}, ctx context. } func _CarpoolService_CreateBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CreateBookingRequest) + in := new(CreateCarpoolBookingRequest) if err := dec(in); err != nil { return nil, err } @@ -402,16 +417,16 @@ func _CarpoolService_CreateBooking_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/CreateBooking", + FullMethod: CarpoolService_CreateBooking_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CarpoolServiceServer).CreateBooking(ctx, req.(*CreateBookingRequest)) + return srv.(CarpoolServiceServer).CreateBooking(ctx, req.(*CreateCarpoolBookingRequest)) } return interceptor(ctx, in, info, handler) } func _CarpoolService_UpdateBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UpdateBookingRequest) + in := new(UpdateCarpoolBookingRequest) if err := dec(in); err != nil { return nil, err } @@ -420,16 +435,16 @@ func _CarpoolService_UpdateBooking_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/UpdateBooking", + FullMethod: CarpoolService_UpdateBooking_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CarpoolServiceServer).UpdateBooking(ctx, req.(*UpdateBookingRequest)) + return srv.(CarpoolServiceServer).UpdateBooking(ctx, req.(*UpdateCarpoolBookingRequest)) } return interceptor(ctx, in, info, handler) } func _CarpoolService_GetBooking_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetBookingRequest) + in := new(GetCarpoolBookingRequest) if err := dec(in); err != nil { return nil, err } @@ -438,10 +453,10 @@ func _CarpoolService_GetBooking_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/CarpoolService/GetBooking", + FullMethod: CarpoolService_GetBooking_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CarpoolServiceServer).GetBooking(ctx, req.(*GetBookingRequest)) + return srv.(CarpoolServiceServer).GetBooking(ctx, req.(*GetCarpoolBookingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/servers/grpc/server/book.go b/servers/grpc/server/book.go index 18cccd3..e8df789 100644 --- a/servers/grpc/server/book.go +++ b/servers/grpc/server/book.go @@ -10,13 +10,13 @@ import ( "google.golang.org/grpc/status" ) -func (s *CarpoolServiceServerImpl) CreateBooking(ctx context.Context, req *proto.CreateBookingRequest) (*proto.CreateBookingResponse, error) { +func (s *CarpoolServiceServerImpl) CreateBooking(ctx context.Context, req *proto.CreateCarpoolBookingRequest) (*proto.CreateCarpoolBookingResponse, error) { booking := req.Booking.ToOCSS() _, err := s.Handler.Book(booking) if err != nil { return nil, status.Errorf(codes.Internal, "could not create booking - %s", err.Error()) } - return &proto.CreateBookingResponse{}, nil + return &proto.CreateCarpoolBookingResponse{}, nil } func (s *CarpoolServiceServerImpl) GetUserBookings(ctx context.Context, req *proto.GetUserBookingsRequest) (*proto.GetUserBookingsResponse, error) { @@ -54,22 +54,22 @@ func (s *CarpoolServiceServerImpl) GetUserBookings(ctx context.Context, req *pro }, nil } -func (s *CarpoolServiceServerImpl) UpdateBooking(ctx context.Context, req *proto.UpdateBookingRequest) (*proto.UpdateBookingResponse, error) { +func (s *CarpoolServiceServerImpl) UpdateBooking(ctx context.Context, req *proto.UpdateCarpoolBookingRequest) (*proto.UpdateCarpoolBookingResponse, error) { err := s.Handler.UpdateBookingStatus(req.BookingId, req.Status.ToOCSS()) if err != nil { return nil, status.Errorf(codes.Internal, "could not update booking status") } - return &proto.UpdateBookingResponse{}, nil + return &proto.UpdateCarpoolBookingResponse{}, nil } -func (s *CarpoolServiceServerImpl) GetBooking(ctx context.Context, req *proto.GetBookingRequest) (*proto.GetBookingResponse, error) { +func (s *CarpoolServiceServerImpl) GetBooking(ctx context.Context, req *proto.GetCarpoolBookingRequest) (*proto.GetCarpoolBookingResponse, error) { result, err := s.Handler.GetBooking(req.BookingId) if err != nil { log.Error().Err(err).Msg("issue retrieving booking in handler") return nil, err } - return &proto.GetBookingResponse{ + return &proto.GetCarpoolBookingResponse{ Booking: proto.BookingFromInternal(*result), }, nil } diff --git a/servers/grpc/server/search.go b/servers/grpc/server/search.go index 445b223..a20692b 100644 --- a/servers/grpc/server/search.go +++ b/servers/grpc/server/search.go @@ -13,7 +13,6 @@ import ( ) func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *proto.DriverJourneysRequest) (*proto.DriverJourneysResponse, error) { - departure := orb.Point{req.DepartureLng, req.DepartureLat} arrival := orb.Point{req.ArrivalLng, req.ArrivalLat} @@ -68,7 +67,7 @@ func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *prot var distance *int64 if len(j.Itinerary.Legs) > 2 { duration = j.Itinerary.Legs[1].Duration - dist := j.Itinerary.Legs[1].Distance + dist := int64(j.Itinerary.Legs[1].Distance) distance = &dist } @@ -103,6 +102,7 @@ func (s *CarpoolServiceServerImpl) DriverJourneys(ctx context.Context, req *prot DriverJourneys: results, }, nil } + func (s *CarpoolServiceServerImpl) PassengerJourneys(ctx context.Context, req *proto.PassengerJourneysRequest) (*proto.PassengerJourneysResponse, error) { log.Debug(). Str("departure date", req.DepartureDate.String()). @@ -148,7 +148,7 @@ func (s *CarpoolServiceServerImpl) PassengerJourneys(ctx context.Context, req *p var distance *int64 if len(j.Itinerary.Legs) > 2 { duration = j.Itinerary.Legs[1].Duration - dist := j.Itinerary.Legs[1].Distance + dist := int64(j.Itinerary.Legs[1].Distance) distance = &dist } @@ -183,9 +183,11 @@ func (s *CarpoolServiceServerImpl) PassengerJourneys(ctx context.Context, req *p PassengerJourneys: results, }, nil } + func (s *CarpoolServiceServerImpl) DriverRegularTrips(context.Context, *proto.DriverRegularTripsRequest) (*proto.DriverRegularTripsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DriverRegularTrips not implemented") } + func (s *CarpoolServiceServerImpl) PassengerRegularTrips(context.Context, *proto.PassengerRegularTripsRequest) (*proto.PassengerRegularTripsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PassengerRegularTrips not implemented") }