handlers/application/administration.go

@@ -211,8 +211,13 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
 func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	groupid := vars["groupid"]
-
-	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
+	var (
+		groupresp   *groupsmanagement.GetGroupResponse
+		accountresp *accounts.GetAccountUsernameResponse
+		err         error
+	)
+	go func() {
+		groupresp, err = h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), &groupsmanagement.GetGroupRequest{
 			Id:        groupid,
 			Namespace: "parcoursmob_organizations",
 		})
@@ -222,14 +227,14 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
-
+	}()
 	r.ParseForm()
 
-	accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
+	go func() {
+		accountresp, err = h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
 			Username:  r.FormValue("username"),
 			Namespace: "parcoursmob",
 		})
-
 		if err == nil {
 			// Account already exists : adding the existing account to admin list
 			account := accountresp.Account.ToStorageType()
@@ -289,12 +294,16 @@ func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWrite
 
 		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"]
-
+	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",
@@ -305,16 +314,16 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 			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",
 		})
-
 		if err == nil {
 			account := accountresp.Account.ToStorageType()
 			account.Data["groups"] = append(account.Data["groups"].([]any), group.ID)
@@ -327,15 +336,11 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 					Account: as,
 				},
 			)
-
-		fmt.Println(err)
-
 			data := map[string]any{
 				"group": group.Data["name"],
 			}
 
 			if err := h.emailing.Send("onboarding.existing_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
 			}
 
 			http.Redirect(w, r, "/app/group/settings", http.StatusFound)
@@ -350,26 +355,23 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 
 			b := make([]byte, 16)
 			if _, err := io.ReadFull(rand.Reader, b); err != nil {
-			fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
 			key := base64.RawURLEncoding.EncodeToString(b)
 
 			h.cache.PutWithTTL("onboarding/"+key, onboarding, 168*time.Hour) // 1 week TTL
-
 			data := map[string]any{
 				"group": group.Data["name"],
 				"key":   key,
 			}
 
 			if err := h.emailing.Send("onboarding.new_member", r.FormValue("username"), data); err != nil {
-			fmt.Println(err)
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
 		}
-
+	}()
 	http.Redirect(w, r, "/app/administration/groups/"+group.ID, http.StatusFound)
 	return
 }