delete reservation and history benef

go.mod

@@ -1,82 +1,69 @@
 module git.coopgo.io/coopgo-apps/parcoursmob
 
-go 1.22.8
+go 1.18
 
-// replace git.coopgo.io/coopgo-platform/mobility-accounts => ../../coopgo-platform/mobility-accounts/
+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/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/
 
 require (
+	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/fogleman/gg v1.3.0
 	github.com/go-playground/validator/v10 v10.11.0
-	github.com/google/uuid v1.6.0
+	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/sessions v1.2.1
 	github.com/paulmach/go.geojson v1.4.0
-	github.com/spf13/viper v1.19.0
+	github.com/spf13/viper v1.15.0
 	gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c
-	go.etcd.io/etcd/client/v3 v3.5.12
+	go.etcd.io/etcd/client/v3 v3.5.6
 	golang.org/x/image v0.5.0
-	golang.org/x/oauth2 v0.23.0
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
-	google.golang.org/grpc v1.68.0
+	google.golang.org/grpc v1.52.0
-	google.golang.org/protobuf v1.35.2
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
-	git.coopgo.io/coopgo-platform/agenda v1.0.0
+	git.coopgo.io/coopgo-platform/agenda v0.0.0-20230310121901-ef3add576f86
-	git.coopgo.io/coopgo-platform/emailing v0.0.0-20241119141913-9836b30191c1
+	git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15
 	git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e
 	git.coopgo.io/coopgo-platform/groups-management v0.0.0-20230310123255-5ef94ee0746c
 	git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20230329105908-a76c0412a386
-	github.com/arran4/golang-ical v0.3.1
-	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/gorilla/securecookie v1.1.1
 	github.com/minio/minio-go/v7 v7.0.43
-	github.com/rs/zerolog v1.33.0
 	github.com/xuri/excelize/v2 v2.7.1
 )
 
 require (
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	ariga.io/atlas v0.13.1 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
-)
-
-require (
-	ariga.io/atlas v0.12.0 // indirect
-	git.coopgo.io/coopgo-platform/diags v0.0.0-20250212093351-64da61495c9d
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.2 // indirect
 	github.com/go-openapi/inflect v0.19.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.10.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.16.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
@@ -85,42 +72,46 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
-	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
-	github.com/rs/xid v1.5.0 // indirect
+	github.com/rs/xid v1.4.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
-	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/twpayne/go-geom v1.5.7 // indirect
+	github.com/tidwall/pretty v1.1.0 // indirect
-	github.com/wneessen/go-mail v0.5.2 // indirect
+	github.com/twpayne/go-geom v1.3.6 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
 	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	github.com/zclconf/go-cty v1.8.0 // indirect
+	github.com/zclconf/go-cty v1.12.1 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.12 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.6 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
-	go.mongodb.org/mongo-driver v1.17.1 // indirect
+	go.mongodb.org/mongo-driver v1.11.4 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/mail.v2 v2.3.1 // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
+	gopkg.in/square/go-jose.v2 v2.5.2-0.20210529014059-a5c7eec3c614 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

handlers/api/cache.go

@@ -2,11 +2,10 @@ package api
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"strconv"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/gorilla/mux"
 )
 
