diff --git a/services/graph/pkg/service/v0/educationclasses.go b/services/graph/pkg/service/v0/educationclasses.go index 967ad1037..61fb8c2e1 100644 --- a/services/graph/pkg/service/v0/educationclasses.go +++ b/services/graph/pkg/service/v0/educationclasses.go @@ -364,7 +364,8 @@ func (g Graph) DeleteEducationClassMember(w http.ResponseWriter, r *http.Request logger := g.logger.SubloggerWithRequestID(r.Context()) classID := chi.URLParam(r, "classID") - logger.Info().Str("classID", classID).Msg("calling delete class member") + memberID := chi.URLParam(r, "memberID") + logger.Info().Str("classID", classID).Str("memberID", memberID).Msg("calling delete class member") classID, err := url.PathUnescape(classID) if err != nil { logger.Debug().Err(err).Str("id", classID).Msg("could not delete class member: unescaping class id failed") @@ -378,7 +379,6 @@ func (g Graph) DeleteEducationClassMember(w http.ResponseWriter, r *http.Request return } - memberID := chi.URLParam(r, "memberID") memberID, err = url.PathUnescape(memberID) if err != nil { logger.Debug().Err(err).Str("id", memberID).Msg("could not delete class member: unescaping member id failed") @@ -510,7 +510,8 @@ func (g Graph) DeleteEducationClassTeacher(w http.ResponseWriter, r *http.Reques logger := g.logger.SubloggerWithRequestID(r.Context()) classID := chi.URLParam(r, "classID") - logger.Info().Str("classID", classID).Msg("calling delete class teacher") + teacherID := chi.URLParam(r, "teacherID") + logger.Info().Str("classID", classID).Str("teacherID", teacherID).Msg("calling delete class teacher") classID, err := url.PathUnescape(classID) if err != nil { logger.Debug().Err(err).Str("id", classID).Msg("could not delete class teacher: unescaping class id failed") @@ -524,7 +525,6 @@ func (g Graph) DeleteEducationClassTeacher(w http.ResponseWriter, r *http.Reques return } - teacherID := chi.URLParam(r, "teacherID") teacherID, err = url.PathUnescape(teacherID) if err != nil { logger.Debug().Err(err).Str("id", teacherID).Msg("could not delete class teacher: unescaping teacher id failed") diff --git a/services/graph/pkg/service/v0/educationschools.go b/services/graph/pkg/service/v0/educationschools.go index 33a72c367..e061a5c87 100644 --- a/services/graph/pkg/service/v0/educationschools.go +++ b/services/graph/pkg/service/v0/educationschools.go @@ -342,7 +342,8 @@ func (g Graph) DeleteEducationSchoolUser(w http.ResponseWriter, r *http.Request) logger := g.logger.SubloggerWithRequestID(r.Context()) schoolID := chi.URLParam(r, "schoolID") - logger.Info().Str("schoolID", schoolID).Msg("calling delete school member") + userID := chi.URLParam(r, "userID") + logger.Info().Str("schoolID", schoolID).Str("userID", userID).Msg("calling delete school member") schoolID, err := url.PathUnescape(schoolID) if err != nil { logger.Debug().Err(err).Str("id", schoolID).Msg("could not delete school member: unescaping school id failed") @@ -356,7 +357,6 @@ func (g Graph) DeleteEducationSchoolUser(w http.ResponseWriter, r *http.Request) return } - userID := chi.URLParam(r, "userID") userID, err = url.PathUnescape(userID) if err != nil { logger.Debug().Err(err).Str("id", userID).Msg("could not delete school member: unescaping member id failed") @@ -497,7 +497,8 @@ func (g Graph) DeleteEducationSchoolClass(w http.ResponseWriter, r *http.Request logger := g.logger.SubloggerWithRequestID(r.Context()) schoolID := chi.URLParam(r, "schoolID") - logger.Info().Str("schoolID", schoolID).Msg("calling delete school class") + classID := chi.URLParam(r, "classID") + logger.Info().Str("schoolID", schoolID).Str("classID", classID).Msg("calling delete school class") schoolID, err := url.PathUnescape(schoolID) if err != nil { logger.Debug().Err(err).Str("id", schoolID).Msg("could not delete school class: unescaping school id failed") @@ -511,7 +512,6 @@ func (g Graph) DeleteEducationSchoolClass(w http.ResponseWriter, r *http.Request return } - classID := chi.URLParam(r, "classID") classID, err = url.PathUnescape(classID) if err != nil { logger.Debug().Err(err).Str("id", classID).Msg("could not delete school class: unescaping class id failed")