handlers/application/beneficiaries.go

@@ -28,8 +28,6 @@ import (
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
-
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -327,25 +325,10 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		organizations = append(organizations, o.ToStorageType())
 	}
 
-
-	solidarity_booking := &solidarity_service.GetBookingsByStatusRequest{
-		Status : 0,   /// 0 : pending
-		UserId : beneficiaryID,
-		Type: 1,      /// 1 : passenger
-	}
-
-	solidarity_bookings_list, err := h.services.GRPC.SolidarityService.GetBookingsByStatus(context.TODO(), solidarity_booking)
-
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
 	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list, solidarity_bookings_list)
+	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list)
 }
 
 func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request) {

handlers/application/solidarity_service.go

@@ -9,26 +9,12 @@ import (
 	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 	"github.com/google/uuid"
 	geojson "github.com/paulmach/go.geojson"
-	"google.golang.org/protobuf/types/known/emptypb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-var BookingData Booking
-
-type Booking struct {
-	bookingData  solidarity_service.CreateBookingSolidarityRequest 
-} 
-
 func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Request) {
 
-	parcourmobAccounts, err := h.beneficiaries(r)
+	accounts, err := h.beneficiaries(r)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	accounts, err := h.services.GRPC.SolidarityService.GetAllPassengers(context.TODO(), &emptypb.Empty{})
 		if err != nil {
 			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
@@ -37,26 +23,19 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 
 	cacheid := uuid.NewString()
 	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
-	h.cache.PutWithTTL(cacheid, parcourmobAccounts, 1*time.Hour)
 
+	bookingData := solidarity_service.CreateBookingSolidarityRequest {
+	}
 
-	if r.Method == "GET" && r.FormValue("date") != ""{
+	if r.Method == "GET" {
 				
 		DepartureAddress := r.FormValue("departure");
 		DestinationAddress := r.FormValue("destination");
 		PickupDate := r.FormValue("date");
-		PassengerId := r.FormValue("passenger_id")
 		
 		layout := "2006-01-02T15:04"
-
 		dateParsed, err := time.Parse(layout, PickupDate)
 
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
 		var (
 			departuregeo   *geojson.Feature
 			destinationgeo *geojson.Feature
@@ -84,7 +63,7 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 			}
 		}
 
-		request := solidarity_service.DriverJourneysRequest{
+		request := &solidarity_service.DriverJourneysRequest{
 			DepartureDate: timestamp,
 			Departure: &solidarity_service.Feature{
 				Lat:     departuregeo.Geometry.Point[0],
@@ -93,18 +72,14 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 			},
 		}
 
-		drivers, err := h.services.GRPC.SolidarityService.DriverJourneys(context.TODO(), &request)
+		drivers, err := h.services.GRPC.SolidarityService.DriverJourneys(context.TODO(), request)
 
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
 
-		BookingData.bookingData = solidarity_service.CreateBookingSolidarityRequest {
+		bookingData = solidarity_service.CreateBookingSolidarityRequest {
 			Booking : &solidarity_service.BookingSolidarityRequest {
 			
-			PassengerId: PassengerId,
+			PassengerId: r.FormValue("passenger_id"),
+			DriverId: r.FormValue("driver_id"),
 			DepartureAddress: &solidarity_service.Feature{
 				Lat:     departuregeo.Geometry.Point[0],
 				Long:    departuregeo.Geometry.Point[1],
@@ -119,34 +94,30 @@ func (h *ApplicationHandler) DriversJourney(w http.ResponseWriter, r *http.Reque
 		},
 		}
 
-		fmt.Println(BookingData.bookingData, "booking")
-
-		h.Renderer.SolidarityServiceListAvailableDrivers(w, r, drivers, &BookingData.bookingData, accounts, parcourmobAccounts, cacheid)
-
-	} else if r.Method == "POST" {
-
-		driverId := r.FormValue("driver_id")
-		id := uuid.New().String()
-
-
-		BookingData.bookingData.Booking.DriverId = driverId
-		BookingData.bookingData.Booking.Id = id
-
-		fmt.Println(BookingData.bookingData, "booking")
-
-		booking, err := h.services.GRPC.SolidarityService.CreateBookingSolidarity(context.TODO(), &BookingData.bookingData)
-
 		if err != nil {
 			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 		
-		h.Renderer.SolidarityServiceBooking(w, r, booking, parcourmobAccounts)
+		h.Renderer.SolidarityServiceListAvailableDrivers(w, r, drivers, &bookingData, accounts, cacheid)
 
-	}else {	
+	} else {	
 
-		h.Renderer.SolidarityService(w, r, accounts, parcourmobAccounts, cacheid)
+		h.Renderer.SolidarityService(w, r, accounts, cacheid)
 	}
+	// if r.Method == "POST" {
+
+	// 	booking, err := h.services.GRPC.SolidarityService.CreateBookingSolidarity(context.TODO(), &bookingData)
+
+	// 	if err != nil {
+	// 		fmt.Println(err)
+	// 		w.WriteHeader(http.StatusInternalServerError)
+	// 		return
+	// 	}
+
+	// 	h.Renderer.SolidarityServiceBooking(w, r, booking )
+
+	// }
 
 }

renderer/beneficiaries.go

@@ -7,7 +7,6 @@ import (
 
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-
 )
 
 const beneficiariesMenu = "beneficiaries"
@@ -54,7 +53,7 @@ type BeneficiariesDisplayState struct {
 	Beneficiary any
 }
 
-func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}, solidarity_bookings_list interface{}) {
+func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
@@ -65,7 +64,6 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"documents":                documents,
 		"organizations":            organizations,
 		"event":                    event,
-		"solidarity_bookings":      solidarity_bookings_list,
 	}
 	renderer.Render("beneficiaries_display", w, r, files, state)
 }

renderer/solidarity_service.go

@@ -5,8 +5,8 @@ import (
 	"html/template"
 	"net/http"
 
-	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	solidarity_service "git.coopgo.io/sbouaram/solidarity-service/servers/grpc/proto"
 )
 
 const solidarityserviceMenu = "solidarity_service"
@@ -15,85 +15,53 @@ const solidarityserviceMenu = "solidarity_service"
 type SolidarityListState struct {
 	Count         int                               `json:"count"`
   	CacheId                string                            `json:"cache_id"`
-	BeneficiariesSolidarity         *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
+	Beneficiaries          []mobilityaccountsstorage.Account `json:"beneficiaries"`
 	Drivers *solidarity_service.DriverJourneysResponse `json:"drivers"`
-	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
 
 }
 
-type BeneficiariesSolidarityListState struct {
-	Count         int                               `json:"count"`
-  	CacheId                string                            `json:"cache_id"`
-	BeneficiariesSolidarity          *solidarity_service.GetAllPassengersResponse `json:"beneficiariessolidarity"`
-	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
-
-}
-
-type SolidarityBookingsState struct {
-	Bookings *solidarity_service.CreateBookingSolidarityResponse `json:"bookings"`
-	Beneficiaries []mobilityaccountsstorage.Account   `json:"beneficiaries"`
-
-}
-
-func (s BeneficiariesSolidarityListState) JSON() template.JS {
-	result, _ := json.Marshal(s)
-	return template.JS(result)
-}
-
-func (s BeneficiariesSolidarityListState) JSONWithLimits(a int, b int) template.JS {
-	if b < 5 { 
-		s.Beneficiaries = s.Beneficiaries[a:b]
-	}
-	return s.JSON()
-}
-
 func (s SolidarityListState) JSON() template.JS {
 	result, _ := json.Marshal(s)
 	return template.JS(result)
 }
 
 func (s SolidarityListState) JSONWithLimits(a int, b int) template.JS {
-	if b < 5 { 
+	if b < len(s.Beneficiaries) { 
 		s.Beneficiaries = s.Beneficiaries[a:b]
 	}
 	return s.JSON()
 }
 
-func (renderer *Renderer) SolidarityService(w http.ResponseWriter, r *http.Request, accounts *solidarity_service.GetAllPassengersResponse, parcourmobAccounts []mobilityaccountsstorage.Account, cacheid string) {
+func (renderer *Renderer) SolidarityService(w http.ResponseWriter, r *http.Request, accounts []mobilityaccountsstorage.Account, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
-	state.ViewState = BeneficiariesSolidarityListState{
+	state.ViewState = BeneficiariesListState{
-		Count:         len(parcourmobAccounts), 
+		Count:         len(accounts), 
 		CacheId:       cacheid,
-		BeneficiariesSolidarity: accounts,
+		Beneficiaries: accounts,
-		Beneficiaries: parcourmobAccounts,
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)
 }
 
-func (renderer *Renderer) SolidarityServiceBooking(w http.ResponseWriter, r *http.Request, bookings *solidarity_service.CreateBookingSolidarityResponse, parcourmobAccounts []mobilityaccountsstorage.Account) {
+func (renderer *Renderer) SolidarityServiceBooking(w http.ResponseWriter, r *http.Request, booking *solidarity_service.CreateBookingSolidarityResponse) {
 	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
-	state.ViewState = SolidarityBookingsState{
+	state.ViewState = map[string]any{
-		Bookings: bookings,
+		"booking": booking,
-		Beneficiaries: parcourmobAccounts,
-
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)
 }
 
-func (renderer *Renderer) SolidarityServiceListAvailableDrivers(w http.ResponseWriter, r *http.Request, drivers *solidarity_service.DriverJourneysResponse, booking *solidarity_service.CreateBookingSolidarityRequest, accounts *solidarity_service.GetAllPassengersResponse, parcourmobAccounts []mobilityaccountsstorage.Account, cacheid string) {
+func (renderer *Renderer) SolidarityServiceListAvailableDrivers(w http.ResponseWriter, r *http.Request, drivers *solidarity_service.DriverJourneysResponse, booking *solidarity_service.CreateBookingSolidarityRequest, accounts []mobilityaccountsstorage.Account, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_service.list.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityserviceMenu)
 	state.ViewState = SolidarityListState {
-		Count: len(parcourmobAccounts),
+		Count: len(accounts),
-		BeneficiariesSolidarity: accounts,
+		Beneficiaries: accounts,
 		CacheId:       cacheid,
 		Drivers: drivers,
-		Beneficiaries: parcourmobAccounts,
-
 	}
 
 	renderer.Render("solidarity_service", w, r, files, state)