add address od members and draw position map

go.mod

@@ -4,11 +4,11 @@ go 1.18
 
 // replace git.coopgo.io/coopgo-platform/mobility-accounts => ../../coopgo-platform/mobility-accounts/
 
-// replace git.coopgo.io/coopgo-platform/groups-management => ../../coopgo-platform/groups-management/
+replace git.coopgo.io/coopgo-platform/groups-management => ../../coopgo-platform/groups-management/
 
 // replace git.coopgo.io/coopgo-platform/fleets => ../../coopgo-platform/fleets/
 
-replace git.coopgo.io/coopgo-platform/agenda => ../../coopgo-platform/agenda/
+// replace git.coopgo.io/coopgo-platform/agenda => ../../coopgo-platform/agenda/
 
 // replace git.coopgo.io/coopgo-platform/emailing => ../../coopgo-platform/emailing/
 

handlers/application/administration.go

@@ -11,8 +11,6 @@ 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"
@@ -88,8 +86,6 @@ 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()
@@ -333,31 +329,6 @@ 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/agenda.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
-	"strings"
 	"time"
 
 	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
@@ -108,7 +107,6 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 				Allday:         eventForm.Allday,
 				MaxSubscribers: int64(eventForm.MaxSubscribers),
 				Data:           data,
-				Deleted:        false,
 			},
 		}
 
@@ -121,7 +119,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 		}
 
 		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
-		return
+
 	}
 	h.Renderer.AgendaCreateEvent(w, r)
 }
