delete reservation and history benef

handlers/application/agenda.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"sort"
 	"strconv"
@@ -14,13 +13,11 @@ import (
 	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
-	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -150,52 +147,17 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 		}
 
 		resp, err := h.services.GRPC.Agenda.CreateEvent(context.TODO(), request)
+
 		if err != nil {
 			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 
-		contentType := r.Header.Get("Content-Type")
-		if strings.HasPrefix(contentType, "multipart/form-data") {
-			err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit
-			if err != nil {
-				fmt.Println("Error parsing multipart form:", err)
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			file, header, err := r.FormFile("file-upload")
-			if err == nil {
-				defer file.Close()
-
-				document_type := r.FormValue("file_type")
-				document_name := r.FormValue("file_name")
-				
-				fileid := uuid.NewString()
-
-				metadata := map[string]string{
-					"file_type": document_type,
-					"file_name": document_name,
-				}
-
-				if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", resp.Event.Id, fileid, header.Filename), header.Size, metadata); err != nil {
-					fmt.Println("Error uploading file:", err)
-					w.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			} else if err != http.ErrMissingFile {
-				fmt.Println("Error retrieving file:", err)
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-		}
-
 		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
 		return
 	}
-
-	h.Renderer.AgendaCreateEvent(w, r, h.config.GetStringSlice("modules.agenda.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
+	h.Renderer.AgendaCreateEvent(w, r)
 }
 
 func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request) {
@@ -275,13 +237,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 		}
 	}
 
-
-	documents := h.filestorage.List(filestorage.PREFIX_AGENDA + "/" + eventid)
-
-	events_file_types := h.config.GetStringSlice("modules.agenda.documents_types")
-	file_types_map := h.config.GetStringMapString("storage.files.file_types")
-
-	h.Renderer.AgendaDisplayEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), events_file_types, file_types_map, documents, subscribers, accounts)
+	h.Renderer.AgendaDisplayEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
 }
 
 func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) {
@@ -299,7 +255,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 	}
 	vars := mux.Vars(r)
 	eventid := vars["eventid"]
-
+	fmt.Println(eventid)
 	if err := r.ParseForm(); err != nil {
 		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
@@ -729,61 +685,3 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
 
 	h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
 }
-////// ADD DOCUMENTS //////
-func (h *ApplicationHandler) EventDocuments(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	eventID := vars["eventid"]
-
-	//r.ParseForm()
-	r.ParseMultipartForm(100 * 1024 * 1024)
-
-	document_type := r.FormValue("type")
-	document_name := r.FormValue("name")
-
-	file, header, err := r.FormFile("file-upload")
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	defer file.Close()
-
-	fileid := uuid.NewString()
-
-	metadata := map[string]string{
-		"type": document_type,
-		"name": document_name,
-	}
-
-	if err := h.filestorage.Put(file, filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s_%s", eventID, fileid, header.Filename), header.Size, metadata); err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
-
-}
-
-
-func (h *ApplicationHandler) EventDocumentDownload(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	eventID := vars["eventid"]
-	document := vars["document"]
-
-	file, info, err := h.filestorage.Get(filestorage.PREFIX_AGENDA, fmt.Sprintf("%s/%s", eventID, document))
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", info.ContentType)
-	if _, err = io.Copy(w, file); err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
-
-}

handlers/application/beneficiaries.go

@@ -205,6 +205,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 	subcriptionresp, err := h.services.GRPC.Agenda.GetSubscriptionByUser(context.TODO(), subscriptionrequest)
 	if err != nil {
+		fmt.Println("icii")
 		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
@@ -212,13 +213,15 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 	events := []agendastorage.Event{}
 	currentTime := time.Now().Truncate(24 * time.Hour)
-
+	fmt.Println(subcriptionresp)
 	for _, e := range subcriptionresp.Subscription {
 		eventresquest := &agenda.GetEventRequest{
 			Id: e.Eventid,
 		}
+		fmt.Println(eventresquest)
 		eventresp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), eventresquest)
 		if err != nil {
+			fmt.Println("iciiiiii")
 			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
@@ -269,6 +272,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		}
 
 		events_list = append(events_list, event)
+
 	}
 
 	var status_booking int
@@ -306,6 +310,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 			}
 
 			events_list = append(events_list, event)
+
 		}
 	}
 	sortByDate(events_list)
@@ -446,8 +451,6 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 		"name": document_name,
 	}
 
-	fmt.Println("metadata", metadata)
-
 	if err := h.filestorage.Put(file, filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s_%s", beneficiaryID, fileid, header.Filename), header.Size, metadata); err != nil {
 		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)

handlers/application/dashboard.go

@@ -13,8 +13,6 @@ import (
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
-	fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 )
 
 func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
@@ -78,18 +76,6 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 
 	sort.Sort(sorting.EventsByStartdate(events))
 
