add module support & groups to create new group

go.mod

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

handlers/application/administration.go

@@ -86,6 +86,8 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 			"agenda":              r.FormValue("modules.agenda") == "on",
 			"groups":              r.FormValue("modules.groups") == "on",
 			"administration":      r.FormValue("modules.administration") == "on",
+			"support":             r.FormValue("modules.support") == "on",
+			"group_module":        r.FormValue("modules.group_module") == "on",
 		}
 
 		groupid := uuid.NewString()

handlers/application/conseillers.go

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

main.go

@@ -97,7 +97,6 @@ func main() {
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/update", applicationHandler.VehiclesFleetUpdate)
 	application.HandleFunc("/vehicles-management/bookings/", applicationHandler.VehiclesManagementBookingsList)
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}", applicationHandler.VehicleManagementBookingDisplay)
-	application.HandleFunc("/vehicles-management/bookings/{bookingid}/change-vehicle", applicationHandler.VehicleManagementBookingChangeVehicle)
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}/documents/{document}", applicationHandler.BookingDocumentDownload)
 	application.HandleFunc("/agenda/", applicationHandler.AgendaHome)
 	application.HandleFunc("/agenda/create-event", applicationHandler.AgendaCreateEvent)
@@ -108,14 +107,20 @@ func main() {
 	application.HandleFunc("/group/settings", applicationHandler.GroupSettingsDisplay)
 	application.HandleFunc("/group/settings/invite-member", applicationHandler.GroupSettingsInviteMember)
 
+	/****************************Groupe Déplacement ************************************/
+	// application.HandleFunc("/journeys/groups_covoiturage", applicationHandler.GroupsGestion)
+	// application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
+	// application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
+	/****************************************************************/
+
 	/********************Code Supprt Emailing************************/
 	application.HandleFunc("/support/", applicationHandler.SupportSend)
 	/*********************** CODE GROUP **************************/
+
 	appGroup := application.PathPrefix("/group_module").Subrouter()
 	appGroup.HandleFunc("/", applicationHandler.Groups)
 	appGroup.HandleFunc("/groups", applicationHandler.CreateGroupModule)
 	appGroup.HandleFunc("/groups/{groupid}", applicationHandler.DisplayGroupModule)
-	/****************************************************************/
 
 	//TODO Subrouters with middlewares checking security for each module ?
 	application.Use(idp.Middleware)
@@ -127,6 +132,10 @@ func main() {
 	appAdmin.HandleFunc("/groups/{groupid}", applicationHandler.AdministrationGroupDisplay)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-admin", applicationHandler.AdministrationGroupInviteAdmin)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-member", applicationHandler.AdministrationGroupInviteMember)
+
+	///////////////////////////code page profile of admin ///////////////////////////
+	application.HandleFunc("/profile/{adminid}", applicationHandler.ConseillerDisplay)
+	application.HandleFunc("/profile/{adminid}/update", applicationHandler.ConseillerUpdate)
 	//TODO Secure with Middleware checking for modules
 
 	fmt.Println("-> HTTP server listening on", address)

renderer/conseillers.go

@@ -0,0 +1,24 @@
+package renderer
+
+import (
+	"net/http"
+)
+
+const conseillersMenu = "conseillers"
+
+func (renderer *Renderer) ConseillerDisplay(w http.ResponseWriter, r *http.Request, admins any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.conseillers.display.files")
+
+	state := NewState(r, renderer.ThemeConfig, conseillersMenu)
+	state.ViewState = map[string]any{
+		"admins": admins,
+	}
+	renderer.Render("conseillers_list", w, r, files, state)
+}
+
+func (renderer *Renderer) ConseillerUpdate(w http.ResponseWriter, r *http.Request, user any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.conseillers.update.files")
+	state := NewState(r, renderer.ThemeConfig, conseillersMenu)
+	state.ViewState = user
+	renderer.Render("conseillers_update", w, r, files, state)
+}

renderer/renderer.go

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