@@ -227,13 +225,13 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	dis := fmt.Sprint(current_user_claims["first_name"]) + " " + fmt.Sprint(current_user_claims["last_name"])
+
 	subscriber := r.FormValue("subscriber")
 	data := map[string]any{
 		"subscribed_by": map[string]any{
 			"user": map[string]any{
 				"id":           current_user_token.Subject,
-				"display_name": dis,
+				"display_name": current_user_claims["display_name"],
 			},
 			"group": map[string]any{
 				"id":   current_group.ID,
@@ -332,124 +330,6 @@ func contains(s []*agenda.Subscription, e string) bool {
 	return false
 }
 
-///////////////////////////////Update Event/////////////////////////////////////////
-func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) {
-	adm := strings.Split(r.URL.Path, "/")
-	eventID := adm[3]
-	request := &agenda.GetEventRequest{
-		Id: eventID,
-	}
-
-	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	if r.Method == "POST" {
-		g := r.Context().Value(identification.GroupKey)
-		if g == nil {
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		group := g.(storage.Group)
-
-		eventForm, err := parseEventsForm(r)
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		data, _ := structpb.NewStruct(map[string]any{
-			"address": eventForm.Address,
-		})
-
-		request := &agenda.UpdateEventRequest{
-			Event: &agenda.Event{
-				Namespace:      "parcoursmob_dispositifs",
-				Id:             eventID,
-				Owners:         []string{group.ID},
-				Type:           eventForm.Type,
-				Name:           eventForm.Name,
-				Description:    eventForm.Description,
-				Startdate:      timestamppb.New(*eventForm.Startdate),
-				Enddate:        timestamppb.New(*eventForm.Enddate),
-				Starttime:      eventForm.Starttime,
-				Endtime:        eventForm.Endtime,
-				Allday:         eventForm.Allday,
-				MaxSubscribers: int64(eventForm.MaxSubscribers),
-				Data:           data,
-				Subscriptions:  resp.Event.Subscriptions,
-			},
-		}
-
-		resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
-
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
-		return
-	}
-	h.Renderer.AgendaUpdateEvent(w, r, resp.Event.ToStorageType())
-}
-
-func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Request) {
-
-	vars := mux.Vars(r)
-	eventID := vars["eventid"]
-	request := &agenda.GetEventRequest{
-		Id: eventID,
-	}
-
-	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	if r.Method == "POST" {
-
-		request := &agenda.UpdateEventRequest{
-			Event: &agenda.Event{
-				Namespace:      resp.Event.Namespace,
-				Id:             resp.Event.Id,
-				Owners:         resp.Event.Owners,
-				Type:           resp.Event.Type,
-				Name:           resp.Event.Name,
-				Description:    resp.Event.Description,
-				Startdate:      resp.Event.Startdate,
-				Enddate:        resp.Event.Enddate,
-				Starttime:      resp.Event.Starttime,
-				Endtime:        resp.Event.Endtime,
-				Allday:         resp.Event.Allday,
-				MaxSubscribers: int64(resp.Event.MaxSubscribers),
-				Data:           resp.Event.Data,
-				Subscriptions:  resp.Event.Subscriptions,
-				Deleted:        true,
-			},
-		}
-
-		_, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
-
-		if err != nil {
-			fmt.Println(err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, "/app/agenda/", http.StatusFound)
-		return
-	}
-	h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType())
-}
-
 // func contains[V string](s []V, e V) bool {
 // 	for _, a := range s {
 // 		if a == e {

handlers/application/beneficiaries.go

@@ -61,7 +61,6 @@ 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,14 +5,26 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"sort"
+	"strconv"
+	"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
+
 func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
@@ -144,3 +156,410 @@ 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
+
+	if r.FormValue("beneficiaryid") != "" {
+
+		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" {
+			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()
+
+			if r.FormValue("name") == "" {
+
+				fmt.Println("invalid name")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			if r.FormValue("number") == "" {
+
+				fmt.Println("invalid number of personne")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			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",
+			}
+
+			groupidd := uuid.NewString()
+
+			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"),
+
+				"planDays":  planDays,
+				"recurrent": r.FormValue("recurrent"),
+				"pontuelle": r.FormValue("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
+			}
+
+			http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", request_organization.Group.ToStorageType().ID), 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)
+
+	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.FormValue("beneficiaryid") != "" {
+
+		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
+		}
+		/*******************Code to store more information about mermbers groupscovoiturage**************/
+		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()
+		dataMap := map[string]any{
+
+			"depart": Depart,
+			"arrive": Arrive,
+		}
+		id := uuid.NewString()
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request_organizatio := &groupsmanagement.AddGroupMemberRequest{
+			Group: &groupsmanagement.GroupMember{
+				Id:       id,
+				Memberid: respbeneficiary.Account.Id,
+				Groupid:  resp.Group.ToStorageType().ID,
+				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", resp.Group.ToStorageType().ID), http.StatusFound)
+		return
+	}
+	//////////find all groups to store the adresse passenger///////
+	grp := &groupsmanagement.GetGroupsBatchMemberRequest{
+
+		Groupids: []string{resp.Group.ToStorageType().ID},
+	}
+	s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	groups := map[string]any{}
+
+	if err == nil {
+		for _, g := range s.Groups {
+			groups[g.Memberid] = g.ToStorageType()
+		}
+	}
+
+	var number string = strconv.Itoa(len(resp.Group.Members))
+	/////////////////////
+	accountsBeneficaire, err := h.beneficiaries(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	h.Renderer.DisplayGroupCovoiturage(w, r, number, resp.Group.ToStorageType().ID, Depart, Arrive, accounts, cacheid, searched, beneficiary, resp.Group.ToStorageType(), accountsBeneficaire, groups)
+}
+
+func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	id := vars["id"]
+	groupid := vars["groupid"]
+	memberid := vars["memberid"]
+
+	if r.Method == "POST" {
+
+		//////////get groupid covoiturage//////////
+		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
+		}
+
+		//////////////////////////get group member////////////////////////////////
+
+		reequest := &groupsmanagement.GetGroupMemberRequest{
+			Id: id,
+		}
+
+		ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		req := &groupsmanagement.UnsubscribeMemberRequest{
+			Id: ressp.Group.Id,
+		}
+
+		_, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req)
+		if errr != nil {
+			fmt.Println(errr)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		members := resp.Group.Members
+		for i := 0; i < len(members); i++ {
+			if members[i] == memberid {
+				members = append(members[:i], members[(i+1):]...)
+				resp.Group.Members = members
+				reequest := &groupsmanagement.UnsubscribeRequest{
+					Groupid:  resp.Group.ToStorageType().ID,
+					Memberid: memberid,
+				}
+
+				_, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest)
+				if err != nil {
+					fmt.Println(err)
+					w.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			}
+
+		}
+		http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", groupid), http.StatusFound)
+		/*
+		 I must add "return" to resolve the err
+		 http: superfluous response.WriteHeader call from git.coopgo.io/coopgo-apps/parcoursmob/renderer.(*Renderer).Render (renderer.go:50)
+		*/
+		return
+	}
+	h.Renderer.UpdateGroupCovoiturage(w, r, groupid, memberid)
+}

handlers/application/members.go

@@ -1,128 +0,0 @@
-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/members/%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,7 +136,14 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 }
 
 func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
-	fmt.Println("Book")
+	// 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)
 	current_group, err := h.currentGroup(r)
 	if err != nil {
 		fmt.Println(err)
@@ -144,6 +151,24 @@ 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)
@@ -166,7 +191,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	r.ParseMultipartForm(100 * 1024 * 1024)
+	r.ParseMultipartForm(10 * 1024 * 1024)
 
 	start := r.FormValue("startdate")
 	end := r.FormValue("enddate")
@@ -178,7 +203,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": fmt.Sprintf("%s %s", current_user_claims["first_name"], current_user_claims["last_name"]),
+				"display_name": current_user_claims["display_name"],
 			},
 			"group": map[string]any{
 				"id":   current_group.ID,
@@ -208,6 +233,7 @@ 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 == "" {
@@ -256,13 +282,11 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		fmt.Println(err)
 	} else {
 		for _, m := range members {
-			if email, ok := m.Data["email"].(string); ok {
+			h.emailing.Send("fleets.bookings.creation_admin_alert", m.Data["email"].(string), map[string]string{
-				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)
 
@@ -290,9 +314,9 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 
 	beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
 	if err != nil {
-		beneficiaryresp = &mobilityaccounts.GetAccountResponse{
+		fmt.Println(err)
-			Account: &mobilityaccounts.Account{},
+		w.WriteHeader(http.StatusInternalServerError)
-		}
+		return
 	}
 
 	grouprequest := &groupsmanagement.GetGroupRequest{
@@ -346,10 +370,7 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 
 	sort.Sort(sorting.BookingsByStartdate(bookings))
 
-	vehicles, _ := h.services.GetVehiclesMap()
+	h.Renderer.VehicleBookingsList(w, r, bookings)
-	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

@@ -1,13 +0,0 @@
-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)
-}

handlers/auth/onboarding.go

@@ -37,7 +37,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 		if onboardingmap["admin"].(bool) {
 			groups = append(groups, onboardingmap["group"].(string)+":admin")
 		}
-		display_name := fmt.Sprint(r.FormValue("first_name")) + " " + fmt.Sprint(r.FormValue("last_name"))
+
 		account := &ma.Account{
 			Authentication: ma.AccountAuth{
 				Local: ma.LocalAuth{
@@ -46,9 +46,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 				},
 			},
 			Namespace: "parcoursmob",
-
 			Data: map[string]any{
-				"display_name": display_name,
 				"first_name": r.FormValue("first_name"),
 				"last_name":  r.FormValue("last_name"),
 				"email":      onboardingmap["username"],

main.go

@@ -61,7 +61,6 @@ 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)
@@ -85,8 +84,6 @@ 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)
@@ -100,15 +97,11 @@ 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)
 	application.HandleFunc("/agenda/{eventid}", applicationHandler.AgendaDisplayEvent)
-	///////////////////////////////Code to modify event///////////////////////
-	application.HandleFunc("/agenda/{eventid}/update", applicationHandler.AgendaUpdateEvent)
-	application.HandleFunc("/agenda/{eventid}/delete", applicationHandler.AgendaDeleteEvent)
-
-	/////////////////////////////////////////////////////
 	application.HandleFunc("/agenda/{eventid}/subscribe", applicationHandler.AgendaSubscribeEvent)
 	application.HandleFunc("/directory/", applicationHandler.DirectoryHome)
 
@@ -116,9 +109,10 @@ 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", applicationHandler.GroupsGestion)
-	// application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
+	application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
-	// application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
+	application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
+	application.HandleFunc("/journeys/groups_covoiturage/create/{id}/{groupid}/{memberid}", applicationHandler.UpdateGroupCovoiturage)
 	/****************************************************************/
 
 	/********************Code Supprt Emailing************************/
@@ -140,7 +134,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)
-	appAdmin.HandleFunc("/stats/vehicles", applicationHandler.AdminStatVehicles)
+	//TODO Secure with Middleware checking for modules
 
 	fmt.Println("-> HTTP server listening on", address)
 

renderer/agenda.go

@@ -29,7 +29,6 @@ func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Reque
 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,
@@ -39,25 +38,3 @@ func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Requ
 
 	renderer.Render("agenda create event", w, r, files, state)
 }
-
-func (renderer *Renderer) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request, event any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.agenda.update.files")
-	state := NewState(r, renderer.ThemeConfig, agendaMenu)
-
-	state.ViewState = map[string]any{
-		"event": event,
-	}
-
-	renderer.Render("event_update", w, r, files, state)
-}
-
-func (renderer *Renderer) AgendaDeleteEvent(w http.ResponseWriter, r *http.Request, event any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.agenda.delete.files")
-	state := NewState(r, renderer.ThemeConfig, agendaMenu)
-
-	state.ViewState = map[string]any{
-		"event": event,
-	}
-
-	renderer.Render("event_deleteEvent", w, r, files, state)
-}

renderer/journeys.go

@@ -1,9 +1,40 @@
 package renderer
 
-import "net/http"
+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"
+)
 
 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 {
+	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)
@@ -20,3 +51,100 @@ 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 = 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)
+	viewstate := map[string]any{
+		"deeparture":    depart,
+		"deestination":  arrive,
+		"beneficiaries": beneficiaries,
+		"searched":      searched,
+		"departure":     departure,
+		"destination":   destination,
+	}
+
+	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, number string, groupid string, depart any, arrive any, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account, groups map[string]any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.journeys.display.files")
+	state := NewState(r, renderer.ThemeConfig, journeysMenu)
+
+	viewstate := map[string]any{
+		"beneficiaries": beneficiaries,
+		"searched":      searched,
+		"group":         group,
+		"deeparture":    depart,
+		"deestination":  arrive,
+		"groups":        groups,
+		"ben":           accounts,
+		"number":        number,
+		"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)
+}
+
+func (renderer *Renderer) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.Request, groupid string, memberid string) {
+	files := renderer.ThemeConfig.GetStringSlice("views.journeys.update.files")
+	state := NewState(r, renderer.ThemeConfig, journeysMenu)
+
+	state.ViewState = map[string]any{
+		"groupid":  groupid,
+		"memberid": memberid,
+	}
+	renderer.Render("journeys", w, r, files, state)
+
+}

renderer/members.go

@@ -1,24 +0,0 @@
-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,14 +240,7 @@ 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,13 +67,11 @@ 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, vehiclesMap any, groupsMap any) {
+func (renderer *Renderer) VehicleBookingsList(w http.ResponseWriter, r *http.Request, bookings []storage.Booking) {
 	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,17 +52,3 @@ 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,10 +1,7 @@
 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"
 )
 
@@ -24,19 +21,3 @@ 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
-}