-	bookings := []fleetstorage.Booking{}
-
-	bookingsresp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), &fleets.GetBookingsRequest{
-		Namespaces: []string{"parcoursmob_dispositifs"},
-	})
-
-	if err == nil {
-		for _, b := range bookingsresp.Bookings {
-			bookings = append(bookings, b.ToStorageType())
-		}
-	}
-
-	h.Renderer.Dashboard(w, r, accounts, count, count_members, events, bookings)
+	h.Renderer.Dashboard(w, r, accounts, count, count_members, events)
 
 }

handlers/application/vehicles-management.go

@@ -140,9 +140,6 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 			fmt.Println(v)
 			dataMap["automatic"] = (v == "on")
 		}
-		if v := r.FormValue("kilometers"); v != "" {
-			dataMap["kilometers"] = v
-		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
@@ -305,12 +302,15 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 	}
 
 	alternativerequest := &fleets.GetVehiclesRequest{
-		Namespaces:       []string{"parcoursmob"},
-		Types:            []string{booking.Vehicle.Type},
-		Administrators:   booking.Vehicle.Administrators,
-		AvailabilityFrom: timestamppb.New(booking.Startdate),
-		AvailabilityTo:   timestamppb.New(booking.Enddate.Add(24 * time.Hour)),
+		Namespaces:     []string{"parcoursmob"},
+		Types:          []string{booking.Vehicle.Type},
+		Administrators: booking.Vehicle.Administrators,
+		//AvailabilityFrom: timestamppb.New(booking.Startdate),
+		//AvailabilityTo: timestamppb.New(booking.Startdate.Add(After(time.Now()))),
 	}
+	// if alternativerequest.AvailabilityFrom.After(time.Now()) {
+	// 	fmt.Println("loooool")
+	// }
 
 	alternativeresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), alternativerequest)
 	if err != nil {
@@ -322,11 +322,48 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 	for _, a := range alternativeresp.Vehicles {
 		alternatives = append(alternatives, a.ToStorageType())
 	}
+	/***************************************add list of vehicules ******************************************/
+	requesst := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	ressp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), requesst)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+	}
 
+	vehicles := []fleetsstorage.Vehicle{}
+	bookings := []fleetsstorage.Booking{}
+	vehicles_map := map[string]fleetsstorage.Vehicle{}
+
+	for _, vehicle := range ressp.Vehicles {
+		if filterVehicle(r, vehicle) {
+			v := vehicle.ToStorageType()
+			vehicleBookings := []fleetsstorage.Booking{}
+			for _, b := range v.Bookings {
+				if b.Status() != fleetsstorage.StatusOld {
+					if deleted, ok := b.Data["Deleted"].(bool); !ok && !deleted {
+						bookings = append(bookings, b)
+					}
+				}
+				if b.Unavailableto.After(time.Now()) {
+					vehicleBookings = append(vehicleBookings, b)
+				}
+			}
+			v.Bookings = vehicleBookings
+			vehicles = append(vehicles, v)
+			vehicles_map[v.ID] = v
+
+		}
+	}
+
+	//sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
+	//sort.Sort(sorting.BookingsByStartdate(bookings))
+	/*********************************************************************************/
 	documents := h.filestorage.List(filestorage.PREFIX_BOOKINGS + "/" + bookingid)
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives)
+	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives, vehicles, vehicles_map, bookings)
 }
 
 func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.ResponseWriter, r *http.Request) {
@@ -556,8 +593,17 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
 				Data:            datapb,
 			},
 		}
+		requestt := &fleets.DeleteBookingRequest{
+			Id: bookingid,
+		}
+		_, errr := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
 