@@ -19,7 +18,7 @@ func (h APIHandler) GetCache(w http.ResponseWriter, r *http.Request) {
 	go func() {
 		d, err := h.cache.Get(cacheid)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusNotFound)
 			ch <- nil
 			return

handlers/api/calendars.go

@@ -1,120 +0,0 @@
-package api
-
-import (
-	"net/http"
-	"time"
-
-	"git.coopgo.io/coopgo-apps/parcoursmob/services"
-	ics "github.com/arran4/golang-ical"
-	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
-)
-
-func (h *APIHandler) icsCalendar(events []services.AgendaEvent) (*ics.Calendar, error) {
-	calendar := ics.NewCalendarFor(h.config.GetString("service_name"))
-
-	for _, e := range events {
-		vevent := ics.NewEvent(e.ID)
-		vevent.SetSummary(e.Name)
-		vevent.SetDescription(e.Description)
-		if e.Allday {
-			vevent.SetAllDayStartAt(e.Startdate)
-			if e.Enddate.After(e.Startdate) {
-				vevent.SetAllDayEndAt(e.Enddate.Add(24 * time.Hour))
-			}
-		} else {
-			timeloc, err := time.LoadLocation("Europe/Paris")
-			if err != nil {
-				log.Error().Err(err).Msg("Tried to load timezone location Europe/Paris. Error. Missing zones in container ?")
-				return nil, err
-			}
-
-			starttime, err := time.ParseInLocation("15:04", e.Starttime, timeloc)
-			if err != nil {
-				return nil, err
-			}
-			startdatetime := time.Date(e.Startdate.Year(), e.Startdate.Month(), e.Startdate.Day(), starttime.Hour(), starttime.Minute(), 0, 0, timeloc)
-
-			endtime, err := time.Parse("15:04", e.Endtime)
-			if err != nil {
-				return nil, err
-			}
-			enddatetime := time.Date(e.Enddate.Year(), e.Enddate.Month(), e.Enddate.Day(), endtime.Hour(), endtime.Minute(), 0, 0, timeloc)
-
-			vevent.SetStartAt(startdatetime)
-			vevent.SetEndAt(enddatetime)
-		}
-		calendar.AddVEvent(vevent)
-	}
-	return calendar, nil
-}
-
-func (h *APIHandler) CalendarGlobal(w http.ResponseWriter, r *http.Request) {
-	enabled := h.config.GetBool("modules.agenda.enabled") && h.config.GetBool("modules.agenda.calendars.global.enabled")
-	if !enabled {
-		log.Error().Msg("global calendar not activated in configuration")
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-
-	events, err := h.services.GetAgendaEvents()
-	if err != nil {
-		log.Error().Err(err).Msg("error retrieving agenda events")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	calendar, err := h.icsCalendar(events)
-	if err != nil {
-		log.Error().Err(err).Msg("error while creating ics calendar")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "text/calendar")
-	w.Write([]byte(calendar.Serialize()))
-}
-
-func (h *APIHandler) CalendarOrganizations(w http.ResponseWriter, r *http.Request) {
-	enabled := h.config.GetBool("modules.agenda.enabled") && h.config.GetBool("modules.agenda.calendars.organizations.enabled")
-	if !enabled {
-		log.Error().Msg("organizations calendar not activated in configuration")
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-
-	// TODO set additional calendar rights in group configuration to prevent default behavior ?
-
-	vars := mux.Vars(r)
-	groupid := vars["groupid"]
-
-	events, err := h.services.GetAgendaEvents()
-	if err != nil {
-		log.Error().Err(err).Msg("error retrieving agenda events")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	filteredEvents := []services.AgendaEvent{}
-
-	for _, e := range events {
-		for _, g := range e.Owners {
-			if g == groupid {
-				filteredEvents = append(filteredEvents, e)
-				continue
-			}
-		}
-	}
-
-	calendar, err := h.icsCalendar(filteredEvents)
-	if err != nil {
-		log.Error().Err(err).Msg("error while creating ics calendar")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Header().Set("Content-Type", "text/calendar")
-	w.Write([]byte(calendar.Serialize()))
-}

handlers/api/export.go

@@ -8,7 +8,6 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 )
 
 type FlatMaps []map[string]any
@@ -49,7 +48,7 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {
 
 	d, err := h.cache.Get(cacheid)
 	if err != nil {
-		log.Error().Err(err).Msg("Error getting cache")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@@ -57,6 +56,7 @@ func (h APIHandler) CacheExport(w http.ResponseWriter, r *http.Request) {
 	if data, ok := d.([]any); ok {
 
 		flatmaps := FlatMaps{}
+		//fmt.Println(data)
 
 		for _, v := range data {
 			fm := map[string]any{}
@@ -90,7 +90,7 @@ func flatten(prefix string, src map[string]any, dest map[string]any) {
 				dest[prefix+k+"."+strconv.Itoa(i)] = child[i]
 			}
 		default:
-			// log.Trace().Str("key", prefix+k).Any("value", v).Msg("")
+			fmt.Println(prefix+k, " : ", v)
 			dest[prefix+k] = v
 		}
 	}

handlers/api/geo.go

@@ -3,12 +3,13 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 )
 
 func (h *APIHandler) GeoAutocomplete(w http.ResponseWriter, r *http.Request) {
+
 	pelias := h.config.GetString("geo.pelias.url")
 
 	t, ok := r.URL.Query()["text"]
@@ -28,7 +29,8 @@ func (h *APIHandler) GeoAutocomplete(w http.ResponseWriter, r *http.Request) {
 
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
+
 	if err != nil {
 		log.Fatal(err)
 	}

handlers/api/oidc.go

@@ -2,15 +2,15 @@ package api
 
 import (
 	"context"
+	"fmt"
 	"net/http"
-
-	"github.com/rs/zerolog/log"
 )
 
 func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	oauth2Token, err := h.idp.OAuth2Config.Exchange(context.Background(), r.URL.Query().Get("code"))
 	if err != nil {
-		log.Error().Err(err).Msg("Exchange error")
+		fmt.Println("Exchange error")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -18,14 +18,15 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	// Extract the ID Token from OAuth2 token.
 	rawIDToken, ok := oauth2Token.Extra("id_token").(string)
 	if !ok {
-		log.Error().Msg("Cannot retrieve ID token")
+		fmt.Println("issue retrieving token")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	_, err = h.idp.TokenVerifier.Verify(context.Background(), rawIDToken)
 	if err != nil {
-		log.Error().Err(err).Msg("Not able to verify token")
+		fmt.Println("not able to verify token")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
@@ -41,7 +42,7 @@ func (h APIHandler) OAuth2Callback(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if err = session.Save(r, w); err != nil {
-		log.Error().Err(err).Msg("Cannot save session")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

handlers/application/administration.go

@@ -24,7 +24,6 @@ import (
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -102,14 +101,7 @@ func (h *ApplicationHandler) Administration(w http.ResponseWriter, r *http.Reque
 	}()
 	wg.Wait()
 	if accountsErr != nil || beneficiariesErr != nil || bookingsErr != nil || groupsResponseErr != nil || eventsResponseErr != nil {
-		log.Error().
+		fmt.Println(accountsErr, beneficiariesErr, bookingsErr, groupsResponseErr, eventsResponseErr, groupsBatchErr)
-			Any("accounts error", accountsErr).
-			Any("beneficiaries error", beneficiariesErr).
-			Any("bookings error", bookingsErr).
-			Any("groups response error", groupsResponseErr).
-			Any("events response error", eventsResponseErr).
-			Any("groups batch error", groupsBatchErr).
-			Msg("Error in retrieving administration data")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -122,7 +114,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 
 		if r.FormValue("name") == "" {
 
-			log.Error().Str("name", r.FormValue("name")).Msg("Invalid name")
+			fmt.Println("invalid name")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -149,7 +141,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("Cannot create PB struct from data map")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -171,7 +163,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 		go func() {
 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 			if err != nil {
-				log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -180,7 +172,7 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 		go func() {
 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_role)
 			if err != nil {
-				log.Error().Err(err).Msg("Issue in Groups management service - AddGroup")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -201,14 +193,14 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	groupmembers, admins, err := h.groupmembers(groupid)
 	if err != nil {
-		log.Error().Err(err).Msg("inssue retrieving group members")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -224,44 +216,52 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 		accountresp *accounts.GetAccountUsernameResponse
 		err         error
 	)
+	go func() {
 		groupresp, err = h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
 			Id:        groupid,
 			Namespace: "parcoursmob_organizations",
 		})
+
 		if err != nil {
-		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
+	}()
 	r.ParseForm()
 
+	go func() {
 		accountresp, err = h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
 			Username:  r.FormValue("username"),
 			Namespace: "parcoursmob",
 		})
 		if err == nil {
-		log.Print("account exists")
 			// Account already exists : adding the existing account to admin list
 			account := accountresp.Account.ToStorageType()
-		// account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid)
+			account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid)
 			account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid+":admin")
 
 			as, _ := accounts.AccountFromStorageType(&account)
 
-		if _, err = h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), &accounts.UpdateDataRequest{Account: as}); err != nil {
+			_, err = h.services.GRPC.MobilityAccounts.UpdateData(
-			log.Error().Err(err).Msg("could not set groups to user account")
+				context.TODO(),
-			w.WriteHeader(http.StatusInternalServerError)
+				&accounts.UpdateDataRequest{
-			return
+					Account: as,
-		}
+				},
+			)
+
+			fmt.Println(err)
 
 			data := map[string]any{
 				"group": groupresp.Group.ToStorageType().Data["name"],
 			}
 
 			if err := h.emailing.Send("onboarding.existing_administrator", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("Cannot send email")
+				fmt.Println(err)
 			}
 
+			http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
+			return
 		} else {
 			// Onboard now administrator
 			onboarding := map[string]any{
@@ -272,7 +272,7 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 
 			b := make([]byte, 16)
 			if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			log.Error().Err(err).Msg("Issue creating random bytes")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -286,25 +286,40 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 			}
 
 			if err := h.emailing.Send("onboarding.new_administrator", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("Cannot send email")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
 		}
 
 		http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
+		return
+	}()
 }
-
 func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	groupid := vars["groupid"]
-	group, err := h.services.GetGroup(groupid)
+	var (
+		group storage.Group
+	)
+	groupCh := make(chan storage.Group)
+	go func() {
+		groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
+			Id:        groupid,
+			Namespace: "parcoursmob_organizations",
+		})
+
 		if err != nil {
-		log.Error().Err(err).Msg("Issue in Groups management service - GetGroup")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
+		group := groupresp.Group.ToStorageType()
+		groupCh <- group
+	}()
 	r.ParseForm()
+	go func() {
+		group = <-groupCh
 		accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
 			Username:  r.FormValue("username"),
 			Namespace: "parcoursmob",
@@ -326,13 +341,12 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 			}
 
 			if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("error sending email onboarding.existing_member")
 			}
 
-		// http.Redirect(w, r, "/app/group/settings", http.StatusFound)
+			http.Redirect(w, r, "/app/group/settings", http.StatusFound)
-		// return
+			return
 		} else {
-		// Onboard new administrator
+			// Onboard now administrator
 			onboarding := map[string]any{
 				"username": r.FormValue("username"),
 				"group":    group.ID,
@@ -353,12 +367,13 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 			}
 
 			if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("error sending email onboarding.new_member")
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
 		}
+	}()
 	http.Redirect(w, r, "/app/administration/groups/"+group.ID, http.StatusFound)
+	return
 }
 
 func filteVehicle(r *http.Request, v *fleets.Vehicle) bool {
@@ -379,6 +394,7 @@ func filteVehicle(r *http.Request, v *fleets.Vehicle) bool {
 }
 
 func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Request) {
+
 	bookings := []fleetsstorage.Booking{}
 	administrators := []string{}
 	reequest := &fleets.GetVehiclesRequest{
@@ -386,7 +402,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	}
 
@@ -424,7 +440,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 			Groupids: administrators,
 		})
 		if err != nil {
-			log.Error().Err(err).Msg("Issue in Groups management service - GetGroupsBatch")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -440,6 +456,7 @@ func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Req
 }
 
 func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Request) {
+
 	vehicles := map[string]fleetsstorage.Vehicle{}
 	bookings := []fleetsstorage.Booking{}
 
@@ -448,7 +465,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Fleets service - GetVehicles")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -474,7 +491,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 		Namespaces: []string{"parcoursmob_organizations"},
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Groups management service - GetGroups")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -487,7 +504,7 @@ func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Req
 		Accountids: beneficiaries_ids,
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Mobility accounts service - GetAccountsBatch")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -516,7 +533,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
 	members, err := h.members()
 	if err != nil {
 		if err != nil {
-			log.Error().Err(err).Msg("Cannot get members")
+			fmt.Println(err)
 			return nil, nil, err
 		}
 	}
@@ -542,7 +559,7 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
 func (h ApplicationHandler) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request) {
 	beneficiaries, err := h.services.GetBeneficiaries()
 	if err != nil {
-		log.Error().Err(err).Msg("Cannot get beneficiaries")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -555,8 +572,9 @@ func (h ApplicationHandler) AdminStatEvents(w http.ResponseWriter, r *http.Reque
 	resp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
 		Namespaces: []string{"parcoursmob_dispositifs"},
 	})
+
 	if err != nil {
-		log.Error().Err(err).Msg("Issue in Agenda service - GetEvents")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

handlers/application/agenda.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"sort"
 	"strconv"
@@ -14,15 +13,12 @@ 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"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -47,7 +43,7 @@ func (h *ApplicationHandler) AgendaHome(w http.ResponseWriter, r *http.Request)
 	})
 
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -82,7 +78,7 @@ func (h *ApplicationHandler) AgendaHistory(w http.ResponseWriter, r *http.Reques
 	})
 
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -123,13 +119,11 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 
 		eventForm, err := parseEventsForm(r)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
-		log.Debug().Any("eventFrom", eventForm).Msg("Form data submitted to create event")
-
 		data, _ := structpb.NewStruct(map[string]any{
 			"address": eventForm.Address,
 		})
@@ -153,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 {
-			log.Error().Err(err).Msg("")
+			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 {
-				log.Error().Err(err).Msg("Error parsing multipart form")
-				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 {
-					log.Error().Err(err).Msg("Error uploading file")
-					w.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			} else if err != http.ErrMissingFile {
-				log.Error().Err(err).Msg("Error retrieving file")
-				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.Renderer.AgendaCreateEvent(w, r, h.config.GetStringSlice("modules.agenda.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
 }
 
 func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request) {
@@ -211,7 +170,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 
 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -222,7 +181,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 
 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -249,7 +208,7 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -278,32 +237,27 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 		}
 	}
 
-	documents := h.filestorage.List(filestorage.PREFIX_AGENDA + "/" + eventid)
+	h.Renderer.AgendaDisplayEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
-
-	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)
 }
 
 func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) {
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 	vars := mux.Vars(r)
 	eventid := vars["eventid"]
-
+	fmt.Println(eventid)
 	if err := r.ParseForm(); err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -323,7 +277,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 	}
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -336,7 +290,7 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 
 	_, err = h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -412,7 +366,7 @@ func contains(s []*agenda.Subscription, e string) bool {
 	return false
 }
 
-// /////////////////////////////Update Event/////////////////////////////////////////
+///////////////////////////////Update Event/////////////////////////////////////////
 func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) {
 	adm := strings.Split(r.URL.Path, "/")
 	eventID := adm[3]
@@ -422,7 +376,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
 
 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -437,7 +391,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
 
 		eventForm, err := parseEventsForm(r)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -468,7 +422,7 @@ func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Re
 		resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -489,7 +443,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
 
 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -519,7 +473,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
 		_, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -530,7 +484,7 @@ func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Re
 	h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType())
 }
 
-// /////////////////////////Delete subscriber///////////////////////////////
+///////////////////////////Delete subscriber///////////////////////////////
 func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	eventId := vars["eventid"]
@@ -546,7 +500,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 
 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -568,14 +522,14 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -608,7 +562,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -629,18 +583,18 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 
 		// récupérer l'adresse mail de l'utilisateur qui a créé l'événement
 		mail := s_b_email
-		log.Debug().Str("mail", mail).Msg("Email content")
+		fmt.Println(mail)
 
 		_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 
 		if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -651,7 +605,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
 	h.Renderer.AgendaDeleteSubscribeEvent(w, r, eventId)
 }
 
-// //////////////////////////////////////////////////////
+////////////////////////////////////////////////////////
 // /////////////////////History Event////////////////////////
 func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
@@ -662,7 +616,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
 
 	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -673,7 +627,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
 
 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -700,6 +654,7 @@ func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.R
 
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -730,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 {
-		log.Error().Err(err).Msg("")
-		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 {
-		log.Error().Err(err).Msg("")
-		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 {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", info.ContentType)
-	if _, err = io.Copy(w, file); err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventID), http.StatusFound)
-
-}

handlers/application/application.go

@@ -10,7 +10,7 @@ import (
 	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	"git.coopgo.io/coopgo-platform/emailing"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
-	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/coreos/go-oidc"
 	"github.com/spf13/viper"
 )
 

handlers/application/beneficiaries.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"image/png"
 	"io"
+	"log"
 	"net/http"
 	"sort"
 	"strconv"
@@ -27,11 +28,8 @@ import (
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
-	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -111,7 +109,7 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
 
 	accounts, err := h.beneficiaries(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -126,7 +124,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 {
-		log.Error().Msg("Create beneficiary : could not find group")
+		fmt.Println("Create beneficiary : could not find group")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -137,14 +135,14 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
 
 		dataMap, err := parseBeneficiariesForm(r)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -159,7 +157,7 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
 		resp, err := h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -172,7 +170,7 @@ func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Re
 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -196,7 +194,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -207,21 +205,24 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 	subcriptionresp, err := h.services.GRPC.Agenda.GetSubscriptionByUser(context.TODO(), subscriptionrequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println("icii")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	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 {
-			log.Error().Err(err).Msg("")
+			fmt.Println("iciiiiii")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -235,7 +236,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 	}
 	bookingsresp, err := h.services.GRPC.Fleets.GetDriverBookings(context.TODO(), bookingsrequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -271,6 +272,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		}
 
 		events_list = append(events_list, event)
+
 	}
 
 	var status_booking int
@@ -283,7 +285,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 			GetVehiculeResp, err := h.services.GRPC.Fleets.GetVehicle(context.Background(), GetVehiculeRequest)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -308,30 +310,11 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 			}
 
 			events_list = append(events_list, event)
+
 		}
 	}
 	sortByDate(events_list)
 
-	diag := []diagsstorage.Diag{}
-
-	diagsrequest := &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_beneficiaries"},
-	}
-
-	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	for _, d := range diagsresp.Diags {
-		diagData := d.Data.AsMap()
-		if beneficiary, ok := diagData["beneficiary"].(string); ok && beneficiary == beneficiaryID {
-			diag = append(diag, d.ToStorageType())
-		}
-	}
-	
 	groupsrequest := &groupsmanagement.GetGroupsRequest{
 		Namespaces: []string{"parcoursmob_organizations"},
 		Member:     beneficiaryID,
@@ -339,7 +322,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 
 	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), groupsrequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	}
 
 	organizations := []any{}
@@ -350,11 +333,7 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	diagsAny := make([]any, len(diag))
+	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list)
-	for i, d := range diag {
-		diagsAny[i] = d
-	}
-	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents, events_list, diagsAny)
 }
 
 func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request) {
@@ -365,14 +344,14 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
 
 		dataMap, err := parseBeneficiariesForm(r)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -388,7 +367,7 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
 		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -404,7 +383,7 @@ func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Re
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -425,7 +404,7 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -438,13 +417,13 @@ func (h *ApplicationHandler) BeneficiaryPicture(w http.ResponseWriter, r *http.R
 
 	buffer := new(bytes.Buffer)
 	if err := png.Encode(buffer, picture); err != nil {
-		log.Error().Err(err).Msg("unable to encode image.")
+		log.Println("unable to encode image.")
 	}
 
 	w.Header().Set("Content-Type", "image/png")
 	w.Header().Set("Content-Length", strconv.Itoa(len(buffer.Bytes())))
 	if _, err := w.Write(buffer.Bytes()); err != nil {
-		log.Error().Err(err).Msg("unable to write image.")
+		log.Println("unable to write image.")
 	}
 }
 
@@ -460,7 +439,7 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 
 	file, header, err := r.FormFile("file-upload")
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return
 	}
 	defer file.Close()
