coopgo-platform/solidarity-transport
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add driver exclusion by group id
All checks were successful
Build and Push Docker Image / build_and_push (push) Successful in 1m56s
Details

Browse Source
This commit is contained in:
Arnaud Delcasse
2026-01-14 10:36:02 +01:00
parent 606b84a60a
commit 8875adbcbb
6 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
servers/grpc/proto/gen/solidarity-transport.pb.go
View File

@@ -392,14 +392,15 @@ func (*DeleteDriverRegularAvailabilityResponse) Descriptor() ([]byte, []int) {
}
type GetDriverJourneysRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
Departure *GeoJsonFeature `protobuf:"bytes,1,opt,name=departure,proto3" json:"departure,omitempty"`
Arrival *GeoJsonFeature `protobuf:"bytes,3,opt,name=arrival,proto3" json:"arrival,omitempty"`
DepartureDate *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=departure_date,json=departureDate,proto3" json:"departure_date,omitempty"`
TimeDelta *int64 `protobuf:"varint,6,opt,name=time_delta,json=timeDelta,proto3,oneof" json:"time_delta,omitempty"`
Noreturn bool `protobuf:"varint,7,opt,name=noreturn,proto3" json:"noreturn,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
state protoimpl.MessageState `protogen:"open.v1"`
Departure *GeoJsonFeature `protobuf:"bytes,1,opt,name=departure,proto3" json:"departure,omitempty"`
Arrival *GeoJsonFeature `protobuf:"bytes,3,opt,name=arrival,proto3" json:"arrival,omitempty"`
DepartureDate *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=departure_date,json=departureDate,proto3" json:"departure_date,omitempty"`
TimeDelta *int64 `protobuf:"varint,6,opt,name=time_delta,json=timeDelta,proto3,oneof" json:"time_delta,omitempty"`
Noreturn bool `protobuf:"varint,7,opt,name=noreturn,proto3" json:"noreturn,omitempty"`
ExcludeGroupId *string `protobuf:"bytes,8,opt,name=exclude_group_id,json=excludeGroupId,proto3,oneof" json:"exclude_group_id,omitempty"` // Exclude drivers who have bookings in this group
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *GetDriverJourneysRequest) Reset() {
@@ -467,6 +468,13 @@ func (x *GetDriverJourneysRequest) GetNoreturn() bool {
return false
}
func (x *GetDriverJourneysRequest) GetExcludeGroupId() string {
if x != nil && x.ExcludeGroupId != nil {
return *x.ExcludeGroupId
}
return ""
}
type GetDriverJourneysResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
DriverJourneys []*SolidarityTransportDriverJourney `protobuf:"bytes,1,rep,name=driver_journeys,json=driverJourneys,proto3" json:"driver_journeys,omitempty"`
@@ -1254,15 +1262,17 @@ const file_solidarity_transport_proto_rawDesc = "" +
"&DeleteDriverRegularAvailabilityRequest\x12\x1b\n" +
"\tdriver_id\x18\x01 \x01(\tR\bdriverId\x12'\n" +
"\x0favailability_id\x18\x02 \x01(\tR\x0eavailabilityId\")\n" +
"'DeleteDriverRegularAvailabilityResponse\"\x86\x02\n" +
"'DeleteDriverRegularAvailabilityResponse\"\xca\x02\n" +
"\x18GetDriverJourneysRequest\x12-\n" +
"\tdeparture\x18\x01 \x01(\v2\x0f.GeoJsonFeatureR\tdeparture\x12)\n" +
"\aarrival\x18\x03 \x01(\v2\x0f.GeoJsonFeatureR\aarrival\x12A\n" +
"\x0edeparture_date\x18\x05 \x01(\v2\x1a.google.protobuf.TimestampR\rdepartureDate\x12\"\n" +
"\n" +
"time_delta\x18\x06 \x01(\x03H\x00R\ttimeDelta\x88\x01\x01\x12\x1a\n" +
"\bnoreturn\x18\a \x01(\bR\bnoreturnB\r\n" +
"\v_time_delta\"g\n" +
"\bnoreturn\x18\a \x01(\bR\bnoreturn\x12-\n" +
"\x10exclude_group_id\x18\b \x01(\tH\x01R\x0eexcludeGroupId\x88\x01\x01B\r\n" +
"\v_time_deltaB\x13\n" +
"\x11_exclude_group_id\"g\n" +
"\x19GetDriverJourneysResponse\x12J\n" +
"\x0fdriver_journeys\x18\x01 \x03(\v2!.SolidarityTransportDriverJourneyR\x0edriverJourneys\"U\n" +
"\x17GetDriverJourneyRequest\x12\x1b\n" +

1
servers/grpc/proto/solidarity-transport.proto
View File

@@ -65,6 +65,7 @@ message GetDriverJourneysRequest {
google.protobuf.Timestamp departure_date = 5;
optional int64 time_delta = 6;
bool noreturn = 7;
optional string exclude_group_id = 8; // Exclude drivers who have bookings in this group
}
message GetDriverJourneysResponse {