fix small issue in go mod

handlers/application/administration.go

@@ -11,6 +11,8 @@ import (
 	"time"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	"git.coopgo.io/coopgo-platform/fleets/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
@@ -86,6 +88,8 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 			"agenda":              r.FormValue("modules.agenda") == "on",
 			"groups":              r.FormValue("modules.groups") == "on",
 			"administration":      r.FormValue("modules.administration") == "on",
+			"support":             r.FormValue("modules.support") == "on",
+			"group_module":        r.FormValue("modules.group_module") == "on",
 		}
 
 		groupid := uuid.NewString()
@@ -329,6 +333,31 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 	return
 }
 
+func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Request) {
+
+	request := &fleets.GetBookingsRequest{}
+	resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	bookings := []storage.Booking{}
+
+	for _, b := range resp.Bookings {
+		booking := b.ToStorageType()
+		bookings = append(bookings, booking)
+	}
+
+	sort.Sort(sorting.BookingsByStartdate(bookings))
+
+	vehicles, _ := h.services.GetVehiclesMap()
+	groups, _ := h.services.GetGroupsMap()
+
+	h.Renderer.VehicleBookingsList(w, r, bookings, vehicles, groups)
+}
+
 func (h *ApplicationHandler) members() ([]*accounts.Account, error) {
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccounts(context.TODO(), &accounts.GetAccountsRequest{
 		Namespaces: []string{"parcoursmob"},

handlers/application/beneficiaries.go

@@ -61,6 +61,7 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
 func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) {
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
+		fmt.Println("Create beneficiary : could not find group")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}

handlers/application/journeys.go

@@ -5,35 +5,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"sort"
-	"strings"
 	"time"
 
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
-	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
-	groupstorage "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"
 	geojson "github.com/paulmach/go.geojson"
 	"gitlab.scity.coop/maas/navitia-golang"
 	"gitlab.scity.coop/maas/navitia-golang/types"
-	"google.golang.org/protobuf/types/known/structpb"
 )
 
-var Depart any
-var Arrive any
-
-// type Typep string
-
-// const (
-// 	rec Typep = "rec"
-// 	pon Typep = "pon"
-// )
-
-// var departdate string
-// var departTime string
-
 func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
@@ -165,334 +144,3 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 
 	h.Renderer.JourneysSearch(w, r, carpoolresults, journeys, vehicles, searched, departuregeo, destinationgeo, departuredate, departuretime)
 }