@@ -472,10 +451,8 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 		"name": document_name,
 	}
 
-	log.Debug().Any("metadata", metadata).Msg("Metadata")
-
 	if err := h.filestorage.Put(file, filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s_%s", beneficiaryID, fileid, header.Filename), header.Size, metadata); err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -491,14 +468,14 @@ func (h *ApplicationHandler) BeneficiaryDocumentDownload(w http.ResponseWriter,
 
 	file, info, err := h.filestorage.Get(filestorage.PREFIX_BENEFICIARIES, fmt.Sprintf("%s/%s", beneficiaryID, document))
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	w.Header().Set("Content-Type", info.ContentType)
 	if _, err = io.Copy(w, file); err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

handlers/application/dashboard.go

@@ -2,6 +2,7 @@ package application
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"sort"
 
@@ -9,11 +10,8 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
-	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
-	fleetstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
@@ -33,7 +31,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -56,7 +54,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 
 	members, _, err := h.groupmembers(group.ID)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -78,18 +76,6 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 
 	sort.Sort(sorting.EventsByStartdate(events))
 
-	bookings := []fleetstorage.Booking{}
+	h.Renderer.Dashboard(w, r, accounts, count, count_members, events)
-
-	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)
 
 }

handlers/application/diags.go

@@ -1,642 +0,0 @@
-package application
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-
-	// "io"
-	"net/http"
-	// "strconv"
-	"strings"
-	"time"
-
-	"git.coopgo.io/coopgo-apps/parcoursmob/services"
-	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
-	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-
-	// filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
-	diagsstorage "git.coopgo.io/coopgo-platform/diags/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/google/uuid"
-	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
-	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
-)
-
-type DiagsForm struct {
-	Name            string          `json:"name" validate:"required"`
-	Namespace       string          `json:"namespace" validate:"required"`
-	JsonSchema      string          `json:"json_schema"`
-	UiSchema        string          `json:"ui_schema"`
-	Data            map[string]any  `json:"data"`
-	Deleted         bool            `json:"deleted"`
-	Diagdate		*time.Time      `json:"diagdate"`
-	Owners		  	[]string        `json:"owners"`
-}
-
-func (h *ApplicationHandler) DiagsHome(w http.ResponseWriter, r *http.Request) {
-	groupID := r.Context().Value(identification.GroupKey).(storage.Group).ID
-
-	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
-	})
-
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	responses := []diagsstorage.Diag{}
-
-	groupids := []string{}
-	for _, e := range resp.Diags {
-		groupids = append(groupids, e.Owners...)
-		responses = append(responses, e.ToStorageType())
-	}
-
-	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
-		Groupids: groupids,
-	})
-	groups := map[string]any{}
-
-	if err == nil {
-		for _, g := range groupsresp.Groups {
-			groups[g.Id] = g.ToStorageType()
-		}
-	}
-
-	filteredDiags := []diagsstorage.Diag{}
-    for _, diag := range responses {
-		for _, owner := range diag.Owners {
-			if string(owner) == groupID {
-				filteredDiags = append(filteredDiags, diag)
-				log.Debug().Msgf("Diag %s added to filtered list", diag.ID)
-				break
-			}
-		}
-        }
-
-	h.Renderer.DiagsHome(w, r, filteredDiags, groups)
-}
-
-func (h *ApplicationHandler) DiagsHistory(w http.ResponseWriter, r *http.Request) {
-	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
-	})
-
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	responses := []diagsstorage.Diag{}
-
-	for _, e := range resp.Diags {
-		if e.Deleted {
-			responses = append(responses, e.ToStorageType())
-		}
-	}
-
-	h.Renderer.DiagsHistory(w, r, responses)
-}
-
-func (h *ApplicationHandler) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	beneficiaryID := vars["beneficiaryid"]
-
-	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
-		log.Error().Msg("Diags service is not initialized")
-		http.Error(w, "Internal server error", http.StatusInternalServerError)
-		return
-	}
-	
-
-	if r.Method == http.MethodPost {
-		g := r.Context().Value(identification.GroupKey)
-		if g == nil {
-			http.Error(w, "Missing group information", http.StatusBadRequest)
-			return
-		}
-
-		group := g.(storage.Group)
-
-		diagForm, err := parseDiagsForm(r)
-		if err != nil {
-			log.Error().Err(err).Msg("Invalid form data")
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		data, err := structpb.NewStruct(map[string]any{
-			"beneficiary": beneficiaryID,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create protobuf struct")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		request := &diags.CreateDiagRequest{
-			Diag: &diags.Diag{
-				Name:       diagForm.Name,
-				Namespace:  diagForm.Namespace,
-				JsonSchema: diagForm.JsonSchema,
-				UiSchema:   diagForm.UiSchema,
-				Data:       data,
-				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
-				Owners:	 	[]string{group.ID},
-			},
-		}
-
-		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create diagnostic")
-			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 {
-				log.Error().Err(err).Msg("Error parsing multipart form")
-				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_DIAGS, fmt.Sprintf("%s/%s_%s", resp.Diag.Id, fileid, header.Filename), header.Size, metadata); err != nil {
-					log.Error().Err(err).Msg("Error uploading file")
-					w.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			} else if err != http.ErrMissingFile {
-				log.Error().Err(err).Msg("Error retrieving file")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-		}
-		
-		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
-		return
-	}
-
-	h.Renderer.BeneficiariesCreateDiag(w, r, beneficiaryID, h.config.GetStringSlice("modules.diags.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
-}
-
-func (h *ApplicationHandler) VehiclesCreateDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	vehicleID := vars["vehicleid"]
-
-	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
-		log.Error().Msg("Diags service is not initialized")
-		http.Error(w, "Internal server error", http.StatusInternalServerError)
-		return
-	}
-	
-
-	if r.Method == http.MethodPost {
-		g := r.Context().Value(identification.GroupKey)
-		if g == nil {
-			http.Error(w, "Missing group information", http.StatusBadRequest)
-			return
-		}
-
-		diagForm, err := parseDiagsForm(r)
-		if err != nil {
-			log.Error().Err(err).Msg("Invalid form data")
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
-
-		data, err := structpb.NewStruct(map[string]any{
-			"vehicle": vehicleID,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create protobuf struct")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		group := g.(storage.Group)
-
-		request := &diags.CreateDiagRequest{
-			Diag: &diags.Diag{
-				Name:       diagForm.Name,
-				Namespace:  diagForm.Namespace,
-				JsonSchema: diagForm.JsonSchema,
-				UiSchema:   diagForm.UiSchema,
-				Data:       data,
-				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
-				Owners:	 	[]string{group.ID},
-			},
-		}
-
-		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create diagnostic")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
-		return
-	}
-
-	h.Renderer.VehiclesCreateDiag(w, r, vehicleID)
-}
-
-func (h *ApplicationHandler) BookingsCreateDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	bookingID := vars["bookingid"]
-
-	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
-		log.Error().Msg("Diags service is not initialized")
-		http.Error(w, "Internal server error", http.StatusInternalServerError)
-		return
-	}
-	
-
-	if r.Method == http.MethodPost {
-		g := r.Context().Value(identification.GroupKey)
-		if g == nil {
-			http.Error(w, "Missing group information", http.StatusBadRequest)
-			return
-		}
-
-		diagForm, err := parseDiagsForm(r)
-		if err != nil {
-			log.Error().Err(err).Msg("Invalid form data")
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
-
-		data, err := structpb.NewStruct(map[string]any{
-			"booking": bookingID,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create protobuf struct")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		group := g.(storage.Group)
-
-		request := &diags.CreateDiagRequest{
-			Diag: &diags.Diag{
-				Name:       diagForm.Name,
-				Namespace:  diagForm.Namespace,
-				JsonSchema: diagForm.JsonSchema,
-				UiSchema:   diagForm.UiSchema,
-				Data:       data,
-				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
-				Owners:	 	[]string{group.ID},
-			},
-		}
-
-		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create diagnostic")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
-		return
-	}
-
-	h.Renderer.BookingsCreateDiag(w, r, bookingID)
-}
-
-func (h *ApplicationHandler) VehicleBookingsCreateDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	bookingID := vars["bookingid"]
-
-	if h.services == nil || (h.services.GRPC == services.GRPCServices{}) || h.services.GRPC.Diags == nil {
-		log.Error().Msg("Diags service is not initialized")
-		http.Error(w, "Internal server error", http.StatusInternalServerError)
-		return
-	}
-	
-
-	if r.Method == http.MethodPost {
-		g := r.Context().Value(identification.GroupKey)
-		if g == nil {
-			http.Error(w, "Missing group information", http.StatusBadRequest)
-			return
-		}
-
-		diagForm, err := parseDiagsForm(r)
-		if err != nil {
-			log.Error().Err(err).Msg("Invalid form data")
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		log.Debug().Interface("diagForm", diagForm).Msg("Form data parsed")
-
-		data, err := structpb.NewStruct(map[string]any{
-			"booking": bookingID,
-		})
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create protobuf struct")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		group := g.(storage.Group)
-
-		request := &diags.CreateDiagRequest{
-			Diag: &diags.Diag{
-				Name:       diagForm.Name,
-				Namespace:  diagForm.Namespace,
-				JsonSchema: diagForm.JsonSchema,
-				UiSchema:   diagForm.UiSchema,
-				Data:       data,
-				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
-				Owners:	 	[]string{group.ID},
-			},
-		}
-
-		resp, err := h.services.GRPC.Diags.CreateDiag(context.TODO(), request)
-		if err != nil {
-			log.Error().Err(err).Msg("Failed to create diagnostic")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
-		return
-	}
-
-	h.Renderer.VehicleBookingsCreateDiag(w, r, bookingID)
-}
-
-func (h *ApplicationHandler) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagid := vars["diagid"]
-
-	request := &diags.GetDiagRequest{
-		Id: diagid,
-	}
-
-	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	g := r.Context().Value(identification.GroupKey)
-	if g == nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-
-	documents := h.filestorage.List(filestorage.PREFIX_DIAGS + "/" + diagid)
-
-	diags_file_types := h.config.GetStringSlice("modules.diags.documents_types")
-	file_types_map := h.config.GetStringMapString("storage.files.file_types")
-
-	h.Renderer.DiagsDisplayDiag(w, r, resp.Diag.ToStorageType(), diags_file_types, file_types_map, documents)
-}
-
-func parseDiagsForm(r *http.Request) (*DiagsForm, error) {
-	if err := r.ParseForm(); err != nil {
-		return nil, err
-	}
-
-	formData := &DiagsForm{
-		Name:       r.PostFormValue("name"),
-		Namespace:  r.PostFormValue("namespace"), // Récupère le namespace
-		JsonSchema: r.PostFormValue("json_schema"),
-		UiSchema:   r.PostFormValue("ui_schema"),
-		Deleted:    false,
-	}
-
-	if formData.Name == "" || formData.Namespace == "" {
-		return nil, errors.New("missing required fields: 'name' or 'namespace'")
-	}
-
-	// Gestion de la valeur JSON dans `data`
-	if rawData := r.PostFormValue("data"); rawData != "" {
-		data := map[string]any{}
-		if err := json.Unmarshal([]byte(rawData), &data); err != nil {
-			return nil, errors.New("invalid 'data' field: must be a valid JSON object")
-		}
-		formData.Data = data
-	}
-
-	return formData, nil
-}
-
-func (h *ApplicationHandler) DiagUpdate(w http.ResponseWriter, r *http.Request) {
-	adm := strings.Split(r.URL.Path, "/")
-	diagID := adm[3]
-	request := &diags.GetDiagRequest{
-		Id: diagID,
-	}
-
-	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		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)
-
-		diagForm, err := parseDiagsForm(r)
-		if err != nil {
-			log.Error().Err(err).Msg("")
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		data, _ := structpb.NewStruct(map[string]any{})
-
-		request := &diags.UpdateDiagRequest{
-			Diag: &diags.Diag{
-				Namespace:      diagForm.Namespace,
-				Id:             diagID,
-				Name:           diagForm.Name,
-				JsonSchema:     diagForm.JsonSchema,
-				UiSchema: 	 	diagForm.UiSchema,
-				Data:           data,
-				Diagdate: 	 	timestamppb.New(time.Now()),
-				Owners: 		[]string{group.ID},
-			},
-		}
-
-		resp, err := h.services.GRPC.Diags.UpdateDiag(context.TODO(), request)
-
-		if err != nil {
-			log.Error().Err(err).Msg("")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
-		return
-	}
-	h.Renderer.DiagUpdate(w, r, resp.Diag.ToStorageType())
-}
-
-func (h *ApplicationHandler) DiagDelete(w http.ResponseWriter, r *http.Request) {
-
-	vars := mux.Vars(r)
-	diagID := vars["diagid"]
-	request := &diags.GetDiagRequest{
-		Id: diagID,
-	}
-
-	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	if r.Method == "POST" {
-
-		request := &diags.UpdateDiagRequest{
-			Diag: &diags.Diag{
-				Namespace:      resp.Diag.Namespace,
-				Id:             resp.Diag.Id,
-				Name:           resp.Diag.Name,
-				JsonSchema:     resp.Diag.JsonSchema,
-				UiSchema:	 	resp.Diag.UiSchema,
-				Data:           resp.Diag.Data,
-				Deleted:        true,
-				Diagdate: 	 	resp.Diag.Diagdate,
-			},
-		}
-
-		_, err := h.services.GRPC.Diags.UpdateDiag(context.TODO(), request)
-
-		if err != nil {
-			log.Error().Err(err).Msg("")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		http.Redirect(w, r, "/app/diags/", http.StatusFound)
-		return
-	}
-	h.Renderer.DiagDelete(w, r, resp.Diag.ToStorageType())
-}
-
-func (h *ApplicationHandler) DiagsHistoryDiag(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagId := vars["diagid"]
-	request := &diags.GetDiagRequest{
-		Id: diagId,
-	}
-
-	resp, err := h.services.GRPC.Diags.GetDiag(context.TODO(), request)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	h.Renderer.DiagsHistoryDiag(w, r, resp.Diag.ToStorageType())
-}
-
-// //// ADD DOCUMENTS //////
-func (h *ApplicationHandler) DiagsDocuments(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagID := vars["diagid"]
-
-	//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 {
-		log.Error().Err(err).Msg("")
-		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_DIAGS, fmt.Sprintf("%s/%s_%s", diagID, fileid, header.Filename), header.Size, metadata); err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
-
-}
-
-func (h *ApplicationHandler) DiagsDocumentDownload(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagID := vars["diagid"]
-	document := vars["document"]
-
-	file, info, err := h.filestorage.Get(filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s", diagID, document))
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", info.ContentType)
-	if _, err = io.Copy(w, file); err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
-
-}

handlers/application/group.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
+	"fmt"
 	"io"
 	"net/http"
 	"time"
@@ -11,7 +12,6 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	"github.com/rs/zerolog/log"
 )
 
 func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http.Request) {
@@ -26,7 +26,7 @@ func (h *ApplicationHandler) GroupSettingsDisplay(w http.ResponseWriter, r *http
 	members, err := h.members()
 	if err != nil {
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -81,16 +81,14 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
 			},
 		)
 
-		if err != nil {
+		fmt.Println(err)
-			log.Error().Err(err).Msg("")
-		}
 
 		data := map[string]any{
 			"group": group.Data["name"],
 		}
 
 		if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 
 		http.Redirect(w, r, "/app/group/settings", http.StatusFound)
@@ -105,7 +103,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
 
 		b := make([]byte, 16)
 		if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -119,7 +117,7 @@ func (h *ApplicationHandler) GroupSettingsInviteMember(w http.ResponseWriter, r
 		}
 
 		if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

handlers/application/group_module.go

@@ -14,7 +14,6 @@ import (
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -46,7 +45,7 @@ func (h *ApplicationHandler) Groups(w http.ResponseWriter, r *http.Request) {
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -74,12 +73,14 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
 		r.ParseForm()
 
 		if r.FormValue("name") == "" {
-			log.Error().Msg("Invalid name")
+
+			fmt.Println("invalid name")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 		if r.FormValue("type") == "" {
-			log.Error().Msg("Invalid type")
+
+			fmt.Println("invalid type")
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -95,7 +96,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -110,7 +111,7 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
 
 		_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -144,7 +145,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -185,7 +186,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 
 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -200,7 +201,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -211,7 +212,7 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 
 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}

handlers/application/journeys.go

@@ -17,7 +17,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	geojson "github.com/paulmach/go.geojson"
-	"github.com/rs/zerolog/log"
 	"gitlab.scity.coop/maas/navitia-golang"
 	"gitlab.scity.coop/maas/navitia-golang/types"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -38,7 +37,9 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 	carpoolCh := make(chan any, 1)
 	locTime, errTime := time.LoadLocation("Europe/Paris")
 	if errTime != nil {
-		log.Panic().Err(errTime).Msg("Tried to load timezone location Europe/Paris. Error. Missing zones in container ?")
+		fmt.Println("Loading timezone location Europe/Paris error : ")
+		fmt.Println("Missing zones in container ? ")
+		panic(errTime)
 	}
 
 	departuredate := r.FormValue("departuredate")
@@ -65,14 +66,14 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 
 		departuregeo, err = geojson.UnmarshalFeature([]byte(departure))
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
 		destinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -84,7 +85,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 				"https://api.navitia.io/v1",
 				&http.Client{})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusBadRequest)
 				navitiaCh <- nil
 				return
@@ -99,7 +100,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 
 			journeys, err = session.Journeys(context.Background(), request)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				// w.WriteHeader(http.StatusBadRequest)
 				// return
 			}
@@ -114,7 +115,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 			client := &http.Client{}
 			req, err := http.NewRequest("GET", carpoolrequest, nil)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 			}
 
 			req.URL.RawQuery = fmt.Sprintf(
@@ -126,13 +127,13 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 			req.Header.Set("X-API-KEY", "123456")
 			resp, err := client.Do(req)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 			}
 
 			if err == nil && resp.StatusCode == http.StatusOK {
 				err = json.NewDecoder(resp.Body).Decode(&carpoolresults)
 				if err != nil {
-					log.Error().Err(err).Msg("")
+					fmt.Println(err)
 				}
 
 				if carpoolresults == nil {
@@ -151,7 +152,7 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 			}
 			vehicleresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), vehiclerequest)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 			}
 			for _, vehicle := range vehicleresp.Vehicles {
@@ -189,7 +190,7 @@ func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Reques
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -240,7 +241,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 
 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -257,14 +258,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 
 				departurgeo, err = geojson.UnmarshalFeature([]byte(departure))
 				if err != nil {
-					log.Error().Err(err).Msg("")
+					fmt.Println(err)
 					w.WriteHeader(http.StatusBadRequest)
 					return
 				}
 
 				dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
 				if err != nil {
-					log.Error().Err(err).Msg("")
+					fmt.Println(err)
 					w.WriteHeader(http.StatusBadRequest)
 					return
 				}
@@ -285,14 +286,14 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 
 			if r.FormValue("name") == "" {
 
-				log.Error().Msg("invalid name")
+				fmt.Println("invalid name")
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
 
 			if r.FormValue("number") == "" {
 
-				log.Error().Msg("invalid number of personne")
+				fmt.Println("invalid number of personne")
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
@@ -329,7 +330,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 
 			data, err := structpb.NewValue(dataMap)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -344,7 +345,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 
 			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -356,7 +357,7 @@ func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request)
 	}
 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -375,7 +376,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -412,7 +413,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 
 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -427,7 +428,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -453,7 +454,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 		id := uuid.NewString()
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -469,7 +470,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 
 		_, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -484,7 +485,7 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 	// }
 	// s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp)
 	// if err != nil {
-	// 	log.Error().Err(err).Msg("")
+	// 	fmt.Println(err)
 	// 	w.WriteHeader(http.StatusInternalServerError)
 	// 	return
 	// }
@@ -498,10 +499,12 @@ func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *h
 	//////////find all groups to store the adresse passenger///////
 	///////////try to optimise the code ////////////////////////////
 	groups, _ := h.services.GetGroupsMemberMap(resp.Group.ToStorageType().ID)
+	//fmt.Println(groups)
 	var number string = strconv.Itoa(len(resp.Group.Members))
+	/////////////////////
 	accountsBeneficaire, err := h.beneficiaries(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -524,7 +527,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
 
 		resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -537,7 +540,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
 
 		ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -547,7 +550,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
 
 		_, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req)
 		if errr != nil {
-			log.Error().Err(errr).Msg("Issue in groups management service - InsubscribeMember")
+			fmt.Println(errr)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -564,7 +567,7 @@ func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *ht
 
 				_, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest)
 				if err != nil {
-					log.Error().Err(err).Msg("")
+					fmt.Println(err)
 					w.WriteHeader(http.StatusInternalServerError)
 					return
 				}

handlers/application/members.go

@@ -12,7 +12,6 @@ import (
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"github.com/google/uuid"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
@@ -36,7 +35,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -55,7 +54,7 @@ func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Reques
 
 	res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -78,14 +77,14 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
 
 		dataMap, err := parseUserForm(r)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -101,7 +100,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
 		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -117,7 +116,7 @@ func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request
 
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -161,7 +160,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
 
 	accounts, err := h.services.GetAccounts()
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -175,7 +174,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
 
 		resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -196,7 +195,7 @@ func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request)
 
 		res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

handlers/application/support.go

@@ -1,11 +1,10 @@
 package application
 
 import (
+	"fmt"
 	"net/http"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
-	"git.coopgo.io/coopgo-platform/emailing"
-	"github.com/rs/zerolog/log"
 )
 
 type Message struct {
@@ -16,7 +15,7 @@ func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request)
 
 	c := r.Context().Value(identification.ClaimsKey)
 	if c == nil {
-		log.Error().Msg("no current user claims")
+		fmt.Println("no current user claims")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -24,21 +23,15 @@ func (h *ApplicationHandler) SupportSend(w http.ResponseWriter, r *http.Request)
 
 	comment := r.PostFormValue(("comment"))
 
-
 	if r.Method == "POST" {
-		user_email := current_user_claims["email"].(string)
-		
 		data := map[string]any{
 			"key":  comment,
-			"user": user_email,
+			"user": current_user_claims["email"],
 		}
 
-		log.Debug().Str("user_email", user_email).Msg("Sending message")
+		if err := h.emailing.Send("support.request", "support@parcoursmob.fr", data); err != nil {
-
+			fmt.Println(err)
-		if err := h.emailing.Send("support.request", "support@parcoursmob.fr", data, emailing.WithReplyTo(user_email), emailing.WithTLSOpportunistic()); err != nil {
-			log.Error().Err(err).Msg("error sending email")
 			w.WriteHeader(http.StatusInternalServerError)
-			return 
 		}
 		http.Redirect(w, r, "/app/", http.StatusFound)
 		return

handlers/application/vehicles-management.go

@@ -11,18 +11,15 @@ import (
 	"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"
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
-	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/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"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/coreos/go-oidc"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -34,7 +31,7 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
 	}
 	resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	}
 
@@ -63,11 +60,9 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
 		}
 	}
 
-	driversMap, _ := h.services.GetBeneficiariesMap()
-
 	sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
 	sort.Sort(sorting.BookingsByStartdate(bookings))
-	h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, driversMap, bookings)
+	h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings)
 }
 
 func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request) {
@@ -77,7 +72,7 @@ func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWrite
 	}
 	resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 	}
 
