refactoring fmt + moving utils

2023-10-20 13:47:51 +02:00
parent 6696cd3152
commit b7bba4cdaa
25 changed files with 71 additions and 91 deletions
--- a/interoperability/solidarity-api/server/openapi/helpers.go
+++ b/interoperability/solidarity-api/server/openapi/helpers.go
@@ -15,7 +15,7 @@ import (

 // Response return a ImplResponse struct filled
 func Response(code int, body interface{}) ImplResponse {
-	return ImplResponse {
+	return ImplResponse{
 		Code: code,
 		Body: body,
 	}
--- a/interoperability/solidarity-api/server/openapi/model__passenger_post_400_response.go
+++ b/interoperability/solidarity-api/server/openapi/model__passenger_post_400_response.go
@@ -9,11 +9,7 @@

 package openapi

-
-
-
 type PassengerPost400Response struct {
-
 	Error string `json:"error,omitempty"`
 }

--- a/interoperability/solidarity-api/server/openapi/model_booking_request.go
+++ b/interoperability/solidarity-api/server/openapi/model_booking_request.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type BookingRequest struct {

 	// Booking id is common between both operators, and must be created as a [UUID](https://datatracker.ietf.org/doc/html/rfc4122) by whoever initiates the booking.  Usage of a [4 UUID](https://datatracker.ietf.org/doc/html/rfc4122#section-4.4) generation algorithm is advised.
@@ -29,11 +26,11 @@ type BookingRequest struct {
 // AssertBookingRequestRequired checks if the required fields are not zero-ed
 func AssertBookingRequestRequired(obj BookingRequest) error {
 	elements := map[string]interface{}{
-		"id": obj.Id,
+		"id":          obj.Id,
 		"passengerId": obj.PassengerId,
-		"driverId": obj.DriverId,
-		"status": obj.Status,
-		"operator": obj.Operator,
+		"driverId":    obj.DriverId,
+		"status":      obj.Status,
+		"operator":    obj.Operator,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_booking_status.go
+++ b/interoperability/solidarity-api/server/openapi/model_booking_status.go
@@ -9,19 +9,17 @@

 package openapi

-
-
 // BookingStatus : Status of the booking.
 type BookingStatus string

 // List of BookingStatus
 const (
-	WAITING_DRIVER_CONFIRMATION BookingStatus = "WAITING_DRIVER_CONFIRMATION"
+	WAITING_DRIVER_CONFIRMATION    BookingStatus = "WAITING_DRIVER_CONFIRMATION"
 	WAITING_PASSENGER_CONFIRMATION BookingStatus = "WAITING_PASSENGER_CONFIRMATION"
-	CONFIRMED BookingStatus = "CONFIRMED"
-	CANCELLED BookingStatus = "CANCELLED"
-	COMPLETED_PENDING_VALIDATION BookingStatus = "COMPLETED_PENDING_VALIDATION"
-	VALIDATED BookingStatus = "VALIDATED"
+	CONFIRMED                      BookingStatus = "CONFIRMED"
+	CANCELLED                      BookingStatus = "CANCELLED"
+	COMPLETED_PENDING_VALIDATION   BookingStatus = "COMPLETED_PENDING_VALIDATION"
+	VALIDATED                      BookingStatus = "VALIDATED"
 )

 // AssertBookingStatusRequired checks if the required fields are not zero-ed
--- a/interoperability/solidarity-api/server/openapi/model_car.go
+++ b/interoperability/solidarity-api/server/openapi/model_car.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type Car struct {

 	// Model of the car.
--- a/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go
+++ b/interoperability/solidarity-api/server/openapi/model_driver_punctual_availabilities_request.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type DriverPunctualAvailabilitiesRequest struct {

 	// The address or location description.
@@ -38,12 +35,12 @@ type DriverPunctualAvailabilitiesRequest struct {
 // AssertDriverPunctualAvailabilitiesRequestRequired checks if the required fields are not zero-ed
 func AssertDriverPunctualAvailabilitiesRequestRequired(obj DriverPunctualAvailabilitiesRequest) error {
 	elements := map[string]interface{}{
-		"address": obj.Address,
-		"latitude": obj.Latitude,
-		"longitude": obj.Longitude,
-		"radius": obj.Radius,
+		"address":        obj.Address,
+		"latitude":       obj.Latitude,
+		"longitude":      obj.Longitude,
+		"radius":         obj.Radius,
 		"availabilities": obj.Availabilities,
-		"user": obj.User,
+		"user":           obj.User,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_driver_regular_availabilities_request.go
+++ b/interoperability/solidarity-api/server/openapi/model_driver_regular_availabilities_request.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type DriverRegularAvailabilitiesRequest struct {

 	// The address or location description.
@@ -38,12 +35,12 @@ type DriverRegularAvailabilitiesRequest struct {
 // AssertDriverRegularAvailabilitiesRequestRequired checks if the required fields are not zero-ed
 func AssertDriverRegularAvailabilitiesRequestRequired(obj DriverRegularAvailabilitiesRequest) error {
 	elements := map[string]interface{}{
-		"address": obj.Address,
-		"latitude": obj.Latitude,
-		"longitude": obj.Longitude,
-		"radius": obj.Radius,
+		"address":        obj.Address,
+		"latitude":       obj.Latitude,
+		"longitude":      obj.Longitude,
+		"radius":         obj.Radius,
 		"availabilities": obj.Availabilities,
-		"user": obj.User,
+		"user":           obj.User,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_driver_trip.go
+++ b/interoperability/solidarity-api/server/openapi/model_driver_trip.go
@@ -9,11 +9,7 @@

 package openapi

-
-
-
 type DriverTrip struct {
-
 	User User `json:"user"`

 	Car Car `json:"car,omitempty"`
--- a/interoperability/solidarity-api/server/openapi/model_get_bookings_404_response.go
+++ b/interoperability/solidarity-api/server/openapi/model_get_bookings_404_response.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type GetBookings404Response struct {

 	// Explain why the request couldn't be processed.
--- a/interoperability/solidarity-api/server/openapi/model_journey_schedule.go
+++ b/interoperability/solidarity-api/server/openapi/model_journey_schedule.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type JourneySchedule struct {

 	// Passenger pickup datetime as a UNIX UTC timestamp in seconds.
@@ -28,7 +25,7 @@ type JourneySchedule struct {
 func AssertJourneyScheduleRequired(obj JourneySchedule) error {
 	elements := map[string]interface{}{
 		"passengerPickupDate": obj.PassengerPickupDate,
-		"type": obj.Type,
+		"type":                obj.Type,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_passenger_trip_request.go
+++ b/interoperability/solidarity-api/server/openapi/model_passenger_trip_request.go
@@ -9,11 +9,7 @@

 package openapi

-
-
-
 type PassengerTripRequest struct {
-
 	User User `json:"user"`

 	DestinationAddress string `json:"destination_address"`
@@ -37,14 +33,14 @@ type PassengerTripRequest struct {
 // AssertPassengerTripRequestRequired checks if the required fields are not zero-ed
 func AssertPassengerTripRequestRequired(obj PassengerTripRequest) error {
 	elements := map[string]interface{}{
-		"user": obj.User,
-		"destination_address": obj.DestinationAddress,
-		"destination_latitude": obj.DestinationLatitude,
+		"user":                  obj.User,
+		"destination_address":   obj.DestinationAddress,
+		"destination_latitude":  obj.DestinationLatitude,
 		"destination_longitude": obj.DestinationLongitude,
-		"departure_address": obj.DepartureAddress,
-		"departure_latitude": obj.DepartureLatitude,
-		"departure_longitude": obj.DepartureLongitude,
-		"departure_date": obj.DepartureDate,
+		"departure_address":     obj.DepartureAddress,
+		"departure_latitude":    obj.DepartureLatitude,
+		"departure_longitude":   obj.DepartureLongitude,
+		"departure_date":        obj.DepartureDate,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_post_connections_request.go
+++ b/interoperability/solidarity-api/server/openapi/model_post_connections_request.go
@@ -9,11 +9,7 @@

 package openapi

-
-
-
 type PostConnectionsRequest struct {
-
 	From User `json:"from"`

 	To User `json:"to"`
@@ -37,9 +33,9 @@ type PostConnectionsRequest struct {
 // AssertPostConnectionsRequestRequired checks if the required fields are not zero-ed
 func AssertPostConnectionsRequestRequired(obj PostConnectionsRequest) error {
 	elements := map[string]interface{}{
-		"from": obj.From,
-		"to": obj.To,
-		"message": obj.Message,
+		"from":                   obj.From,
+		"to":                     obj.To,
+		"message":                obj.Message,
 		"recipientCarpoolerType": obj.RecipientCarpoolerType,
 	}
 	for name, el := range elements {
--- a/interoperability/solidarity-api/server/openapi/model_preferences.go
+++ b/interoperability/solidarity-api/server/openapi/model_preferences.go
@@ -9,13 +9,10 @@

 package openapi

-
 import (
 	"errors"
 )

-
-
 type Preferences struct {

 	// If driver journey, specifies if the driver allows smoking in the car.
--- a/interoperability/solidarity-api/server/openapi/model_price.go
+++ b/interoperability/solidarity-api/server/openapi/model_price.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type Price struct {

 	// Either « FREE », « PAYING » or « UNKNOWN ». « UNKNOWN » is given when it should be « PAYING » but we cannot set the price yet.
--- a/interoperability/solidarity-api/server/openapi/model_punctual_availability_slot.go
+++ b/interoperability/solidarity-api/server/openapi/model_punctual_availability_slot.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type PunctualAvailabilitySlot struct {

 	// UNIX UTC timestamp in seconds.
@@ -27,9 +24,9 @@ type PunctualAvailabilitySlot struct {
 // AssertPunctualAvailabilitySlotRequired checks if the required fields are not zero-ed
 func AssertPunctualAvailabilitySlotRequired(obj PunctualAvailabilitySlot) error {
 	elements := map[string]interface{}{
-		"date": obj.Date,
+		"date":      obj.Date,
 		"startTime": obj.StartTime,
-		"endTime": obj.EndTime,
+		"endTime":   obj.EndTime,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_regular_availability_slot.go
+++ b/interoperability/solidarity-api/server/openapi/model_regular_availability_slot.go
@@ -9,9 +9,6 @@

 package openapi

-
-
-
 type RegularAvailabilitySlot struct {

 	// Day of the week for regular scheduling.
@@ -29,7 +26,7 @@ func AssertRegularAvailabilitySlotRequired(obj RegularAvailabilitySlot) error {
 	elements := map[string]interface{}{
 		"dayOfWeek": obj.DayOfWeek,
 		"startTime": obj.StartTime,
-		"endTime": obj.EndTime,
+		"endTime":   obj.EndTime,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/model_user.go
+++ b/interoperability/solidarity-api/server/openapi/model_user.go
@@ -9,13 +9,10 @@

 package openapi

-
 import (
 	"errors"
 )

-
-
 type User struct {

 	// User's identifier. It MUST be unique for a given `operator`.
@@ -49,9 +46,9 @@ type User struct {
 // AssertUserRequired checks if the required fields are not zero-ed
 func AssertUserRequired(obj User) error {
 	elements := map[string]interface{}{
-		"id": obj.Id,
+		"id":       obj.Id,
 		"operator": obj.Operator,
-		"alias": obj.Alias,
+		"alias":    obj.Alias,
 	}
 	for name, el := range elements {
 		if isZero := IsZeroValue(el); isZero {
--- a/interoperability/solidarity-api/server/openapi/routers.go
+++ b/interoperability/solidarity-api/server/openapi/routers.go
@@ -23,8 +23,8 @@ import (

 // A Route defines the parameters for an api endpoint
 type Route struct {
-	Method	  string
-	Pattern	 string
+	Method      string
+	Pattern     string
 	HandlerFunc http.HandlerFunc
 }