-		_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
+		if errr != nil {
+			fmt.Println(errr)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		_, err := h.services.GRPC.Fleets.DeleteBooking(context.TODO(), requestt)
 
 		if err != nil {
 			fmt.Println(err)
@@ -617,9 +663,6 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 		if v := r.FormValue("licence_plate"); v != "" {
 			dataMap["licence_plate"] = v
 		}
-		if v := r.FormValue("kilometers"); v != "" {
-			dataMap["kilometers"] = v
-		}
 		if v := r.FormValue("automatic"); v != "" {
 			fmt.Println(v)
 			dataMap["automatic"] = (v == "on")

handlers/auth/onboarding.go

@@ -40,8 +40,8 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 		display_name := fmt.Sprint(r.FormValue("first_name")) + " " + fmt.Sprint(r.FormValue("last_name"))
 		account := &ma.Account{
 			Authentication: ma.AccountAuth{
-				Local: ma.LocalAuth{
-					Username: onboardingmap["username"].(string),
+				Local: &ma.LocalAuth{
+					Username: onboardingmap["username"].(*string),
 					Password: r.FormValue("password"),
 				},
 			},

main.go

@@ -162,9 +162,6 @@ func main() {
 	application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
 	application.HandleFunc("/agenda/{eventid}/history", applicationHandler.AgendaHistoryEvent)
 	/////////////////////////////////////////////////////////////////////////////////////////////////////
-	//////////////////Add documents in event////////////////////////
-	application.HandleFunc("/agenda/{eventid}/documents", applicationHandler.EventDocuments)
-	application.HandleFunc("/agenda/{eventid}/documents/{document}", applicationHandler.EventDocumentDownload)
 
 	export := r.PathPrefix("/exports").Subrouter()
 	export.HandleFunc("/fleets/bookings", exportsHandler.Bookings)

renderer/agenda.go

@@ -30,31 +30,22 @@ func (renderer *Renderer) AgendaHistory(w http.ResponseWriter, r *http.Request,
 	renderer.Render("agenda history", w, r, files, state)
 }
 
-func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Request, events_file_types []string, file_types_map map[string]string, documents any) {
+func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Request) {
 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.create_event.files")
 	state := NewState(r, renderer.ThemeConfig, agendaMenu)
 
-	state.ViewState = map[string]any{
-		"events_file_types": events_file_types,
-		"file_types_map":    file_types_map,
-		"documents":         documents,
-	}
-
 	renderer.Render("agenda create event", w, r, files, state)
 }
 
-func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request, event any, group any, events_file_types []string, file_types_map map[string]string, documents any, subscribers map[string]any, beneficiaries any) {
+func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request, event any, group any, subscribers map[string]any, beneficiaries any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.display_event.files")
 	state := NewState(r, renderer.ThemeConfig, agendaMenu)
 
 	state.ViewState = map[string]any{
-		"event":         	 event,
-		"group":         	 group,
-		"events_file_types": events_file_types,
-		"file_types_map":	 file_types_map,
-		"documents":     	 documents,
-		"subscribers":   	 subscribers,
-		"beneficiaries": 	 beneficiaries,
+		"event":         event,
+		"group":         group,
+		"subscribers":   subscribers,
+		"beneficiaries": beneficiaries,
 	}
 
 	renderer.Render("agenda create event", w, r, files, state)
@@ -109,18 +100,3 @@ func (renderer *Renderer) AgendaDeleteEvent(w http.ResponseWriter, r *http.Reque
 
 	renderer.Render("event_deleteEvent", w, r, files, state)
 }
-
-////////Event documents////////////////////////
-// func (renderer *Renderer) EventDocuments(w http.ResponseWriter, r *http.Request, event any, documents []any) {
-// 	files := renderer.ThemeConfig.GetStringSlice("views.agenda.event_files.files")
-// 	state := NewState(r, renderer.ThemeConfig, agendaMenu)
-
-// 	state.ViewState = map[string]any{
-// 		"event":      event,
-// 		"documents":  documents,
-// 		"eventid":    event.(map[string]any)["id"],
-// 		"eventtitle": event.(map[string]any)["title"],
-// 	}
-
-// 	renderer.Render("event_files", w, r, files, state)
-// }

renderer/dashboard.go

@@ -4,12 +4,11 @@ import (
 	"net/http"
 
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
-	fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 )
 
 const dashboardMenu = "dashboard"
 
-func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, accounts []any, nbaccounts int, count_members int, events []agendastorage.Event, fleets []fleetstorage.Booking) {
+func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, accounts []any, nbaccounts int, count_members int, events []agendastorage.Event) {
 	files := renderer.ThemeConfig.GetStringSlice("views.dashboard.files")
 	state := NewState(r, renderer.ThemeConfig, dashboardMenu)
 	state.ViewState = map[string]any{
@@ -19,7 +18,6 @@ func (renderer *Renderer) Dashboard(w http.ResponseWriter, r *http.Request, acco
 		},
 		"count_members": count_members,
 		"events":        events,
-		"fleets":         fleets,
 	}
 
 	renderer.Render("dashboard", w, r, files, state)

renderer/vehicle-management.go

@@ -64,7 +64,7 @@ func (renderer *Renderer) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Req
 	renderer.Render("fleet display vehicle", w, r, files, state)
 }
 
-func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, alternative_vehicles []any) {
+func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, alternative_vehicles []any, vehicles []fleetsstorage.Vehicle, vehicles_map map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.booking_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
@@ -75,6 +75,9 @@ func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter,
 		"documents":            documents,
 		"file_types_map":       file_types_map,
 		"alternative_vehicles": alternative_vehicles,
+		"vehicles":             vehicles,
+		"bookings":             bookings,
+		"vehicles_map":         vehicles_map,
 	}
 
 	renderer.Render("vehicles search", w, r, files, state)
@@ -84,7 +87,7 @@ func (renderer *Renderer) UnbookingVehicle(w http.ResponseWriter, r *http.Reques
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.delete_booking.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
-		"booking":              booking,
+		"booking": booking,
 	}
 
 	renderer.Render("vehicule unbooking", w, r, files, state)

utils/storage/files.go

@@ -10,7 +10,6 @@ import (
 const (
 	PREFIX_BENEFICIARIES = "beneficiaries"
 	PREFIX_BOOKINGS      = "fleets_bookings"
-	PREFIX_AGENDA		 = "event_files"
 )
 
 type FileInfo struct {