@@ -102,9 +97,7 @@ func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWrite
 	cacheid := uuid.NewString()
 	h.cache.PutWithTTL(cacheid, bookings, 1*time.Hour)
 
-	driversMap, _ := h.services.GetBeneficiariesMap()
+	h.Renderer.VehiclesManagementBookingsList(w, r, vehicles_map, bookings, cacheid)
-
-	h.Renderer.VehiclesManagementBookingsList(w, r, vehicles_map, driversMap, bookings, cacheid)
 }
 
 func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Request) {
@@ -118,7 +111,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 		group := g.(storage.Group)
 
 		if err := r.ParseForm(); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -131,7 +124,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 			var address map[string]any
 			err := json.Unmarshal([]byte(v), &address)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -144,15 +137,13 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 			dataMap["licence_plate"] = v
 		}
 		if v := r.FormValue("automatic"); v != "" {
+			fmt.Println(v)
 			dataMap["automatic"] = (v == "on")
 		}
-		if v := r.FormValue("kilometers"); v != "" {
-			dataMap["kilometers"] = v
-		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -172,7 +163,7 @@ func (h *ApplicationHandler) VehiclesFleetAdd(w http.ResponseWriter, r *http.Req
 		_, err = h.services.GRPC.Fleets.AddVehicle(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -195,37 +186,12 @@ func (h *ApplicationHandler) VehiclesFleetDisplay(w http.ResponseWriter, r *http
 
 	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
-	diag := []diagsstorage.Diag{}
+	h.Renderer.VehiclesFleetDisplay(w, r, resp.Vehicle.ToStorageType())
-
-	diagsrequest := &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_vehicles"},
-	}
-
-	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	for _, d := range diagsresp.Diags {
-		diagData := d.Data.AsMap()
-		if vehicle, ok := diagData["vehicle"].(string); ok && vehicle == vehicleid {
-			diag = append(diag, d.ToStorageType())
-		}
-	}
-
-	diagsAny := make([]any, len(diag))
-	for i, d := range diag {
-		diagsAny[i] = d
-	}
-
-	h.Renderer.VehiclesFleetDisplay(w, r, resp.Vehicle.ToStorageType(), diagsAny)
 }
 
 func filterVehicle(r *http.Request, v *fleets.Vehicle) bool {
@@ -251,7 +217,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 
 	booking, err := h.services.GetBooking(bookingid)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -299,7 +265,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 
 		_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -316,7 +282,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 
 		beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -330,7 +296,7 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 
 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -339,13 +305,16 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 		Namespaces:     []string{"parcoursmob"},
 		Types:          []string{booking.Vehicle.Type},
 		Administrators: booking.Vehicle.Administrators,
-		AvailabilityFrom: timestamppb.New(booking.Startdate),
+		//AvailabilityFrom: timestamppb.New(booking.Startdate),
-		AvailabilityTo:   timestamppb.New(booking.Enddate.Add(24 * time.Hour)),
+		//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 {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	}
 
 	alternatives := []any{}
@@ -353,36 +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")
 
-	diag := []diagsstorage.Diag{}
+	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives, vehicles, vehicles_map, bookings)
-
-	diagsrequest := &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_bookings"},
-	}
-
-	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	for _, d := range diagsresp.Diags {
-		diagData := d.Data.AsMap()
-		if booking, ok := diagData["booking"].(string); ok && booking == bookingid {
-			diag = append(diag, d.ToStorageType())
-		}
-	}
-
-	diagsAny := make([]any, len(diag))
-	for i, d := range diag {
-		diagsAny[i] = d
-	}
-
-	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives, diagsAny)
 }
 
 func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.ResponseWriter, r *http.Request) {
@@ -395,7 +376,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
 
 	booking, err := h.services.GetBooking(bookingid)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -410,7 +391,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
 
 	_, err = h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -422,7 +403,7 @@ func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.Respons
 func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter, r *http.Request) { // Get Group
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
-		log.Error().Msg("no current group")
+		fmt.Println("no current group")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -431,7 +412,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	// Get current user ID
 	u := r.Context().Value(identification.IdtokenKey)
 	if u == nil {
-		log.Error().Msg("no current user")
+		fmt.Println("no current user")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -440,7 +421,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	// Get current user claims
 	c := r.Context().Value(identification.ClaimsKey)
 	if c == nil {
-		log.Error().Msg("no current user claims")
+		fmt.Println("no current user claims")
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -475,7 +456,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -494,7 +475,7 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 
 	_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -502,6 +483,30 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", vehicleid), http.StatusFound)
 }
 
+//	func (h *ApplicationHandler) UnbookingVehicles(w http.ResponseWriter, r *http.Request) {
+//		request := &fleets.GetVehiclesRequest{
+//			Namespaces: []string{"parcoursmob"},
+//		}
+//		resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
+//		if err != nil {
+//			fmt.Println(err)
+//			w.WriteHeader(http.StatusInternalServerError)
+//		}
+//		vehicles := []fleetsstorage.Vehicle{}
+//		fmt.Println(resp.Vehicles[0].Bookings)
+//		for i, vehicle := range resp.Vehicles {
+//			if len(resp.Vehicles[i].Bookings) == 0 {
+//				v := vehicle.ToStorageType()
+//				vehicles = append(vehicles, v)
+//			}
+//		}
+//		// if len(resp.Vehicle.ToStorageType().Bookings) == 0 {
+//		// 	h.Renderer.UnbookingVehicles(w, r, resp.Vehicle.ToStorageType())
+//		// }
+//		// fmt.Println(resp.Vehicle.ToStorageType().Bookings)
+//		fmt.Println(vehicles)
+//		h.Renderer.UnbookingVehicles(w, r, vehicles)
+//	}
 func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	bookingid := vars["bookingid"]
@@ -512,7 +517,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
 
 	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -522,14 +527,14 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
 
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -569,7 +574,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
 
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -588,11 +593,20 @@ 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 {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -614,7 +628,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 
 	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -625,7 +639,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 	if r.Method == "POST" {
 		fmt.Print(r.FormValue("vehicle_type"))
 		if err := r.ParseForm(); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -637,7 +651,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 			var address map[string]any
 			err := json.Unmarshal([]byte(v), &address)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -649,16 +663,14 @@ 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")
 		}
 
 		data, err := structpb.NewValue(dataMap)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -676,7 +688,7 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
 		resp, err := h.services.GRPC.Fleets.UpdateVehicle(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

handlers/application/vehicles.go

@@ -12,8 +12,6 @@ import (
 	"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"
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
-	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	"git.coopgo.io/coopgo-platform/fleets/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
@@ -22,13 +20,13 @@ import (
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
+	fmt.Println("invoked")
 	var beneficiary mobilityaccountsstorage.Account
 
 	beneficiarydocuments := []filestorage.FileInfo{}
@@ -44,7 +42,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 
 	administrators := []string{}
 
-	if r.FormValue("beneficiaryid") != "" && startdate.After(time.Now()) && enddate.After(startdate) {
+	if r.FormValue("beneficiaryid") != "" {
 		// Handler form
 		searched = true
 
@@ -54,7 +52,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 
 		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -73,7 +71,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 
 		resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 		}
 
@@ -81,7 +79,9 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 			v := vehicle.ToStorageType()
 
 			if r.FormValue("type") == "Voiture" && automatic {
+				fmt.Println(v.Data["automatic"])
 				if auto, ok := v.Data["automatic"].(bool); !ok || !auto {
+					fmt.Println(v.Data["automatic"])
 					continue
 				}
 			}
@@ -105,7 +105,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 
 	accounts, err := h.beneficiaries(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -116,7 +116,7 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 			Groupids: administrators,
 		})
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -136,16 +136,17 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 }
 
 func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
+	fmt.Println("Book")
 	current_group, err := h.currentGroup(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	current_user_token, current_user_claims, err := h.currentUser(r)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -158,7 +159,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		Vehicleid: vehicleid,
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte("Vehicle not found"))
 		w.Write([]byte(err.Error()))
@@ -187,7 +188,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 	}
 	datapb, err := structpb.NewStruct(data)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -212,7 +213,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		if existing_file == "" {
 			file, header, err := r.FormFile("doc-" + v)
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusBadRequest)
 				w.Write([]byte("Document manquant : " + v))
 				return
@@ -227,7 +228,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 			}
 
 			if err := h.filestorage.Put(file, filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s_%s", booking.Id, fileid, header.Filename), header.Size, metadata); err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -235,7 +236,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 			path := strings.Split(existing_file, "/")
 
 			if err := h.filestorage.Copy(existing_file, fmt.Sprintf("%s/%s/%s", filestorage.PREFIX_BOOKINGS, booking.Id, path[len(path)-1])); err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -244,15 +245,15 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 
 	_, err = h.services.GRPC.Fleets.CreateBooking(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	// NOTIFY GROUP MEMBERS
+	//NOTIFY GROUP MEMBERS
 	members, _, err := h.groupmembers(vehicle.Vehicle.Administrators[0])
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	} else {
 		for _, m := range members {
 			if email, ok := m.Data["email"].(string); ok {
@@ -264,6 +265,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 	}
 
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles/bookings/%s", booking.Id), http.StatusFound)
+
 }
 
 func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request) {
@@ -275,7 +277,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 	}
 	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -299,7 +301,7 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 
 	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -307,35 +309,11 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 	documents := h.filestorage.List(filestorage.PREFIX_BOOKINGS + "/" + bookingid)
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	diag := []diagsstorage.Diag{}
+	h.Renderer.VehicleBookingDisplay(w, r, booking, booking.Vehicle, beneficiaryresp.Account.ToStorageType(), groupresp.Group.ToStorageType(), documents, file_types_map)
-
-	diagsrequest := &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_bookings"},
-	}
-
-	diagsresp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), diagsrequest)
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	for _, d := range diagsresp.Diags {
-		diagData := d.Data.AsMap()
-		if booking, ok := diagData["booking"].(string); ok && booking == bookingid {
-			diag = append(diag, d.ToStorageType())
-		}
-	}
-
-	diagsAny := make([]any, len(diag))
-	for i, d := range diag {
-		diagsAny[i] = d
-	}
-
-	h.Renderer.VehicleBookingDisplay(w, r, booking, booking.Vehicle, beneficiaryresp.Account.ToStorageType(), groupresp.Group.ToStorageType(), documents, file_types_map, diagsAny)
 }
 
 func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.Request) {
+
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
 		w.WriteHeader(http.StatusBadRequest)
@@ -347,7 +325,7 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 	request := &fleets.GetBookingsRequest{}
 	resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@@ -371,6 +349,9 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 	vehicles, _ := h.services.GetVehiclesMap()
 	groups, _ := h.services.GetGroupsMap()
 
+	// fmt.Println("bookings : ", bookings)
+	// fmt.Println("vehicles : ", vehicles)
+	// fmt.Println("groups : ", groups)
 	h.Renderer.VehicleBookingsList(w, r, bookings, vehicles, groups)
 }
 
