From fafa58daf136722b5718d05e4eac22ebd065184c Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Wed, 29 Mar 2023 13:32:21 +0200 Subject: [PATCH] update proto --- .../grpc/proto/carpool-service-types.pb.go | 7 +- .../grpc/proto/carpool-service-types.proto | 2 +- servers/grpc/proto/carpool-service.pb.go | 106 +++++++++--------- 3 files changed, 58 insertions(+), 57 deletions(-) diff --git a/servers/grpc/proto/carpool-service-types.pb.go b/servers/grpc/proto/carpool-service-types.pb.go index 48d47ee..1d20bbb 100644 --- a/servers/grpc/proto/carpool-service-types.pb.go +++ b/servers/grpc/proto/carpool-service-types.pb.go @@ -2436,11 +2436,12 @@ var file_carpool_service_types_proto_rawDesc = []byte{ 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x03, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x04, 0x12, 0x0d, 0x0a, 0x09, 0x56, 0x41, 0x4c, - 0x49, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x05, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x2e, + 0x49, 0x44, 0x41, 0x54, 0x45, 0x44, 0x10, 0x05, 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, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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 ( diff --git a/servers/grpc/proto/carpool-service-types.proto b/servers/grpc/proto/carpool-service-types.proto index f9514e6..254de07 100644 --- a/servers/grpc/proto/carpool-service-types.proto +++ b/servers/grpc/proto/carpool-service-types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "git.coopgo.io/coopgo-platform/carpool-service/grpc/proto"; +option go_package = "git.coopgo.io/coopgo-platform/carpool-service/servers/grpc/proto"; // import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; diff --git a/servers/grpc/proto/carpool-service.pb.go b/servers/grpc/proto/carpool-service.pb.go index 1ec3aec..d54296b 100644 --- a/servers/grpc/proto/carpool-service.pb.go +++ b/servers/grpc/proto/carpool-service.pb.go @@ -7,7 +7,6 @@ package proto import ( - proto "git.coopgo.io/coopgo-platform/carpool-service/grpc/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" @@ -28,7 +27,7 @@ type CreateRegularRoutesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Routes []*proto.CarpoolFeatureCollection `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` + Routes []*CarpoolFeatureCollection `protobuf:"bytes,1,rep,name=routes,proto3" json:"routes,omitempty"` } func (x *CreateRegularRoutesRequest) Reset() { @@ -63,7 +62,7 @@ func (*CreateRegularRoutesRequest) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{0} } -func (x *CreateRegularRoutesRequest) GetRoutes() []*proto.CarpoolFeatureCollection { +func (x *CreateRegularRoutesRequest) GetRoutes() []*CarpoolFeatureCollection { if x != nil { return x.Routes } @@ -261,7 +260,7 @@ type GetUserPlanningResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RoutesByDates map[string]*proto.CarpoolRoutesCollection `protobuf:"bytes,1,rep,name=routes_by_dates,json=routesByDates,proto3" json:"routes_by_dates,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + RoutesByDates map[string]*CarpoolRoutesCollection `protobuf:"bytes,1,rep,name=routes_by_dates,json=routesByDates,proto3" json:"routes_by_dates,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *GetUserPlanningResponse) Reset() { @@ -296,7 +295,7 @@ func (*GetUserPlanningResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{5} } -func (x *GetUserPlanningResponse) GetRoutesByDates() map[string]*proto.CarpoolRoutesCollection { +func (x *GetUserPlanningResponse) GetRoutesByDates() map[string]*CarpoolRoutesCollection { if x != nil { return x.RoutesByDates } @@ -420,7 +419,7 @@ type DriverJourneysResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DriverJourneys []*proto.CarpoolServiceDriverJourney `protobuf:"bytes,1,rep,name=driver_journeys,json=driverJourneys,proto3" json:"driver_journeys,omitempty"` + DriverJourneys []*CarpoolServiceDriverJourney `protobuf:"bytes,1,rep,name=driver_journeys,json=driverJourneys,proto3" json:"driver_journeys,omitempty"` } func (x *DriverJourneysResponse) Reset() { @@ -455,7 +454,7 @@ func (*DriverJourneysResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{7} } -func (x *DriverJourneysResponse) GetDriverJourneys() []*proto.CarpoolServiceDriverJourney { +func (x *DriverJourneysResponse) GetDriverJourneys() []*CarpoolServiceDriverJourney { if x != nil { return x.DriverJourneys } @@ -578,7 +577,7 @@ type PassengerJourneysResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - PassengerJourneys []*proto.CarpoolServicePassengerJourney `protobuf:"bytes,1,rep,name=passenger_journeys,json=passengerJourneys,proto3" json:"passenger_journeys,omitempty"` + PassengerJourneys []*CarpoolServicePassengerJourney `protobuf:"bytes,1,rep,name=passenger_journeys,json=passengerJourneys,proto3" json:"passenger_journeys,omitempty"` } func (x *PassengerJourneysResponse) Reset() { @@ -613,7 +612,7 @@ func (*PassengerJourneysResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{9} } -func (x *PassengerJourneysResponse) GetPassengerJourneys() []*proto.CarpoolServicePassengerJourney { +func (x *PassengerJourneysResponse) GetPassengerJourneys() []*CarpoolServicePassengerJourney { if x != nil { return x.PassengerJourneys } @@ -760,7 +759,7 @@ type DriverRegularTripsResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DriverRegularTrips []*proto.CarpoolServiceDriverRegularTrip `protobuf:"bytes,1,rep,name=driver_regular_trips,json=driverRegularTrips,proto3" json:"driver_regular_trips,omitempty"` + DriverRegularTrips []*CarpoolServiceDriverRegularTrip `protobuf:"bytes,1,rep,name=driver_regular_trips,json=driverRegularTrips,proto3" json:"driver_regular_trips,omitempty"` } func (x *DriverRegularTripsResponse) Reset() { @@ -795,7 +794,7 @@ func (*DriverRegularTripsResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{11} } -func (x *DriverRegularTripsResponse) GetDriverRegularTrips() []*proto.CarpoolServiceDriverRegularTrip { +func (x *DriverRegularTripsResponse) GetDriverRegularTrips() []*CarpoolServiceDriverRegularTrip { if x != nil { return x.DriverRegularTrips } @@ -942,7 +941,7 @@ type PassengerRegularTripsResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DriverRegularTrips []*proto.CarpoolServiceDriverRegularTrip `protobuf:"bytes,1,rep,name=driver_regular_trips,json=driverRegularTrips,proto3" json:"driver_regular_trips,omitempty"` + DriverRegularTrips []*CarpoolServiceDriverRegularTrip `protobuf:"bytes,1,rep,name=driver_regular_trips,json=driverRegularTrips,proto3" json:"driver_regular_trips,omitempty"` } func (x *PassengerRegularTripsResponse) Reset() { @@ -977,7 +976,7 @@ func (*PassengerRegularTripsResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{13} } -func (x *PassengerRegularTripsResponse) GetDriverRegularTrips() []*proto.CarpoolServiceDriverRegularTrip { +func (x *PassengerRegularTripsResponse) GetDriverRegularTrips() []*CarpoolServiceDriverRegularTrip { if x != nil { return x.DriverRegularTrips } @@ -989,7 +988,7 @@ type CreateBookingRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Booking *proto.CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` + Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } func (x *CreateBookingRequest) Reset() { @@ -1024,7 +1023,7 @@ func (*CreateBookingRequest) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{14} } -func (x *CreateBookingRequest) GetBooking() *proto.CarpoolServiceBooking { +func (x *CreateBookingRequest) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } @@ -1036,7 +1035,7 @@ type CreateBookingResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Booking *proto.CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` + Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } func (x *CreateBookingResponse) Reset() { @@ -1071,7 +1070,7 @@ func (*CreateBookingResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{15} } -func (x *CreateBookingResponse) GetBooking() *proto.CarpoolServiceBooking { +func (x *CreateBookingResponse) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } @@ -1083,9 +1082,9 @@ type UpdateBookingRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BookingId string `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"` - Status proto.CarpoolServiceBookingStatus `protobuf:"varint,2,opt,name=status,proto3,enum=CarpoolServiceBookingStatus" json:"status,omitempty"` - Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` + BookingId string `protobuf:"bytes,1,opt,name=booking_id,json=bookingId,proto3" json:"booking_id,omitempty"` + Status CarpoolServiceBookingStatus `protobuf:"varint,2,opt,name=status,proto3,enum=CarpoolServiceBookingStatus" json:"status,omitempty"` + Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` } func (x *UpdateBookingRequest) Reset() { @@ -1127,11 +1126,11 @@ func (x *UpdateBookingRequest) GetBookingId() string { return "" } -func (x *UpdateBookingRequest) GetStatus() proto.CarpoolServiceBookingStatus { +func (x *UpdateBookingRequest) GetStatus() CarpoolServiceBookingStatus { if x != nil { return x.Status } - return proto.CarpoolServiceBookingStatus(0) + return CarpoolServiceBookingStatus_INITIATED } func (x *UpdateBookingRequest) GetMessage() string { @@ -1231,7 +1230,7 @@ type GetBookingResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Booking *proto.CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` + Booking *CarpoolServiceBooking `protobuf:"bytes,1,opt,name=booking,proto3" json:"booking,omitempty"` } func (x *GetBookingResponse) Reset() { @@ -1266,7 +1265,7 @@ func (*GetBookingResponse) Descriptor() ([]byte, []int) { return file_carpool_service_proto_rawDescGZIP(), []int{19} } -func (x *GetBookingResponse) GetBooking() *proto.CarpoolServiceBooking { +func (x *GetBookingResponse) GetBooking() *CarpoolServiceBooking { if x != nil { return x.Booking } @@ -1557,35 +1556,35 @@ func file_carpool_service_proto_rawDescGZIP() []byte { var file_carpool_service_proto_msgTypes = make([]protoimpl.MessageInfo, 21) var file_carpool_service_proto_goTypes = []interface{}{ - (*CreateRegularRoutesRequest)(nil), // 0: CreateRegularRoutesRequest - (*CreateRegularRoutesResponse)(nil), // 1: CreateRegularRoutesResponse - (*DeleteRegularRoutesRequest)(nil), // 2: DeleteRegularRoutesRequest - (*DeleteRegularRoutesResponse)(nil), // 3: DeleteRegularRoutesResponse - (*GetUserPlanningRequest)(nil), // 4: GetUserPlanningRequest - (*GetUserPlanningResponse)(nil), // 5: GetUserPlanningResponse - (*DriverJourneysRequest)(nil), // 6: DriverJourneysRequest - (*DriverJourneysResponse)(nil), // 7: DriverJourneysResponse - (*PassengerJourneysRequest)(nil), // 8: PassengerJourneysRequest - (*PassengerJourneysResponse)(nil), // 9: PassengerJourneysResponse - (*DriverRegularTripsRequest)(nil), // 10: DriverRegularTripsRequest - (*DriverRegularTripsResponse)(nil), // 11: DriverRegularTripsResponse - (*PassengerRegularTripsRequest)(nil), // 12: PassengerRegularTripsRequest - (*PassengerRegularTripsResponse)(nil), // 13: PassengerRegularTripsResponse - (*CreateBookingRequest)(nil), // 14: CreateBookingRequest - (*CreateBookingResponse)(nil), // 15: CreateBookingResponse - (*UpdateBookingRequest)(nil), // 16: UpdateBookingRequest - (*UpdateBookingResponse)(nil), // 17: UpdateBookingResponse - (*GetBookingRequest)(nil), // 18: GetBookingRequest - (*GetBookingResponse)(nil), // 19: GetBookingResponse - nil, // 20: GetUserPlanningResponse.RoutesByDatesEntry - (*proto.CarpoolFeatureCollection)(nil), // 21: CarpoolFeatureCollection - (*timestamppb.Timestamp)(nil), // 22: google.protobuf.Timestamp - (*proto.CarpoolServiceDriverJourney)(nil), // 23: CarpoolServiceDriverJourney - (*proto.CarpoolServicePassengerJourney)(nil), // 24: CarpoolServicePassengerJourney - (*proto.CarpoolServiceDriverRegularTrip)(nil), // 25: CarpoolServiceDriverRegularTrip - (*proto.CarpoolServiceBooking)(nil), // 26: CarpoolServiceBooking - (proto.CarpoolServiceBookingStatus)(0), // 27: CarpoolServiceBookingStatus - (*proto.CarpoolRoutesCollection)(nil), // 28: CarpoolRoutesCollection + (*CreateRegularRoutesRequest)(nil), // 0: CreateRegularRoutesRequest + (*CreateRegularRoutesResponse)(nil), // 1: CreateRegularRoutesResponse + (*DeleteRegularRoutesRequest)(nil), // 2: DeleteRegularRoutesRequest + (*DeleteRegularRoutesResponse)(nil), // 3: DeleteRegularRoutesResponse + (*GetUserPlanningRequest)(nil), // 4: GetUserPlanningRequest + (*GetUserPlanningResponse)(nil), // 5: GetUserPlanningResponse + (*DriverJourneysRequest)(nil), // 6: DriverJourneysRequest + (*DriverJourneysResponse)(nil), // 7: DriverJourneysResponse + (*PassengerJourneysRequest)(nil), // 8: PassengerJourneysRequest + (*PassengerJourneysResponse)(nil), // 9: PassengerJourneysResponse + (*DriverRegularTripsRequest)(nil), // 10: DriverRegularTripsRequest + (*DriverRegularTripsResponse)(nil), // 11: DriverRegularTripsResponse + (*PassengerRegularTripsRequest)(nil), // 12: PassengerRegularTripsRequest + (*PassengerRegularTripsResponse)(nil), // 13: PassengerRegularTripsResponse + (*CreateBookingRequest)(nil), // 14: CreateBookingRequest + (*CreateBookingResponse)(nil), // 15: CreateBookingResponse + (*UpdateBookingRequest)(nil), // 16: UpdateBookingRequest + (*UpdateBookingResponse)(nil), // 17: UpdateBookingResponse + (*GetBookingRequest)(nil), // 18: GetBookingRequest + (*GetBookingResponse)(nil), // 19: GetBookingResponse + nil, // 20: GetUserPlanningResponse.RoutesByDatesEntry + (*CarpoolFeatureCollection)(nil), // 21: CarpoolFeatureCollection + (*timestamppb.Timestamp)(nil), // 22: google.protobuf.Timestamp + (*CarpoolServiceDriverJourney)(nil), // 23: CarpoolServiceDriverJourney + (*CarpoolServicePassengerJourney)(nil), // 24: CarpoolServicePassengerJourney + (*CarpoolServiceDriverRegularTrip)(nil), // 25: CarpoolServiceDriverRegularTrip + (*CarpoolServiceBooking)(nil), // 26: CarpoolServiceBooking + (CarpoolServiceBookingStatus)(0), // 27: CarpoolServiceBookingStatus + (*CarpoolRoutesCollection)(nil), // 28: CarpoolRoutesCollection } var file_carpool_service_proto_depIdxs = []int32{ 21, // 0: CreateRegularRoutesRequest.routes:type_name -> CarpoolFeatureCollection @@ -1639,6 +1638,7 @@ func file_carpool_service_proto_init() { if File_carpool_service_proto != nil { return } + file_carpool_service_types_proto_init() if !protoimpl.UnsafeEnabled { file_carpool_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateRegularRoutesRequest); i {