refactoring

This commit is contained in:
2023-12-08 07:31:41 +01:00
parent d12c55d740
commit 150c913feb
19 changed files with 1175 additions and 814 deletions

View File

@@ -25,10 +25,7 @@ func (s *SolidarityServiceHandler) GetDriver(ctx context.Context, id string) (dr
func (s *SolidarityServiceHandler) SetDriverAvailabilities(ctx context.Context, driver internal.Driver) (err error) {
driver.Driver.Operator = "internal-grpc"
err = s.Storage.CreateDriver(driver)
if err != nil {
return err
}
return nil
return err
}
func (s *SolidarityServiceHandler) SetPassengerTrip(ctx context.Context, passenger internal.Passenger) (err error) {
@@ -65,20 +62,12 @@ func (s *SolidarityServiceHandler) UpdateBooking(ctx context.Context, bookingId
return nil
}
func (s *SolidarityServiceHandler) GetBooking(ctx context.Context, bookingId string) (booking internal.Booking, passenger internal.Passenger, driver internal.Driver, err error) {
func (s *SolidarityServiceHandler) GetBooking(ctx context.Context, bookingId string) (booking internal.Booking, err error) {
booking, err = s.Storage.GetBooking(bookingId)
if err != nil {
return internal.Booking{}, internal.Passenger{}, internal.Driver{}, err
return internal.Booking{}, err
}
passenger, err = s.Storage.GetPassenger(booking.Passenger.ID)
if err != nil {
return internal.Booking{}, internal.Passenger{}, internal.Driver{}, err
}
driver, err = s.Storage.GetDriver(booking.Driver.ID)
if err != nil {
return internal.Booking{}, internal.Passenger{}, internal.Driver{}, err
}
return booking, passenger, driver, nil
return booking, nil
}
func (s *SolidarityServiceHandler) GetBookingsByStatus(ctx context.Context, status string, filterType string, id string) (bookings []internal.Booking, err error) {