@@ -379,21 +360,22 @@ func (h *ApplicationHandler) BookingDocumentDownload(w http.ResponseWriter, r *h
 	bookingid := vars["bookingid"]
 	document := vars["document"]
 
-	log.Debug().Str("booking id", bookingid).Str("document", document).Msg("Document and booking ID")
+	fmt.Println(fmt.Sprintf("%s/%s", bookingid, document))
 
 	file, info, err := h.filestorage.Get(filestorage.PREFIX_BOOKINGS, fmt.Sprintf("%s/%s", bookingid, document))
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	w.Header().Set("Content-Type", info.ContentType)
 	if _, err = io.Copy(w, file); err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles/bookings/%s", bookingid), http.StatusFound)
+
 }

handlers/auth/groups.go

@@ -2,10 +2,10 @@ package auth
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
-	"github.com/rs/zerolog/log"
 )
 
 func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
@@ -42,7 +42,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
 
 	err = idtoken.Claims(&claims)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	}
 
 	g := claims["groups"]
@@ -65,7 +65,7 @@ func (h *AuthHandler) Groups(w http.ResponseWriter, r *http.Request) {
 
 	resp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}

handlers/auth/lost_password.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
+	"fmt"
 	"io"
 	"net/http"
 	"time"
 
 	"git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	"github.com/rs/zerolog/log"
 )
 
 func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
