From 1532ede587d907d55b8fa721dabf4dcc4c6aef73 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sat, 19 Nov 2022 13:05:26 +0100 Subject: [PATCH] Revert "Display survey mean to admin" This reverts commit d7f679ce8443de51f5f639283d2ff12cb3843374. --- surveys.go | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/surveys.go b/surveys.go index 81a0185..fd3181e 100644 --- a/surveys.go +++ b/surveys.go @@ -72,12 +72,11 @@ func declareAPIAuthSurveysRoutes(router *gin.RouterGroup) { surveysRoutes.Use(surveyUserAccessHandler) surveysRoutes.GET("/score", func(c *gin.Context) { - loggedUser := c.MustGet("LoggedUser").(*User) var u *User if user, ok := c.Get("user"); ok { u = user.(*User) } else { - u = loggedUser + u = c.MustGet("LoggedUser").(*User) } s := c.MustGet("survey").(*Survey) @@ -89,29 +88,10 @@ func declareAPIAuthSurveysRoutes(router *gin.RouterGroup) { return } - if score != nil { - c.JSON(http.StatusOK, map[string]float64{"score": *score}) - } else if _, ok := c.Get("user"); !ok && loggedUser.IsAdmin { - // Admin retrieve mean score - scores, err := s.GetGrades() - if err != nil { - log.Printf("Unable to GetGrades(sid=%d): %s", s.Id, err.Error()) - c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs when trying to retrieve grades."}) - return - } - - *score = 0 - nbGrades := 0 - for _, s := range scores { - *score += *s - nbGrades += 1 - } - - *score /= float64(nbGrades) - - c.JSON(http.StatusOK, map[string]float64{"score": *score}) - } else { + if score == nil { c.JSON(http.StatusOK, map[string]string{"score": "N/A"}) + } else { + c.JSON(http.StatusOK, map[string]float64{"score": *score}) } } else { c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"errmsg": "Not accessible"})