-
-type GroupsModule []groupstorage.Group
-
-func (a GroupsModule) Len() int { return len(a) }
-func (a GroupsModule) Less(i, j int) bool {
-	return strings.Compare(a[i].Data["name"].(string), a[j].Data["name"].(string)) < 0
-}
-func (a GroupsModule) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-
-func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Request) {
-
-	request := &groupsmanagement.GetGroupsRequest{
-		Namespaces: []string{"parcoursmob_groups_covoiturage"},
-	}
-
-	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var groups = []groupstorage.Group{}
-
-	for _, group := range resp.Groups {
-		g := group.ToStorageType()
-		groups = append(groups, g)
-	}
-	//////////////////
-
-	cacheid := uuid.NewString()
-
-	/////////////////
-	sort.Sort(GroupsModule(groups))
-	h.cache.PutWithTTL(cacheid, groups, 1*time.Hour)
-
-	h.Renderer.GroupsGestion(w, r, groups, cacheid)
-}
-func filterAcc(r *http.Request, a *mobilityaccounts.Account) bool {
-	searchFilter, ok := r.URL.Query()["search"]
-
-	if ok && len(searchFilter[0]) > 0 {
-		name := a.Data.AsMap()["first_name"].(string) + " " + a.Data.AsMap()["last_name"].(string)
-		if !strings.Contains(strings.ToLower(name), strings.ToLower(searchFilter[0])) {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request) {
-
-	var beneficiary any
-	var (
-		departurgeo   *geojson.Feature
-		dstinationgeo *geojson.Feature
-	)
-	searched := false
-	// var accounts = []any{}
-	// cacheid := uuid.NewString()
-	// accountsBeneficaire, err := h.beneficiaries(r)
-	// if err != nil {
-	// 	fmt.Println(err)
-	// 	w.WriteHeader(http.StatusBadRequest)
-	// 	return
-	// }
-	if r.FormValue("beneficiaryid") != "" {
-		// Handler form
-		searched = true
-
-		requestbeneficiary := &mobilityaccounts.GetAccountRequest{
-			Id: r.FormValue("beneficiaryid"),
-		}
-
-		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		beneficiary = respbeneficiary.Account.ToStorageType()
-
-		if r.Method == "POST" {
-			fmt.Println("herrre")
-			///////////////////////////////////////////
-			departure := r.FormValue("departure")
-			destination := r.FormValue("destination")
-
-			if departure != "" && destination != "" {
-
-				var err error
-
-				departurgeo, err = geojson.UnmarshalFeature([]byte(departure))
-				if err != nil {
-					fmt.Println(err)
-					w.WriteHeader(http.StatusBadRequest)
-					return
-				}
-
-				dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
-				if err != nil {
-					fmt.Println(err)
-					w.WriteHeader(http.StatusBadRequest)
-					return
-				}
-			}
-			//////////////////////////////////////////////////////////////////////////////////////////////////////
-			if r.FormValue("departure") != "" {
-				var a any
-				json.Unmarshal([]byte(r.FormValue("departure")), &a)
-
-				Depart = a
-			}
-			if r.FormValue("destination") != "" {
-				var a any
-				json.Unmarshal([]byte(r.FormValue("destination")), &a)
-
-				Arrive = a
-			}
-			r.ParseForm()
-
-			/////////////////
-			// locTime, errTime := time.LoadLocation("Europe/Paris")
-			// if errTime != nil {
-			// 	fmt.Println("Loading timezone location Europe/Paris error : ")
-			// 	fmt.Println("Missing zones in container ? ")
-			// 	panic(errTime)
-			// }
-
-			// departdate := r.FormValue("departuredate")
-			// departTime := r.FormValue("departuretime")
-			//departuredatetime, _ := time.ParseInLocation("2006-01-02 15:04", fmt.Sprintf("%s %s", departuredate, departuretime), locTime)
-
-			////////////////
-			if r.FormValue("name") == "" {
-
-				fmt.Println("invalid name")
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-			// if r.FormValue("driver") == "" {
-
-			// 	fmt.Println("invalid name")
-			// 	w.WriteHeader(http.StatusBadRequest)
-			// 	return
-			// }
-			if r.FormValue("number") == "" {
-
-				fmt.Println("invalid number of personne")
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-			// planType := map[string]any{
-			// 	"rrecurrent":  r.FormValue("recurrent") == "on",
-			// 	"pponctuelle": r.FormValue("ponctuelle") == "on",
-			// }
-			planDays := map[string]any{
-				"lundi":    r.FormValue("lundi") == "on",
-				"mardi":    r.FormValue("mardi") == "on",
-				"mercredi": r.FormValue("mercredi") == "on",
-				"jeudi":    r.FormValue("jeudi") == "on",
-				"vendredi": r.FormValue("vendredi") == "on",
-				"samedi":   r.FormValue("samedi") == "on",
-				"dimanche": r.FormValue("dimanche") == "on",
-			}
-			// var rec bool = r.FormValue("recurrent")
-			// var ponc bool
-			groupidd := uuid.NewString()
-			fmt.Println("herrr&e")
-			dataMap := map[string]any{
-				"name":              r.FormValue("name"),
-				"number":            r.FormValue("number"),
-				"driver_first_name": respbeneficiary.Account.ToStorageType().Data["first_name"],
-				"driver_last_name":  respbeneficiary.Account.ToStorageType().Data["last_name"],
-				"depart":            Depart,
-				"arrive":            Arrive,
-				"departdate":        r.FormValue("departdate"),
-				"date":              r.FormValue("date"),
-				"enddate":           r.FormValue("enddate"),
-				"departtime":        r.FormValue("departtime"),
-				"time":              r.FormValue("time"),
-				// "ponctdate":         r.FormValue("ponctdate"),
-				//"planType":          planType,
-				"planDays":  planDays,
-				"recurrent": r.FormValue("recurrent"),
-				"pontuelle": r.FormValue("ponctuelle"),
-				// "r":         rec,
-				// "p":         pon,
-			}
-			fmt.Println(dataMap["ponctuelle"])
-			data, err := structpb.NewValue(dataMap)
-			if err != nil {
-				fmt.Println(err)
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-
-			request_organization := &groupsmanagement.AddGroupRequest{
-				Group: &groupsmanagement.Group{
-					Id:        groupidd,
-					Namespace: "parcoursmob_groups_covoiturage",
-					Data:      data.GetStructValue(),
-				},
-			}
-
-			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
-			if err != nil {
-				fmt.Println(err)
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			//////////////////////////////////////////////////
-			// request_organizatio := &groupsmanagement.AddGroupMemberRequest{
-			// 	Group: &groupsmanagement.GroupMember{
-			// 		Id:        groupidd,
-			// 		//Namespace: "parcoursmob_groups_covoiturage",
-			// 		Data:      data.GetStructValue(),
-			// 	},
-			// }
-
-			// _, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio)
-			// if err != nil {
-			// 	fmt.Println(err)
-			// 	w.WriteHeader(http.StatusInternalServerError)
-			// 	return
-			// }
-			////////////////////////////////////////////////
-			http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", request_organization.Group.ToStorageType().ID), http.StatusFound)
-
-			//http.Redirect(w, r, fmt.Print("/app/journeys"), http.StatusFound)
-			return
-		}
-	}
-	accountsBeneficaire, err := h.beneficiaries(r)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	h.Renderer.CreateGroup(w, r, Depart, Arrive, searched, beneficiary, accountsBeneficaire, departurgeo, dstinationgeo)
-
-}
-
-func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	groupid := vars["groupid"]
-
-	request := &groupsmanagement.GetGroupRequest{
-		Id: groupid,
-	}
-
-	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var accounts = []any{}
-
-	requesst := &mobilityaccounts.GetAccountsBatchRequest{
-		Accountids: resp.Group.Members,
-	}
-
-	ressp, _ := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), requesst)
-	// if err != nil {
-	// 	return err
-	// }
-	for _, account := range ressp.Accounts {
-		if filterAcc(r, account) {
-			a := account.ToStorageType()
-			accounts = append(accounts, a)
-		}
-	}
-
-	cacheid := uuid.NewString()
-	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
-	r.ParseForm()
-
-	var beneficiary any
-
-	searched := false
-
-	// if r.Method == "POST" {
-	if r.FormValue("beneficiaryid") != "" {
-		// Handler form
-		searched = true
-
-		requestbeneficiary := &mobilityaccounts.GetAccountRequest{
-			Id: r.FormValue("beneficiaryid"),
-		}
-
-		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		beneficiary = respbeneficiary.Account.ToStorageType()
-
-		subscribe := &groupsmanagement.SubscribeRequest{
-			Groupid:  resp.Group.ToStorageType().ID,
-			Memberid: respbeneficiary.Account.Id,
-		}
-
-		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
-
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", resp.Group.ToStorageType().ID), http.StatusFound)
-		return
-	}
-
-	accountsBeneficaire, err := h.beneficiaries(r)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	//h.Renderer.BeneficaireSearch(w, r, accounts, searched, beneficiary, resp.Group.ToStorageType())
-	h.Renderer.DisplayGroupCovoiturage(w, r, resp.Group.ToStorageType().ID, accounts, cacheid, searched, beneficiary, resp.Group.ToStorageType(), accountsBeneficaire)
-}

handlers/application/members.go

@@ -0,0 +1,128 @@
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+
+	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"google.golang.org/protobuf/types/known/structpb"
+)
+
+type UserForm struct {
+	FirstName   string `json:"first_name" validate:"required"`
+	LastName    string `json:"last_name" validate:"required"`
+	Email       string `json:"email" validate:"required,email"`
+	PhoneNumber string `json:"phone_number" validate:"required,phoneNumber"`
+	Address     any    `json:"address,omitempty"`
+	Gender      string `json:"gender"`
+}
+
+func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Request) {
+
+	adm := strings.Split(r.URL.Path, "/")
+	adminid := adm[3]
+
+	request := &mobilityaccounts.GetAccountRequest{
+		Id: adminid,
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.MemberDisplay(w, r, resp.Account.ToStorageType())
+}
+
+func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request) {
+	adm := strings.Split(r.URL.Path, "/")
+	userID := adm[3]
+
+	if r.Method == "POST" {
+
+		dataMap, err := parseUserForm(r)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &mobilityaccounts.UpdateDataRequest{
+			Account: &mobilityaccounts.Account{
+				Id:        userID,
+				Namespace: "parcoursmob",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/profile/%s", resp.Account.Id), http.StatusFound)
+
+		return
+	}
+
+	request := &mobilityaccounts.GetAccountRequest{
+		Id: userID,
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.MemberUpdate(w, r, resp.Account.ToStorageType())
+}
+
+func parseUserForm(r *http.Request) (map[string]any, error) {
+	if err := r.ParseForm(); err != nil {
+		return nil, err
+	}
+
+	formData := UserForm{
+		FirstName:   r.PostFormValue("first_name"),
+		LastName:    r.PostFormValue("last_name"),
+		Email:       r.PostFormValue("email"),
+		PhoneNumber: r.PostFormValue("phone_number"),
+		Gender:      r.PostFormValue("gender"),
+	}
+
+	validate := formvalidators.New()
+	if err := validate.Struct(formData); err != nil {
+		return nil, err
+	}
+
+	d, err := json.Marshal(formData)
+	if err != nil {
+		return nil, err
+	}
+
+	var dataMap map[string]any
+	err = json.Unmarshal(d, &dataMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return dataMap, nil
+}

handlers/application/vehicles.go

@@ -136,14 +136,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 }
 
 func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
-	// Get Group
-	// g := r.Context().Value(identification.GroupKey)
-	// if g == nil {
-	// 	fmt.Println("no current group")
-	// 	w.WriteHeader(http.StatusInternalServerError)
-	// 	return
-	// }
-	// current_group := g.(storage.Group)
+	fmt.Println("Book")
 	current_group, err := h.currentGroup(r)
 	if err != nil {
 		fmt.Println(err)
@@ -151,24 +144,6 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Get current user ID
-	// u := r.Context().Value(identification.IdtokenKey)
-	// if u == nil {
-	// 	fmt.Println("no current user")
-	// 	w.WriteHeader(http.StatusInternalServerError)
-	// 	return
-	// }
-	// current_user_token := u.(*oidc.IDToken)
-
-	// // Get current user claims
-	// c := r.Context().Value(identification.ClaimsKey)
-	// if c == nil {
-	// 	fmt.Println("no current user claims")
-	// 	w.WriteHeader(http.StatusInternalServerError)
-	// 	return
-	// }
-	// current_user_claims := c.(map[string]any)
-
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
 		fmt.Println(err)
@@ -191,7 +166,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	r.ParseMultipartForm(10 * 1024 * 1024)
+	r.ParseMultipartForm(100 * 1024 * 1024)
 
 	start := r.FormValue("startdate")
 	end := r.FormValue("enddate")
@@ -203,7 +178,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		"booked_by": map[string]any{
 			"user": map[string]any{
 				"id":           current_user_token.Subject,
-				"display_name": current_user_claims["display_name"],
+				"display_name": fmt.Sprintf("%s %s", current_user_claims["first_name"], current_user_claims["last_name"]),
 			},
 			"group": map[string]any{
 				"id":   current_group.ID,
@@ -233,7 +208,6 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		Booking: booking,
 	}
 
-	fmt.Println(r.FormFile("doc-identity_proof"))
 	for _, v := range h.config.GetStringSlice("modules.fleets.booking_documents.mandatory") {
 		existing_file := r.FormValue("type-" + v)
 		if existing_file == "" {
@@ -282,11 +256,13 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		fmt.Println(err)
 	} else {
 		for _, m := range members {
-			h.emailing.Send("fleets.bookings.creation_admin_alert", m.Data["email"].(string), map[string]string{
+			if email, ok := m.Data["email"].(string); ok {
+				h.emailing.Send("fleets.bookings.creation_admin_alert", email, map[string]string{
 					"bookingid": booking.Id,
 				})
 			}
 		}
+	}
 
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles/bookings/%s", booking.Id), http.StatusFound)
 
@@ -314,9 +290,9 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 
 	beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
 	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
+		beneficiaryresp = &mobilityaccounts.GetAccountResponse{
+			Account: &mobilityaccounts.Account{},
+		}
 	}
 
 	grouprequest := &groupsmanagement.GetGroupRequest{
@@ -370,7 +346,10 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 
 	sort.Sort(sorting.BookingsByStartdate(bookings))
 
-	h.Renderer.VehicleBookingsList(w, r, bookings)
+	vehicles, _ := h.services.GetVehiclesMap()
+	groups, _ := h.services.GetGroupsMap()
+
+	h.Renderer.VehicleBookingsList(w, r, bookings, vehicles, groups)
 }
 
 func (h *ApplicationHandler) BookingDocumentDownload(w http.ResponseWriter, r *http.Request) {

handlers/auth/disconnect.go

@@ -0,0 +1,13 @@
+package auth
+
+import "net/http"
+
+func (h *AuthHandler) Disconnect(w http.ResponseWriter, r *http.Request) {
+	session, err := h.idp.SessionsStore.Get(r, "parcoursmob_session")
+	if err == nil {
+		session.Options.MaxAge = -1
+		session.Save(r, w)
+	}
+
+	http.Redirect(w, r, "/", http.StatusOK)
+}

main.go

@@ -61,6 +61,7 @@ func main() {
 	r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir(templates_public_dir))))
 
 	r.HandleFunc("/auth/onboarding", authHandler.Onboarding)
+	r.HandleFunc("/auth/disconnect", authHandler.Disconnect)
 	r.HandleFunc("/auth/lost-password", authHandler.LostPasswordInit)
 	r.HandleFunc("/auth/lost-password/recover", authHandler.LostPasswordRecover)
 	r.HandleFunc("/auth/groups/", authHandler.Groups)
@@ -84,6 +85,8 @@ func main() {
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/documents/{document}", applicationHandler.BeneficiaryDocumentDownload)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
 	application.HandleFunc("/members/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
+	application.HandleFunc("/members/{adminid}", applicationHandler.MemberDisplay)
+	application.HandleFunc("/members/{adminid}/update", applicationHandler.MemberUpdate)
 	application.HandleFunc("/journeys/", applicationHandler.JourneysSearch)
 	application.HandleFunc("/vehicles/", applicationHandler.VehiclesSearch)
 	application.HandleFunc("/vehicles/bookings/", applicationHandler.VehiclesBookingsList)
@@ -97,7 +100,6 @@ func main() {
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/update", applicationHandler.VehiclesFleetUpdate)
 	application.HandleFunc("/vehicles-management/bookings/", applicationHandler.VehiclesManagementBookingsList)
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}", applicationHandler.VehicleManagementBookingDisplay)
-	application.HandleFunc("/vehicles-management/bookings/{bookingid}/change-vehicle", applicationHandler.VehicleManagementBookingChangeVehicle)
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}/documents/{document}", applicationHandler.BookingDocumentDownload)
 	application.HandleFunc("/agenda/", applicationHandler.AgendaHome)
 	application.HandleFunc("/agenda/create-event", applicationHandler.AgendaCreateEvent)
@@ -109,9 +111,9 @@ func main() {
 	application.HandleFunc("/group/settings/invite-member", applicationHandler.GroupSettingsInviteMember)
 
 	/****************************Groupe Déplacement ************************************/
-	application.HandleFunc("/journeys/groups_covoiturage", applicationHandler.GroupsGestion)
-	application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
-	application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
+	// application.HandleFunc("/journeys/groups_covoiturage", applicationHandler.GroupsGestion)
+	// application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
+	// application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
 	/****************************************************************/
 
 	/********************Code Supprt Emailing************************/
@@ -133,7 +135,7 @@ func main() {
 	appAdmin.HandleFunc("/groups/{groupid}", applicationHandler.AdministrationGroupDisplay)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-admin", applicationHandler.AdministrationGroupInviteAdmin)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-member", applicationHandler.AdministrationGroupInviteMember)
-	//TODO Secure with Middleware checking for modules
+	appAdmin.HandleFunc("/stats/vehicles", applicationHandler.AdminStatVehicles)
 
 	fmt.Println("-> HTTP server listening on", address)
 

renderer/journeys.go

@@ -1,41 +1,9 @@
 package renderer
 
-import (
-	"encoding/json"
-	"html/template"
-	"net/http"
-
-	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
-	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-)
+import "net/http"
 
 const journeysMenu = "journeys"
 
-type BeneficiariesCovoiturage struct {
-	Group         string `json:"group"`
-	Count         int    `json:"count"`
-	CacheId       string `json:"cache_id"`
-	Beneficiaries []any  `json:"beneficiaries"`
-}
-type BeneficiariesCovoiturageA struct {
-	//Group         string `json:"group"`
-	Count         int    `json:"count"`
-	CacheId       string `json:"cache_id"`
-	Beneficiaries []any  `json:"beneficiaries"`
-}
-
-func (s BeneficiariesCovoiturage) JSON() template.JS {
-	result, _ := json.Marshal(s)
-	return template.JS(result)
-}
-
-func (s BeneficiariesCovoiturage) JSONWithLimits(a int, b int) template.JS {
-	if b < len(s.Beneficiaries) {
-		s.Beneficiaries = s.Beneficiaries[a:b]
-	}
-	return s.JSON()
-}
-
 func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools any, transitjourneys any, vehicles []any, searched bool, departure any, destination any, departuredate string, departuretime string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
@@ -52,98 +20,3 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
 
 	renderer.Render("journeys", w, r, files, state)
 }
-
-type BeneficiariesListstate struct {
-	Count         int                  `json:"count"`
-	CacheId       string               `json:"cache_id"`
-	Beneficiaries []groupstorage.Group `json:"beneficiaries"`
-}
-
-func (s BeneficiariesListstate) JSON() template.JS {
-	result, _ := json.Marshal(s)
-	return template.JS(result)
-}
-
-func (s BeneficiariesListstate) JSONWithLimits(a int, b int) template.JS {
-	if b < len(s.Beneficiaries) {
-		s.Beneficiaries = s.Beneficiaries[a:b]
-	}
-	return s.JSON()
-}
-func (renderer *Renderer) GroupsGestion(w http.ResponseWriter, r *http.Request, groups []groupstorage.Group, cacheid string) {
-	files := renderer.ThemeConfig.GetStringSlice("views.journeys.list.files")
-	state := NewState(r, renderer.ThemeConfig, journeysMenu)
-	// state.ViewState = map[string]any{
-	// 	"groups": groups,
-	// }
-
-	//state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
-	state.ViewState = BeneficiariesListstate{
-		Count:         len(groups),
-		CacheId:       cacheid,
-		Beneficiaries: groups,
-	}
-
-	renderer.Render("journeys", w, r, files, state)
-}
-
-func (renderer *Renderer) CreateGroup(w http.ResponseWriter, r *http.Request, depart any, arrive any, searched bool, beneficiary any, beneficiaries []mobilityaccountsstorage.Account, departure any, destination any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.journeys.create.files")
-	state := NewState(r, renderer.ThemeConfig, journeysMenu)
-	// state.ViewState = map[string]any{
-	// 	"departure":   depart,
-	// 	"destination": arrive,
-	// 	//"beneficiary": beneficiary,
-	// 	//"accounts": accounts,
-	// 	// "cacheid": cacheid,
-	// 	// "searched":   searched,
-	// }
-	viewstate := map[string]any{
-		"deeparture":    depart,
-		"deestination":  arrive,
-		"beneficiaries": beneficiaries,
-		"searched":      searched,
-		"departure":     departure,
-		"destination":   destination,
-		// "departuredate": departuredate,
-		// "departuretime": departuretime,
-	}
-
-	if searched {
-		viewstate["search"] = map[string]any{
-			"beneficiary": beneficiary,
-		}
-
-	}
-
-	state.ViewState = viewstate
-	renderer.Render("journeys", w, r, files, state)
-}
-
-func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request, groupid string, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account) {
-	files := renderer.ThemeConfig.GetStringSlice("views.journeys.display.files")
-	state := NewState(r, renderer.ThemeConfig, journeysMenu)
-
-	viewstate := map[string]any{
-		"beneficiaries": beneficiaries,
-		"searched":      searched,
-		"group":         group,
-		"list": BeneficiariesCovoiturage{
-			Group:         groupid,
-			Count:         len(accounts),
-			CacheId:       cacheid,
-			Beneficiaries: accounts,
-		},
-	}
-
-	if searched {
-		viewstate["search"] = map[string]any{
-			"beneficiary": beneficiary,
-		}
-
-	}
-
-	state.ViewState = viewstate
-
-	renderer.Render("journeys", w, r, files, state)
-}

renderer/members.go

@@ -0,0 +1,24 @@
+package renderer
+
+import (
+	"net/http"
+)
+
+const membersMenu = "members"
+
+func (renderer *Renderer) MemberDisplay(w http.ResponseWriter, r *http.Request, admins any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.members.display.files")
+
+	state := NewState(r, renderer.ThemeConfig, membersMenu)
+	state.ViewState = map[string]any{
+		"admins": admins,
+	}
+	renderer.Render("members_list", w, r, files, state)
+}
+
+func (renderer *Renderer) MemberUpdate(w http.ResponseWriter, r *http.Request, user any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.members.update.files")
+	state := NewState(r, renderer.ThemeConfig, membersMenu)
+	state.ViewState = user
+	renderer.Render("members_update", w, r, files, state)
+}

renderer/renderer.go

@@ -240,7 +240,14 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Icon:   "hero:outline/document-text",
 		})
 	}
-
+	if modules["conseillers"] != nil && modules["conseillers"].(bool) {
+		ls.MenuItems = append(ls.MenuItems, MenuItem{
+			Title:  "Conseillers",
+			Link:   "/app/conseillers/",
+			Active: menuState == membersMenu,
+			Icon:   "hero:outline/user-group",
+		})
+	}
 	return RenderState{
 		IconSet:     icons.NewIconSet(iconset),
 		Group:       group,

renderer/vehicles.go

@@ -67,11 +67,13 @@ func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.R
 	renderer.Render("vehicles search", w, r, files, state)
 }
 
-func (renderer *Renderer) VehicleBookingsList(w http.ResponseWriter, r *http.Request, bookings []storage.Booking) {
+func (renderer *Renderer) VehicleBookingsList(w http.ResponseWriter, r *http.Request, bookings []storage.Booking, vehiclesMap any, groupsMap any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.bookings_list.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
 	state.ViewState = map[string]any{
 		"bookings":     bookings,
+		"vehicles_map": vehiclesMap,
+		"groups_map":   groupsMap,
 	}
 
 	renderer.Render("vehicles search", w, r, files, state)

services/fleets.go

@@ -52,3 +52,17 @@ func (s *ServicesHandler) GetBookings() (bookings []storage.Booking, err error)
 
 	return
 }
+
+func (s *ServicesHandler) GetVehiclesMap() (vehicles map[string]storage.Vehicle, err error) {
+	vehicles = map[string]storage.Vehicle{}
+
+	request := &fleets.GetVehiclesRequest{}
+	resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request)
+	if err == nil {
+		for _, vehicle := range resp.Vehicles {
+			vehicles[vehicle.Id] = vehicle.ToStorageType()
+		}
+	}
+
+	return
+}

services/groupsmanagement.go

@@ -1,7 +1,10 @@
 package services
 
 import (
+	"context"
+
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	"google.golang.org/grpc"
 )
 
@@ -21,3 +24,19 @@ func NewGroupsManagementService(groupsManagementDial string) (*GroupsManagementS
 		GroupsManagementClient: client,
 	}, nil
 }
+
+func (s *ServicesHandler) GetGroupsMap() (groups map[string]storage.Group, err error) {
+	groups = map[string]storage.Group{}
+
+	request := &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+	}
+	resp, err := s.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
+	if err == nil {
+		for _, group := range resp.Groups {
+			groups[group.Id] = group.ToStorageType()
+		}
+	}
+
+	return
+}