@@ -22,14 +22,14 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
 				Namespace: "parcoursmob",
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				http.Redirect(w, r, "/app/", http.StatusFound)
 				return
 			}
 
 			b := make([]byte, 16)
 			if _, err := io.ReadFull(rand.Reader, b); err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -44,7 +44,7 @@ func (h *AuthHandler) LostPasswordInit(w http.ResponseWriter, r *http.Request) {
 			h.cache.PutWithTTL("retrieve-password/"+key, passwordretrieval, 72*time.Hour)
 
 			if err := h.emailing.Send("auth.retrieve_password", email, passwordretrieval); err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -62,7 +62,7 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
 	key := r.FormValue("key")
 	recover, err := h.cache.Get("retrieve-password/" + key)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		h.Renderer.LostPasswordRecoverKO(w, r, key)
 		return
 	}
@@ -81,13 +81,13 @@ func (h *AuthHandler) LostPasswordRecover(w http.ResponseWriter, r *http.Request
 		})
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 		}
 
 		err = h.cache.Delete("retrieve-password/" + key)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 
 		http.Redirect(w, r, "/app/", http.StatusFound)

handlers/auth/onboarding.go

@@ -7,7 +7,6 @@ import (
 
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	ma "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	"github.com/rs/zerolog/log"
 )
 
 func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
@@ -16,7 +15,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 	key := r.FormValue("key")
 	onboarding, err := h.cache.Get("onboarding/" + key)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		h.Renderer.AuthOnboardingKO(w, r, key)
 		return
 	}
@@ -25,7 +24,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 
 	if r.Method == "POST" {
 		if r.FormValue("password") == "" {
-			log.Error().Msg("Password is empty")
+			fmt.Println("password is empty !")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -41,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{
+				Local: &ma.LocalAuth{
-					Username: onboardingmap["username"].(string),
+					Username: onboardingmap["username"].(*string),
 					Password: r.FormValue("password"),
 				},
 			},
@@ -59,7 +58,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 
 		acc, err := mobilityaccounts.AccountFromStorageType(account)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -71,14 +70,14 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 		_, err = h.services.GRPC.MobilityAccounts.Register(context.TODO(), request)
 
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 
 		err = h.cache.Delete("onboarding/" + key)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 
 		http.Redirect(w, r, "/app/", http.StatusFound)

handlers/exports/agenda.go

@@ -3,9 +3,6 @@ package exports
 import (
 	"context"
 	"fmt"
-	"net/http"
-	"sort"
-
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
@@ -14,8 +11,9 @@ import (
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"github.com/gorilla/mux"
-	"github.com/rs/zerolog/log"
 	"github.com/xuri/excelize/v2"
+	"net/http"
+	"sort"
 )
 
 func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *http.Request) {
@@ -26,7 +24,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Namespaces: []string{"parcoursmob_dispositifs"},
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -61,7 +59,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Accountids: beneficiaries_ids,
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -84,7 +82,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Id: eventId,
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -109,7 +107,7 @@ func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *ht
 				Accountids: beneficiaries_ids,
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("")
+				fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
@@ -132,7 +130,7 @@ func (h *ExportsHandler) generateExcel(events []agendastorage.Event, groups map[
 	f := excelize.NewFile()
 	defer func() {
 		if err := f.Close(); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 	}()
 	f.SetCellValue("Sheet1", "A1", "Evénement")

handlers/exports/fleets.go

@@ -12,7 +12,6 @@ import (
 	groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	"github.com/rs/zerolog/log"
 	"github.com/xuri/excelize/v2"
 )
 
@@ -25,7 +24,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	}
 	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -35,6 +34,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	for _, vehicle := range reesp.Vehicles {
 
 		v := vehicle.ToStorageType()
+		fmt.Println(v)
 
 		for _, b := range v.Bookings {
 			bookings = append(bookings, b)
@@ -45,13 +45,14 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 
 	}
 
+
 	groups := map[string]groupsstorage.Group{}
 
 	admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{
 		Namespaces: []string{"parcoursmob_organizations"},
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -64,7 +65,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 		Accountids: beneficiaries_ids,
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
@@ -79,7 +80,7 @@ func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
 	f := excelize.NewFile()
 	defer func() {
 		if err := f.Close(); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 	}()
 

main.go

@@ -1,13 +1,11 @@
 package main
 
 import (
+	"fmt"
+	"log"
 	"net/http"
-	"os"
 	"time"
 
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/api"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/application"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/auth"
@@ -20,44 +18,37 @@ import (
 )
 
 func main() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-
 	cfg, err := ReadConfig()
+
 	if err != nil {
-		log.Fatal().Err(err).Msg("cannot read config")
+		panic(err)
-		return
 	}
 
 	var (
-		address              = cfg.GetString("server.listen")
+		//address              = cfg.GetString("server.listen")
 		service_name         = cfg.GetString("service_name")
 		templates_public_dir = cfg.GetString("templates.public_dir")
 		dev_env              = cfg.GetBool("dev_env")
 	)
-
-	if dev_env {
-		log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-	}
-
 	svc, err := services.NewServicesHandler(cfg)
 	if err != nil {
-		log.Panic().Err(err).Msg("Error creating services handler")
+		panic(err)
 	}
-
+	fmt.Println(cfg)
 	kv, err := cache.NewKVHandler(cfg)
 	if err != nil {
-		log.Panic().Err(err).Msg("Error creating KV handler")
+		panic(err)
 	}
-	filestorage, _ := cache.NewFileStorage(cfg)
+	filestorage, err := cache.NewFileStorage(cfg)
 
 	idp, err := identification.NewIdentificationProvider(cfg, svc, kv)
 	if err != nil {
-		log.Panic().Err(err).Msg("Error creating identification provider")
+		panic(err)
 	}
 
 	emailing, err := renderer.NewEmailingHandler(cfg)
 	if err != nil {
-		log.Panic().Err(err).Msg("Error creating emailing handler")
+		panic(err)
 	}
 
 	apiHandler, _ := api.NewAPIHandler(cfg, idp, svc, kv)
@@ -65,6 +56,11 @@ func main() {
 	exportsHandler, _ := exports.NewExportsHandler(cfg, svc, emailing)
 	authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing)
 
+	fmt.Println("Running", service_name, ":")
+	if dev_env {
+		fmt.Printf("\033]0;%s\007", service_name)
+	}
+
 	r := mux.NewRouter()
 
 	r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir(templates_public_dir))))
@@ -77,14 +73,6 @@ func main() {
 	r.HandleFunc("/auth/groups/switch", authHandler.GroupSwitch)
 	r.HandleFunc("/", redirectApp)
 
-	if dev_env {
-		r.Use(trackPage)
-	}
-
-	calendars_router := r.PathPrefix("/api/calendars").Subrouter()
-	calendars_router.HandleFunc("/global.ics", apiHandler.CalendarGlobal)
-	calendars_router.HandleFunc("/organizations/{groupid}.ics", apiHandler.CalendarOrganizations)
-
 	api_router := r.PathPrefix("/api").Subrouter()
 	api_router.HandleFunc("/", apiHandler.NotFound)
 	api_router.HandleFunc("/geo/autocomplete", apiHandler.GeoAutocomplete)
@@ -154,7 +142,7 @@ func main() {
 	appGroup.HandleFunc("/groups", applicationHandler.CreateGroupModule)
 	appGroup.HandleFunc("/groups/{groupid}", applicationHandler.DisplayGroupModule)
 
-	// TODO Subrouters with middlewares checking security for each module ?
+	//TODO Subrouters with middlewares checking security for each module ?
 	application.Use(idp.Middleware)
 	application.Use(idp.GroupsMiddleware)
 
@@ -164,7 +152,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)
-	// add statistiques
+	//add statistiques
 	appAdmin.HandleFunc("/stats/vehicles", applicationHandler.AdminStatVehicles)
 	appAdmin.HandleFunc("/stats/bookings", applicationHandler.AdminStatBookings)
 	appAdmin.HandleFunc("/stats/beneficaires", applicationHandler.AdminStatBeneficaires)
@@ -174,38 +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)
-	////////////////////////////////////////////////////////////////
-	//////////////////Diag in event////////////////////////
-	// application.HandleFunc("/agenda/{eventid}/create-diag", applicationHandler.DiagsCreateDiag)
-	application.HandleFunc("/agenda/{eventid}/diags", applicationHandler.DiagsHome)
-	application.HandleFunc("/agenda/{eventid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	application.HandleFunc("/agenda/{eventid}/diags/history", applicationHandler.DiagsHistory)
-	application.HandleFunc("/agenda/{eventid}/diags/{diagid}/history", applicationHandler.DiagsHistoryDiag)
-	////////////////////////////////////////////////////////////////
-	//////////////////Diag in benefeciaries////////////////////////
-	application.HandleFunc("/beneficiaries/{beneficiaryid}/create-diag", applicationHandler.BeneficiariesCreateDiag)
-	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	////////////////////////////////////////////////////////////////
-	//////////////////Diag in vehicules////////////////////////
-	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/create-diag", applicationHandler.VehiclesCreateDiag)
-	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags", applicationHandler.DiagsHome)
-	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	////////////////////////////////////////////////////////////////
-	//////////////////Diag in bookings////////////////////////
-	application.HandleFunc("/vehicles-management/bookings/{bookingid}/create-diag", applicationHandler.BookingsCreateDiag)
-	application.HandleFunc("/vehicles/bookings/{vehicleid}/diags", applicationHandler.DiagsHome)
-	application.HandleFunc("/vehicles/bookings/{bookingid}/create-diag", applicationHandler.VehicleBookingsCreateDiag)
-	//////////////////Diags////////////////////////
-	application.HandleFunc("/diags/", applicationHandler.DiagsHome)
-	application.HandleFunc("/diags/{diagid}/documents", applicationHandler.DiagsDocuments)
-	application.HandleFunc("/diags/{diagid}/documents/{document}", applicationHandler.DiagsDocumentDownload)
-	application.HandleFunc("/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	application.HandleFunc("/diags/{diagid}/update", applicationHandler.DiagUpdate)
-	application.HandleFunc("/diags/{diagid}/delete", applicationHandler.DiagDelete)
-	// application.HandleFunc("/diags/history", applicationHandler.DiagsHistory)
 
 	export := r.PathPrefix("/exports").Subrouter()
 	export.HandleFunc("/fleets/bookings", exportsHandler.Bookings)
@@ -217,23 +173,15 @@ func main() {
 
 	srv := &http.Server{
 		Handler:      r,
-		Addr:         address,
+		Addr:         "0.0.0.0:9000",
 		WriteTimeout: 15 * time.Second,
 		ReadTimeout:  15 * time.Second,
 	}
 
-	log.Info().Str("service_name", service_name).Str("address", address).Msg("Running HTTP server")
+	log.Fatal(srv.ListenAndServe())
 
-	log.Fatal().Err(srv.ListenAndServe())
 }
 
 func redirectApp(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, "/app/", http.StatusFound)
 }
-
-func trackPage(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		log.Trace().Str("requested_uri", r.RequestURI).Msg("New request")
-		next.ServeHTTP(w, r.WithContext(r.Context()))
-	})
-}

renderer/agenda.go

@@ -30,29 +30,20 @@ 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,
 	}
@@ -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/beneficiaries.go

@@ -53,7 +53,7 @@ type BeneficiariesDisplayState struct {
 	Beneficiary any
 }
 
-func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}, diags []any) {
+func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
@@ -64,7 +64,6 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"documents":                documents,
 		"organizations":            organizations,
 		"event":                    event,
-		"diags":                    diags,
 	}
 	renderer.Render("beneficiaries_display", 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/diags.go

@@ -1,115 +0,0 @@
-package renderer
-
-import (
-	"net/http"
-
-	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
-)
-
-const diagsMenu = "diags"
-
-func (renderer *Renderer) DiagsHome(w http.ResponseWriter, r *http.Request, diags []diagsstorage.Diag, groups map[string]any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.list.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	state.ViewState = map[string]any{
-		"diags": diags,
-		"groups": groups,
-	}
-
-	renderer.Render("diags home", w, r, files, state)
-}
-
-func (renderer *Renderer) DiagsHistory(w http.ResponseWriter, r *http.Request, diags []diagsstorage.Diag) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.history.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	state.ViewState = map[string]any{
-		"diags": diags,
-	}
-
-	renderer.Render("diags history", w, r, files, state)
-}
-
-func (renderer *Renderer) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request, beneficiary string, diags_file_types []string, file_types_map map[string]string, documents any) {
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.create_diag.files")
-	state.ViewState = map[string]any{
-		"beneficiary": beneficiary,
-		"diags_file_types": diags_file_types,
-		"file_types_map": file_types_map,
-		"documents": documents,
-	}
-	renderer.Render("diag create for beneficiary", w, r, files, state)
-}
-
-func (renderer *Renderer) VehiclesCreateDiag(w http.ResponseWriter, r *http.Request, vehicle string) {
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.create_vehicle_diag.files")
-	state.ViewState = map[string]any{
-		"vehicle": vehicle,
-	}
-	renderer.Render("diag create for vehicle", w, r, files, state)
-}
-
-func (renderer *Renderer) BookingsCreateDiag(w http.ResponseWriter, r *http.Request, booking string) {
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.create_booking_diag.files")
-	state.ViewState = map[string]any{
-		"booking": booking,
-	}
-	renderer.Render("diag create for booking", w, r, files, state)
-}
-
-func (renderer *Renderer) VehicleBookingsCreateDiag(w http.ResponseWriter, r *http.Request, booking string) {
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.create_booking_diag.files")
-	state.ViewState = map[string]any{
-		"booking": booking,
-	}
-	renderer.Render("diag create for booking", w, r, files, state)
-}
-
-func (renderer *Renderer) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request, diag any, diags_file_types []string, file_types_map map[string]string, documents any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.display_diag.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-
-	state.ViewState = map[string]any{
-		"diag":         	 diag,
-		"diags_file_types": diags_file_types,
-		"file_types_map":	 file_types_map,
-		"documents":     	 documents,
-	}
-
-	renderer.Render("diags create diag", w, r, files, state)
-}
-
-func (renderer *Renderer) DiagsHistoryDiag(w http.ResponseWriter, r *http.Request, diag any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.history_diag.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-	state.ViewState = map[string]any{
-		"diag":         diag,
-	}
-
-	renderer.Render("diags history diag", w, r, files, state)
-}
-
-func (renderer *Renderer) DiagUpdate(w http.ResponseWriter, r *http.Request, diag any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.update.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-
-	state.ViewState = map[string]any{
-		"diag": diag,
-	}
-
-	renderer.Render("diag_update", w, r, files, state)
-}
-
-func (renderer *Renderer) DiagDelete(w http.ResponseWriter, r *http.Request, diag any) {
-	files := renderer.ThemeConfig.GetStringSlice("views.diags.delete.files")
-	state := NewState(r, renderer.ThemeConfig, diagsMenu)
-
-	state.ViewState = map[string]any{
-		"diag": diag,
-	}
-
-	renderer.Render("diag_deleteDiag", w, r, files, state)
-}

