Compare commits
7 Commits
696cd1d87f
...
deleteMemb
| Author | SHA1 | Date | |
|---|---|---|---|
| f698891865 | |||
| 193f5dfb6f | |||
| 49de2f22c4 | |||
| ab8cbf6f73 | |||
| 10bde53c5e | |||
| 28c8fa8a90 | |||
| 11851fec61 |
@@ -231,7 +231,8 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
|
|||||||
"subscribed_by": map[string]any{
|
"subscribed_by": map[string]any{
|
||||||
"user": map[string]any{
|
"user": map[string]any{
|
||||||
"id": current_user_token.Subject,
|
"id": current_user_token.Subject,
|
||||||
"display_name": current_user_claims["display_name"],
|
"display_name": current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
|
||||||
|
"email": current_user_claims["email"].(string),
|
||||||
},
|
},
|
||||||
"group": map[string]any{
|
"group": map[string]any{
|
||||||
"id": current_group.ID,
|
"id": current_group.ID,
|
||||||
@@ -330,31 +331,42 @@ func contains(s []*agenda.Subscription, e string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// /////////////////////////Delete subscriber///////////////////////////////
|
///////////////////////////Delete subscriber///////////////////////////////
|
||||||
|
|
||||||
func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
|
func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
|
||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
eventId := vars["eventid"]
|
eventId := vars["eventid"]
|
||||||
subscribeid := vars["subscribeid"]
|
subscribeid := vars["subscribeid"]
|
||||||
|
s_b_id := ""
|
||||||
|
s_b_name := ""
|
||||||
|
s_b_email := ""
|
||||||
|
s_b_group_id := ""
|
||||||
|
s_b_group_name := ""
|
||||||
|
request := &agenda.GetEventRequest{
|
||||||
|
Id: eventId,
|
||||||
|
}
|
||||||
|
|
||||||
/////////////////////////Test ajout motif///////////////////////////////
|
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
|
||||||
// dd, _ := structpb.NewStruct(map[string]any{})
|
if err != nil {
|
||||||
// request := &agenda.GetEventRequest{
|
fmt.Println(err)
|
||||||
// Id: eventId,
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
// }
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
|
for i := range resp.Event.Subscriptions {
|
||||||
// if err != nil {
|
if resp.Event.Subscriptions[i].Subscriber == subscribeid {
|
||||||
// fmt.Println(err)
|
subscribed_by_id := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["id"].GetStringValue()
|
||||||
// w.WriteHeader(http.StatusInternalServerError)
|
subscribed_by_name := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["display_name"].GetStringValue()
|
||||||
// return
|
subscribed_by_email := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["email"].GetStringValue()
|
||||||
// }
|
subscribed_by_group_id := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["group"].GetStructValue().Fields["id"].GetStringValue()
|
||||||
|
subscribed_by_group_name := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["group"].GetStructValue().Fields["name"].GetStringValue()
|
||||||
// for i := range resp.Event.Subscriptions {
|
s_b_id = subscribed_by_id
|
||||||
// if resp.Event.Subscriptions[i].Subscriber == subscribeid {
|
s_b_name = subscribed_by_name
|
||||||
// d := resp.Event.Subscriptions[i].Data
|
s_b_email = subscribed_by_email
|
||||||
// dd = d
|
s_b_group_id = subscribed_by_group_id
|
||||||
// }
|
s_b_group_name = subscribed_by_group_name
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
|
||||||
current_group, err := h.currentGroup(r)
|
current_group, err := h.currentGroup(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -371,10 +383,22 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
|
|||||||
}
|
}
|
||||||
|
|
||||||
data := map[string]any{
|
data := map[string]any{
|
||||||
|
"subscribed_by": map[string]any{
|
||||||
|
"user": map[string]any{
|
||||||
|
"id": s_b_id,
|
||||||
|
"display_name": s_b_name,
|
||||||
|
"email": s_b_email,
|
||||||
|
},
|
||||||
|
"group": map[string]any{
|
||||||
|
"id": s_b_group_id,
|
||||||
|
"name": s_b_group_name,
|
||||||
|
},
|
||||||
|
},
|
||||||
"unsubscribed_by": map[string]any{
|
"unsubscribed_by": map[string]any{
|
||||||
"user": map[string]any{
|
"user": map[string]any{
|
||||||
"id": current_user_token.Subject,
|
"id": current_user_token.Subject,
|
||||||
"display_name": current_user_claims["display_name"],
|
"display_name": current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
|
||||||
|
"email": current_user_claims["email"],
|
||||||
},
|
},
|
||||||
"group": map[string]any{
|
"group": map[string]any{
|
||||||
"id": current_group.ID,
|
"id": current_group.ID,
|
||||||
@@ -383,6 +407,7 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
|
|||||||
},
|
},
|
||||||
"motif": r.FormValue("motif"),
|
"motif": r.FormValue("motif"),
|
||||||
}
|
}
|
||||||
|
|
||||||
datapb, err := structpb.NewStruct(data)
|
datapb, err := structpb.NewStruct(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err)
|
fmt.Println(err)
|
||||||
@@ -397,7 +422,14 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
|
|||||||
Data: datapb,
|
Data: datapb,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data := map[string]any{
|
||||||
|
"key": r.FormValue("motif"),
|
||||||
|
"user": current_user_claims["email"],
|
||||||
|
}
|
||||||
|
|
||||||
|
// récupérer l'adresse mail de l'utilisateur qui a créé l'événement
|
||||||
|
mail := s_b_email;
|
||||||
|
fmt.Println(mail)
|
||||||
|
|
||||||
_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)
|
_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)
|
||||||
|
|
||||||
@@ -407,6 +439,12 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventId), http.StatusFound)
|
http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventId), http.StatusFound)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -415,6 +453,89 @@ func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r
|
|||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// /////////////////////History Event////////////////////////
|
||||||
|
func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) {
|
||||||
|
vars := mux.Vars(r)
|
||||||
|
eventId := vars["eventid"]
|
||||||
|
request := &agenda.GetEventRequest{
|
||||||
|
Id: eventId,
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
grouprequest := &groupsmanagement.GetGroupRequest{
|
||||||
|
Id: resp.Event.Owners[0],
|
||||||
|
}
|
||||||
|
|
||||||
|
groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
subscribers := map[string]any{}
|
||||||
|
|
||||||
|
accids := []string{}
|
||||||
|
for _, v := range resp.Event.DeletedSubscription {
|
||||||
|
accids = append(accids, v.Subscriber)
|
||||||
|
}
|
||||||
|
|
||||||
|
subscriberresp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(
|
||||||
|
context.TODO(),
|
||||||
|
&mobilityaccounts.GetAccountsBatchRequest{
|
||||||
|
Accountids: accids,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
for _, sub := range subscriberresp.Accounts {
|
||||||
|
subscribers[sub.Id] = sub.ToStorageType()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g := r.Context().Value(identification.GroupKey)
|
||||||
|
if g == nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
group := g.(storage.Group)
|
||||||
|
|
||||||
|
accountids := []string{}
|
||||||
|
for _, m := range group.Members {
|
||||||
|
if !contains(resp.Event.DeletedSubscription, m) {
|
||||||
|
accountids = append(accountids, m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(
|
||||||
|
context.TODO(),
|
||||||
|
&mobilityaccounts.GetAccountsBatchRequest{
|
||||||
|
Accountids: accountids,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
accounts := []any{}
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
for _, acc := range accountresp.Accounts {
|
||||||
|
accounts = append(accounts, acc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
|
||||||
|
}
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////
|
||||||
|
|
||||||
// func contains[V string](s []V, e V) bool {
|
// func contains[V string](s []V, e V) bool {
|
||||||
// for _, a := range s {
|
// for _, a := range s {
|
||||||
// if a == e {
|
// if a == e {
|
||||||
|
|||||||
1
main.go
1
main.go
@@ -139,6 +139,7 @@ func main() {
|
|||||||
|
|
||||||
/////////////////////////////////////Delete subscriber///////////////////////////////////////////////
|
/////////////////////////////////////Delete subscriber///////////////////////////////////////////////
|
||||||
application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
|
application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
|
||||||
|
application.HandleFunc("/agenda/{eventid}/history", applicationHandler.AgendaHistoryEvent)
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
fmt.Println("-> HTTP server listening on", address)
|
fmt.Println("-> HTTP server listening on", address)
|
||||||
|
|
||||||
|
|||||||
@@ -51,3 +51,18 @@ func (renderer *Renderer) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *h
|
|||||||
}
|
}
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
//////////////////////////History Event//////////////////////////////////
|
||||||
|
func (renderer *Renderer) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request, event any, group any, subscribers map[string]any, beneficiaries any) {
|
||||||
|
files := renderer.ThemeConfig.GetStringSlice("views.agenda.history_event.files")
|
||||||
|
state := NewState(r, renderer.ThemeConfig, agendaMenu)
|
||||||
|
state.ViewState = map[string]any{
|
||||||
|
"event": event,
|
||||||
|
"group": group,
|
||||||
|
"subscribers": subscribers,
|
||||||
|
"beneficiaries": beneficiaries,
|
||||||
|
}
|
||||||
|
|
||||||
|
renderer.Render("agenda history event", w, r, files, state)
|
||||||
|
}
|
||||||
|
////////////////////////////////////////////////////////////////////////
|
||||||
Reference in New Issue
Block a user