renderer/renderer.go

@@ -9,8 +9,7 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-platform/emailing"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
-	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/coreos/go-oidc"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )
 
@@ -67,7 +66,7 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
 
 	err := t.ExecuteTemplate(w, "main", state)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	}
 }
 
@@ -96,7 +95,7 @@ func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *
 	t = template.Must(t.ParseFiles(prefixed_files...))
 	err := t.ExecuteTemplate(w, "main", state)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	}
 }
 
@@ -252,14 +251,6 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Icon:   "hero:outline/user-group",
 		})
 	}
-	if modules["diags"] != nil && modules["diags"].(bool) {
-		ls.MenuItems = append(ls.MenuItems, MenuItem{
-			Title:  "Diagnostics",
-			Link:   "/app/diags/",
-			Active: menuState == diagsMenu,
-			Icon:   "hero:outline/document-text",
-		})
-	}
 	return RenderState{
 		IconSet:     icons.NewIconSet(iconset),
 		Group:       group,

renderer/vehicle-management.go

@@ -5,31 +5,28 @@ import (
 
 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
-	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )
 
 const vehiclesmanagementMenu = "vehicles_management"
 
-func (renderer *Renderer) VehiclesManagementOverview(w http.ResponseWriter, r *http.Request, vehicles []fleetsstorage.Vehicle, vehicles_map map[string]fleetsstorage.Vehicle, driversMap map[string]mobilityaccountsstorage.Account, bookings []fleetsstorage.Booking) {
+func (renderer *Renderer) VehiclesManagementOverview(w http.ResponseWriter, r *http.Request, vehicles []fleetsstorage.Vehicle, vehicles_map map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.overview.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"vehicles":     vehicles,
 		"bookings":     bookings,
 		"vehicles_map": vehicles_map,
-		"drivers_map": driversMap,
 	}
 
 	renderer.Render("fleet overview", w, r, files, state)
 }
 
-func (renderer *Renderer) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request, vehiclesMap map[string]fleetsstorage.Vehicle, driversMap map[string]mobilityaccountsstorage.Account, bookings []fleetsstorage.Booking, cacheid string) {
+func (renderer *Renderer) VehiclesManagementBookingsList(w http.ResponseWriter, r *http.Request, vehicles_map map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking, cacheid string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.bookings_list.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"bookings":     bookings,
-		"vehicles_map": vehiclesMap,
+		"vehicles_map": vehicles_map,
-		"drivers_map": driversMap,
 		"cacheid":      cacheid,
 	}
 
@@ -46,12 +43,11 @@ func (renderer *Renderer) VehiclesFleetAdd(w http.ResponseWriter, r *http.Reques
 	renderer.Render("fleet add vehicle", w, r, files, state)
 }
 
-func (renderer *Renderer) VehiclesFleetDisplay(w http.ResponseWriter, r *http.Request, vehicle any, diags []any) {
+func (renderer *Renderer) VehiclesFleetDisplay(w http.ResponseWriter, r *http.Request, vehicle any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.fleet_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
 		"vehicle": vehicle,
-		"diags":   diags,
 	}
 
 	renderer.Render("fleet display vehicle", w, r, files, state)
@@ -68,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, diags []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{
@@ -79,7 +75,9 @@ func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter,
 		"documents":            documents,
 		"file_types_map":       file_types_map,
 		"alternative_vehicles": alternative_vehicles,
-		"diags":                diags,
+		"vehicles":             vehicles,
+		"bookings":             bookings,
+		"vehicles_map":         vehicles_map,
 	}
 
 	renderer.Render("vehicles search", w, r, files, state)

renderer/vehicles.go

@@ -52,7 +52,7 @@ func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request,
 	renderer.Render("vehicles search", w, r, files, state)
 }
 
-func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, diags []any) {
+func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.booking_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
 	state.ViewState = map[string]any{
@@ -62,7 +62,6 @@ func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.R
 		"group":          group,
 		"documents":      documents,
 		"file_types_map": file_types_map,
-		"diags":          diags,
 	}
 
 	renderer.Render("vehicles search", w, r, files, state)

services/agenda.go

@@ -1,14 +1,8 @@
 package services
 
 import (
-	"context"
-	"fmt"
-	"time"
-
 	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
-	"git.coopgo.io/coopgo-platform/agenda/storage"
 	"google.golang.org/grpc"
-	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 type AgendaService struct {
@@ -27,39 +21,3 @@ func NewAgendaService(dial string) (*AgendaService, error) {
 		AgendaClient: client,
 	}, nil
 }
-
-func (s *ServicesHandler) GetAgendaEvents() ([]AgendaEvent, error) {
-	resp, err := s.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
-		Namespaces: []string{"parcoursmob_dispositifs"},
-		Mindate:    timestamppb.New(time.Now().Add(-24 * time.Hour)),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	groups, err := s.GetGroupsMap()
-	if err != nil {
-		return nil, fmt.Errorf("error in groups request : %w", err)
-	}
-
-	events := []AgendaEvent{}
-
-	for _, e := range resp.Events {
-		newEvent := AgendaEvent{
-			Event: e.ToStorageType(),
-		}
-		for _, o := range e.Owners {
-			newEvent.OwnersGroups = append(newEvent.OwnersGroups, GroupsManagementGroup{Group: groups[o]})
-		}
-		events = append(events, newEvent)
-	}
-
-	return events, nil
-}
-
-// Enriched types
-
-type AgendaEvent struct {
-	OwnersGroups []GroupsManagementGroup
-	storage.Event
-}

services/diags.go

@@ -1,55 +0,0 @@
-package services
-
-import (
-	"context"
-	// "time"
-
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
-	"git.coopgo.io/coopgo-platform/diags/storage"
-	"google.golang.org/grpc"
-	// "google.golang.org/protobuf/types/known/timestamppb"
-)
-
-type DiagsService struct {
-	diags.DiagsClient
-}
-
-func NewDiagsService(dial string) (*DiagsService, error) {
-	conn, err := grpc.Dial(dial, grpc.WithInsecure())
-
-	client := diags.NewDiagsClient(conn)
-	if err != nil {
-		return nil, err
-	}
-
-	return &DiagsService{
-		DiagsClient: client,
-	}, nil
-}
-
-func (s *ServicesHandler) GetDiagsDiags() ([]DiagsDiag, error) {
-	resp, err := s.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_beneficiaires", "parcoursmob_diagnostiques"},
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	diags := []DiagsDiag{}
-
-	for _, e := range resp.Diags {
-		newDiag := DiagsDiag{
-			Diag: e.ToStorageType(),
-		}
-		diags = append(diags, newDiag)
-	}
-
-	return diags, nil
-}
-
-// Enriched types
-
-type DiagsDiag struct {
-	OwnersGroups []GroupsManagementGroup
-	storage.Diag
-}

services/fleets.go

@@ -2,12 +2,12 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"sort"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	"git.coopgo.io/coopgo-platform/fleets/storage"
-	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc"
 )
 
@@ -62,7 +62,7 @@ func (s *ServicesHandler) GetVehiclesMap() (vehicles map[string]storage.Vehicle,
 	}
 	resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 	} else {
 		for _, vehicle := range resp.Vehicles {
 			vehicles[vehicle.Id] = vehicle.ToStorageType()

services/groupsmanagement.go

@@ -41,7 +41,7 @@ func (s *ServicesHandler) GetGroupsMap() (groups map[string]storage.Group, err e
 	return
 }
 
-// //////////////////////////////optimize the code//////////////////////////////////////
+////////////////////////////////optimize the code//////////////////////////////////////
 func (s *ServicesHandler) GetGroupsMemberMap(id string) (groups map[string]any, err error) {
 	groups = map[string]any{}
 
@@ -56,23 +56,3 @@ func (s *ServicesHandler) GetGroupsMemberMap(id string) (groups map[string]any,
 	}
 	return
 }
-
-func (s *ServicesHandler) GetGroup(groupid string) (*storage.Group, error) {
-	groupresp, err := s.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
-		Id:        groupid,
-		Namespace: "parcoursmob_organizations",
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	group := groupresp.Group.ToStorageType()
-
-	return &group, nil
-}
-
-// Enriched types
-
-type GroupsManagementGroup struct {
-	storage.Group
-}

services/mobilityaccounts.go

@@ -42,22 +42,6 @@ func (s *ServicesHandler) GetBeneficiaries() (accounts []storage.Account, err er
 	return
 }
 
-func (s *ServicesHandler) GetBeneficiariesMap() (accounts map[string]storage.Account, err error) {
-	accounts = map[string]storage.Account{}
-	request := &mobilityaccounts.GetAccountsRequest{
-		Namespaces: []string{"parcoursmob_beneficiaries"},
-	}
-	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
-
-	if err == nil {
-		for _, v := range resp.Accounts {
-			accounts[v.Id] = v.ToStorageType()
-		}
-	}
-
-	return
-}
-
 func (s *ServicesHandler) GetAccounts() (accounts []storage.Account, err error) {
 	accounts = []storage.Account{}
 	request := &mobilityaccounts.GetAccountsRequest{

services/services.go

@@ -5,7 +5,6 @@ import (
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
-	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
 	"github.com/spf13/viper"
 )
 
@@ -18,7 +17,6 @@ type GRPCServices struct {
 	GroupsManagement groupsmanagement.GroupsManagementClient
 	Fleets           fleets.FleetsClient
 	Agenda           agenda.AgendaClient
-	Diags			 diags.DiagsClient
 }
 
 func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
@@ -27,7 +25,6 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 		groupsManagementDial = cfg.GetString("services.grpc.groupsmanagement.dial")
 		fleetsDial           = cfg.GetString("services.grpc.fleets.dial")
 		agendaDial           = cfg.GetString("services.grpc.agenda.dial")
-		diagsDial            = cfg.GetString("services.grpc.diags.dial")
 	)
 	mobilityAccounts, err := NewMobilityAccountService(mobilityAccountsDial)
 	if err != nil {
@@ -49,18 +46,12 @@ func NewServicesHandler(cfg *viper.Viper) (*ServicesHandler, error) {
 		return nil, err
 	}
 
-	diagsSvc, err := NewDiagsService(diagsDial)
-	if err != nil {
-		return nil, err
-	}
-
 	return &ServicesHandler{
 		GRPC: GRPCServices{
 			MobilityAccounts: mobilityAccounts,
 			GroupsManagement: groupsManagement,
 			Fleets:           fleetsSvc,
 			Agenda:           agendaSvc,
-			Diags:            diagsSvc,
 		},
 	}, nil
 }

utils/identification/groups.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
-	"github.com/rs/zerolog/log"
 )
 
 const GroupKey ContextKey = "group"
@@ -20,6 +19,7 @@ func (p *IdentificationProvider) GroupsMiddleware(next http.Handler) http.Handle
 
 		o, ok := session.Values["organization"]
 		if !ok || o == nil {
+			fmt.Println("no organization")
 			http.Redirect(w, r, "/auth/groups/", http.StatusFound)
 			return
 		}
@@ -29,7 +29,7 @@ func (p *IdentificationProvider) GroupsMiddleware(next http.Handler) http.Handle
 		claimgroups, ok := claims["groups"].([]any)
 
 		if !ok {
-			log.Error().Msg("cast issue")
+			fmt.Println("cast issue")
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}

utils/identification/oidc.go

@@ -4,14 +4,14 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/base64"
+	"fmt"
 	"io"
 	"net/http"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-	"github.com/coreos/go-oidc/v3/oidc"
+	"github.com/coreos/go-oidc"
 	"github.com/gorilla/sessions"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	"golang.org/x/oauth2"
 )
@@ -40,28 +40,8 @@ func NewIdentificationProvider(cfg *viper.Viper, services *services.ServicesHand
 
 	provider, err := oidc.NewProvider(context.Background(), providerURL)
 	if err != nil {
-		var (
-			issuerUrl   = cfg.GetString("identification.oidc.provider_config.issuer_url")
-			authUrl     = cfg.GetString("identification.oidc.provider_config.auth_url")
-			tokenUrl    = cfg.GetString("identification.oidc.provider_config.token_url")
-			userInfoUrl = cfg.GetString("identification.oidc.provider_config.user_info_url")
-			jwksUrl     = cfg.GetString("identification.oidc.provider_config.jwks_url")
-			algorithms  = []string{"RS256"}
-		)
-		if issuerUrl == "" || authUrl == "" || tokenUrl == "" || jwksUrl == "" {
 		return nil, err
 	}
-		providerConfig := oidc.ProviderConfig{
-			IssuerURL:   issuerUrl,
-			AuthURL:     authUrl,
-			TokenURL:    tokenUrl,
-			UserInfoURL: userInfoUrl,
-			JWKSURL:     jwksUrl,
-			Algorithms:  algorithms,
-		}
-
-		provider = providerConfig.NewProvider(context.Background())
-	}
 
 	oauth2Config := oauth2.Config{
 		ClientID:     clientID,
@@ -91,18 +71,18 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		session, err := p.SessionsStore.Get(r, "parcoursmob_session")
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 
 		if session.Values["idtoken"] == nil || session.Values["idtoken"] == "" {
+
 			state, err := newState()
 			if err != nil {
 				panic(err)
 			}
 			session.Values["state"] = state
 			session.Save(r, w)
-			url := p.OAuth2Config.AuthCodeURL(state)
+			http.Redirect(w, r, p.OAuth2Config.AuthCodeURL(state), http.StatusFound)
-			http.Redirect(w, r, url, http.StatusFound)
 			return
 		}
 
@@ -122,7 +102,7 @@ func (p *IdentificationProvider) Middleware(next http.Handler) http.Handler {
 
 		err = idtoken.Claims(&claims)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 		}
 
 		ctx := context.WithValue(r.Context(), IdtokenKey, idtoken)

utils/profile-pictures/profile-pictures.go

@@ -1,12 +1,12 @@
 package profilepictures
 
 import (
+	"fmt"
 	"image"
 	"image/color"
 	"image/draw"
 
 	"github.com/fogleman/gg"
-	"github.com/rs/zerolog/log"
 	"golang.org/x/image/font"
 	"golang.org/x/image/math/fixed"
 )
@@ -21,7 +21,7 @@ func DefaultProfilePicture(initials string) *image.RGBA {
 
 	ff, err := gg.LoadFontFace("themes/default/web/fonts/bitter.ttf", 150.0)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return img
 	}
 

utils/storage/etcd.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/namespace"
@@ -75,8 +74,9 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
 		Password:    password,
 		DialTimeout: 5 * time.Second,
 	})
+	fmt.Println(endpoints,prefix,username,password)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return nil, err
 	}
 
@@ -93,7 +93,7 @@ func NewEtcdHandler(cfg *viper.Viper) (*EtcdHandler, error) {
 func (s *EtcdHandler) Put(k string, v any) error {
 	data, err := s.serializer.Serialize(v)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	// _, err = s.Client.KV.Put(context.TODO(), k, data.String())
@@ -101,7 +101,7 @@ func (s *EtcdHandler) Put(k string, v any) error {
 	_, err = s.Client.KV.Put(ctx, k, string(data))
 	cancel()
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	return nil
@@ -110,13 +110,13 @@ func (s *EtcdHandler) Put(k string, v any) error {
 func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error {
 	lease, err := s.Client.Lease.Grant(context.TODO(), int64(duration.Seconds()))
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 
 	data, err := s.serializer.Serialize(v)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	// _, err = s.Client.KV.Put(context.TODO(), k, data.String(), clientv3.WithLease(lease.ID))
@@ -125,7 +125,7 @@ func (s *EtcdHandler) PutWithTTL(k string, v any, duration time.Duration) error
 	cancel()
 
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	return nil
@@ -136,14 +136,14 @@ func (s *EtcdHandler) Get(k string) (any, error) {
 	resp, err := s.Client.KV.Get(ctx, k)
 	cancel()
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return nil, err
 	}
 	for _, v := range resp.Kvs {
 		var data any
 		err := s.serializer.Deserialize([]byte(v.Value), &data)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			return nil, err
 		}
 		// We return directly as we want to last revision of value
@@ -157,7 +157,7 @@ func (s *EtcdHandler) Delete(k string) error {
 	_, err := s.Client.KV.Delete(ctx, k)
 	cancel()
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	return nil

utils/storage/files.go

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

utils/storage/minio.go

@@ -2,12 +2,12 @@ package storage
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"strings"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 )
 
@@ -23,7 +23,7 @@ func NewMinioStorageHandler(cfg *viper.Viper) (*MinioStorageHandler, error) {
 		Secure: cfg.GetBool("storage.files.minio.use_ssl"),
 	})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return nil, err
 	}
 
@@ -53,13 +53,13 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {
 
 	for object := range objectCh {
 		if object.Err != nil {
-			log.Error().Str("prefix", prefix).Err(object.Err).Msg("Error listing files for prefix")
+			fmt.Println("Error : ", object.Err)
 			continue
 		}
 
 		objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, object.Key, minio.StatObjectOptions{})
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			continue
 		}
 
@@ -82,12 +82,12 @@ func (s *MinioStorageHandler) List(prefix string) []FileInfo {
 func (s *MinioStorageHandler) Get(prefix string, file string) (io.Reader, *FileInfo, error) {
 	object, err := s.Client.GetObject(context.Background(), s.BucketName, prefix+"/"+file, minio.GetObjectOptions{})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return nil, nil, err
 	}
 	objinfo, err := s.Client.StatObject(context.Background(), s.BucketName, prefix+"/"+file, minio.StatObjectOptions{})
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return nil, nil, err
 	}
 
@@ -117,7 +117,7 @@ func (s *MinioStorageHandler) Copy(src string, dst string) error {
 
 	_, err := s.Client.CopyObject(context.Background(), dstOpts, srcOpts)
 	if err != nil {
-		log.Error().Err(err).Msg("")
+		fmt.Println(err)
 		return err
 	}
 	return nil

utils/storage/sessions.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
-	"github.com/rs/zerolog/log"
 )
 
 // Amount of time for cookies/kv keys to expire.
@@ -77,7 +76,7 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 	// Marked for deletion.
 	if session.Options.MaxAge <= 0 {
 		if err := s.delete(r.Context(), session); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			return err
 		}
 		http.SetCookie(w, sessions.NewCookie(session.Name(), "", session.Options))
@@ -88,13 +87,13 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 		}
 
 		if err := s.save(r.Context(), session); err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			return err
 		}
 
 		encoded, err := securecookie.EncodeMulti(session.Name(), session.ID, s.Codecs...)
 		if err != nil {
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			return err
 		}
 		http.SetCookie(w, sessions.NewCookie(session.Name(), encoded, session.Options))
@@ -105,11 +104,13 @@ func (s *SessionStore) Save(r *http.Request, w http.ResponseWriter, session *ses
 // save stores the session in kv.
 func (s *SessionStore) save(ctx context.Context, session *sessions.Session) error {
 	m := make(map[string]interface{}, len(session.Values))
+	fmt.Println(m)
 	for k, v := range session.Values {
+		fmt.Println(v)
 		ks, ok := k.(string)
 		if !ok {
 			err := fmt.Errorf("non-string key value, cannot serialize session: %v", k)
-			log.Error().Err(err).Msg("")
+			fmt.Println(err)
 			return err
 		}
 		m[ks] = v