Use gin-gonic instead of httprouter
This commit is contained in:
parent
7c719d9fd5
commit
a203cdc36a
22 changed files with 1631 additions and 1355 deletions
314
works.go
314
works.go
|
|
@ -2,158 +2,233 @@ package main
|
|||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/julienschmidt/httprouter"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
router.GET("/api/works", apiAuthHandler(
|
||||
func(u *User, _ httprouter.Params, _ []byte) HTTPResponse {
|
||||
if u == nil {
|
||||
return formatApiResponse(getWorks(fmt.Sprintf("WHERE shown = TRUE AND NOW() > start_availability AND promo = %d ORDER BY start_availability ASC", currentPromo)))
|
||||
} else if u.IsAdmin {
|
||||
return formatApiResponse(getWorks("ORDER BY promo DESC, start_availability ASC"))
|
||||
} else {
|
||||
works, err := getWorks(fmt.Sprintf("WHERE shown = TRUE AND promo = %d ORDER BY start_availability ASC", u.Promo))
|
||||
if err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
}
|
||||
func declareAPIWorksRoutes(router *gin.RouterGroup) {
|
||||
router.GET("/works", func(c *gin.Context) {
|
||||
var u *User
|
||||
if user, ok := c.Get("LoggedUser"); ok {
|
||||
u = user.(*User)
|
||||
}
|
||||
|
||||
var response []Work
|
||||
for _, w := range works {
|
||||
if w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",") {
|
||||
w.Group = ""
|
||||
response = append(response, w)
|
||||
}
|
||||
}
|
||||
var works []*Work
|
||||
var err error
|
||||
if u == nil {
|
||||
works, err = getWorks(fmt.Sprintf("WHERE shown = TRUE AND NOW() > start_availability AND promo = %d ORDER BY start_availability ASC", currentPromo))
|
||||
} else if u.IsAdmin {
|
||||
works, err = getWorks("ORDER BY promo DESC, start_availability ASC")
|
||||
} else {
|
||||
works, err = getWorks(fmt.Sprintf("WHERE shown = TRUE AND promo = %d ORDER BY start_availability ASC", u.Promo))
|
||||
}
|
||||
|
||||
return formatApiResponse(response, nil)
|
||||
if err != nil {
|
||||
log.Println("Unable to getWorks:", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Impossible de récupérer la liste des travaux. Veuillez réessayer dans quelques instants."})
|
||||
return
|
||||
}
|
||||
|
||||
var response []*Work
|
||||
if u == nil || u.IsAdmin {
|
||||
response = works
|
||||
} else {
|
||||
for _, w := range works {
|
||||
if w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",") {
|
||||
w.Group = ""
|
||||
response = append(response, w)
|
||||
}
|
||||
}
|
||||
}))
|
||||
router.GET("/api/all_works", apiAuthHandler(
|
||||
func(u *User, _ httprouter.Params, _ []byte) HTTPResponse {
|
||||
if u == nil {
|
||||
return formatApiResponse(allWorks(fmt.Sprintf("WHERE (shown = TRUE OR direct IS NOT NULL) AND NOW() > start_availability AND promo = %d ORDER BY start_availability ASC, end_availability ASC", currentPromo)))
|
||||
} else if u.IsAdmin {
|
||||
return formatApiResponse(allWorks("ORDER BY promo DESC, start_availability ASC"))
|
||||
} else {
|
||||
works, err := allWorks(fmt.Sprintf("WHERE (shown = TRUE OR direct IS NOT NULL) AND promo = %d ORDER BY start_availability ASC, end_availability ASC", u.Promo))
|
||||
if err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
}
|
||||
}
|
||||
|
||||
var response []OneWork
|
||||
for _, w := range works {
|
||||
if w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",") {
|
||||
w.Group = ""
|
||||
response = append(response, w)
|
||||
}
|
||||
}
|
||||
c.JSON(http.StatusOK, response)
|
||||
})
|
||||
router.GET("/all_works", func(c *gin.Context) {
|
||||
var u *User
|
||||
if user, ok := c.Get("LoggedUser"); ok {
|
||||
u = user.(*User)
|
||||
}
|
||||
|
||||
return formatApiResponse(response, nil)
|
||||
var works []*OneWork
|
||||
var err error
|
||||
if u == nil {
|
||||
works, err = allWorks(fmt.Sprintf("WHERE (shown = TRUE OR direct IS NOT NULL) AND NOW() > start_availability AND promo = %d ORDER BY start_availability ASC, end_availability ASC", currentPromo))
|
||||
} else if u.IsAdmin {
|
||||
works, err = allWorks("ORDER BY promo DESC, start_availability ASC")
|
||||
} else {
|
||||
works, err = allWorks(fmt.Sprintf("WHERE (shown = TRUE OR direct IS NOT NULL) AND promo = %d ORDER BY start_availability ASC, end_availability ASC", u.Promo))
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Println("Unable to getWorks:", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Impossible de récupérer la liste des travaux. Veuillez réessayer dans quelques instants."})
|
||||
return
|
||||
}
|
||||
|
||||
var response []*OneWork
|
||||
if u == nil || u.IsAdmin {
|
||||
response = works
|
||||
} else {
|
||||
for _, w := range works {
|
||||
if w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",") {
|
||||
w.Group = ""
|
||||
response = append(response, w)
|
||||
}
|
||||
}
|
||||
}))
|
||||
router.POST("/api/works", apiHandler(func(_ httprouter.Params, body []byte) HTTPResponse {
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, response)
|
||||
})
|
||||
}
|
||||
|
||||
func declareAPIAdminWorksRoutes(router *gin.RouterGroup) {
|
||||
router.POST("/works", func(c *gin.Context) {
|
||||
var new Work
|
||||
if err := json.Unmarshal(body, &new); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
if err := c.ShouldBindJSON(&new); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
if new.Promo == 0 {
|
||||
new.Promo = currentPromo
|
||||
}
|
||||
|
||||
return formatApiResponse(NewWork(new.Title, new.Promo, new.Group, new.Shown, new.SubmissionURL, new.StartAvailability, new.EndAvailability))
|
||||
}, adminRestricted))
|
||||
router.GET("/api/works/:wid", apiAuthHandler(workAuthHandler(
|
||||
func(w Work, u *User, _ []byte) HTTPResponse {
|
||||
if u.IsAdmin {
|
||||
return APIResponse{w}
|
||||
} else if w.Shown && w.StartAvailability.Before(time.Now()) && (w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",")) {
|
||||
return APIResponse{w}
|
||||
} else {
|
||||
return APIErrorResponse{status: http.StatusForbidden, err: fmt.Errorf("Permission denied")}
|
||||
}
|
||||
}), loggedUser))
|
||||
router.PUT("/api/works/:wid", apiHandler(workHandler(func(current Work, body []byte) HTTPResponse {
|
||||
work, err := NewWork(new.Title, new.Promo, new.Group, new.Shown, new.SubmissionURL, new.StartAvailability, new.EndAvailability)
|
||||
if err != nil {
|
||||
log.Println("Unable to NewWork:", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during work creation"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, work)
|
||||
})
|
||||
|
||||
worksRoutes := router.Group("/works/:wid")
|
||||
worksRoutes.Use(workHandler)
|
||||
|
||||
worksRoutes.PUT("", func(c *gin.Context) {
|
||||
current := c.MustGet("work").(*Work)
|
||||
|
||||
var new Work
|
||||
if err := json.Unmarshal(body, &new); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
if err := c.ShouldBindJSON(&new); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
new.Id = current.Id
|
||||
|
||||
return formatApiResponse(new.Update())
|
||||
}), adminRestricted))
|
||||
router.DELETE("/api/works/:wid", apiHandler(workHandler(
|
||||
func(w Work, _ []byte) HTTPResponse {
|
||||
return formatApiResponse(w.Delete())
|
||||
}), adminRestricted))
|
||||
work, err := new.Update()
|
||||
if err != nil {
|
||||
log.Println("Unable to Update work:", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during work update."})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, work)
|
||||
})
|
||||
worksRoutes.DELETE("", func(c *gin.Context) {
|
||||
w := c.MustGet("work").(*Work)
|
||||
|
||||
_, err := w.Delete()
|
||||
if err != nil {
|
||||
log.Println("Unable to Delte work:", err)
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during work deletion."})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, nil)
|
||||
})
|
||||
|
||||
// Grades related to works
|
||||
router.GET("/api/works/:wid/grades", apiHandler(workHandler(
|
||||
func(w Work, _ []byte) HTTPResponse {
|
||||
return formatApiResponse(w.GetGrades(""))
|
||||
}), adminRestricted))
|
||||
router.PUT("/api/works/:wid/grades", apiHandler(workHandler(
|
||||
func(w Work, body []byte) HTTPResponse {
|
||||
_, err := w.DeleteGrades()
|
||||
if err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
}
|
||||
worksRoutes.GET("/grades", func(c *gin.Context) {
|
||||
w := c.MustGet("work").(*Work)
|
||||
|
||||
var grades []WorkGrade
|
||||
if err := json.Unmarshal(body, &grades); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
}
|
||||
grades, err := w.GetGrades("")
|
||||
if err != nil {
|
||||
log.Printf("Unable to GetGrades(wid=%d): %s", w.Id, err.Error())
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during grades retrieval."})
|
||||
return
|
||||
}
|
||||
|
||||
err = w.AddGrades(grades)
|
||||
if err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
}
|
||||
c.JSON(http.StatusOK, grades)
|
||||
})
|
||||
worksRoutes.PUT("/grades", func(c *gin.Context) {
|
||||
w := c.MustGet("work").(*Work)
|
||||
|
||||
return APIResponse{true}
|
||||
}), adminRestricted))
|
||||
router.GET("/api/works/:wid/score", apiAuthHandler(workAuthHandler(
|
||||
func(w Work, u *User, _ []byte) HTTPResponse {
|
||||
if g, err := u.GetMyWorkGrade(&w); err != nil && errors.Is(err, sql.ErrNoRows) {
|
||||
return APIErrorResponse{status: http.StatusNotFound, err: fmt.Errorf("Aucune note n'a été attribuée pour ce travail. Avez-vous rendu ce travail ?")}
|
||||
} else if err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
} else {
|
||||
return APIResponse{g}
|
||||
}
|
||||
}), loggedUser))
|
||||
var grades []WorkGrade
|
||||
if err := c.ShouldBindJSON(&grades); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
_, err := w.DeleteGrades()
|
||||
if err != nil {
|
||||
log.Printf("Unable to DeleteGrades(wid=%d): %s", w.Id, err.Error())
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during grades deletion."})
|
||||
return
|
||||
}
|
||||
|
||||
err = w.AddGrades(grades)
|
||||
if err != nil {
|
||||
log.Printf("Unable to AddGrades(wid=%d): %s", w.Id, err.Error())
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during grades erasing."})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, true)
|
||||
})
|
||||
}
|
||||
|
||||
func workHandler(f func(Work, []byte) HTTPResponse) func(httprouter.Params, []byte) HTTPResponse {
|
||||
return func(ps httprouter.Params, body []byte) HTTPResponse {
|
||||
if wid, err := strconv.Atoi(string(ps.ByName("wid"))); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
} else if work, err := getWork(wid); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
func declareAPIAuthWorksRoutes(router *gin.RouterGroup) {
|
||||
worksRoutes := router.Group("/works/:wid")
|
||||
worksRoutes.Use(workHandler)
|
||||
|
||||
worksRoutes.GET("", func(c *gin.Context) {
|
||||
u := c.MustGet("LoggedUser").(*User)
|
||||
w := c.MustGet("work").(*Work)
|
||||
|
||||
if u.IsAdmin {
|
||||
c.JSON(http.StatusOK, w)
|
||||
} else if w.Shown && w.StartAvailability.Before(time.Now()) && (w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",")) {
|
||||
c.JSON(http.StatusOK, w)
|
||||
} else {
|
||||
return f(work, body)
|
||||
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"errmsg": "Permission denied"})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Grades related to works
|
||||
worksRoutes.GET("/score", func(c *gin.Context) {
|
||||
u := c.MustGet("LoggedUser").(*User)
|
||||
w := c.MustGet("work").(*Work)
|
||||
|
||||
if g, err := u.GetMyWorkGrade(w); err != nil && errors.Is(err, sql.ErrNoRows) {
|
||||
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Aucune note n'a été attribuée pour ce travail. Avez-vous rendu ce travail ?"})
|
||||
} else if err != nil {
|
||||
log.Printf("Unable to GetMyWorkGrade(uid=%d;wid=%d): %s", u.Id, w.Id, err.Error())
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during grade calculation."})
|
||||
} else {
|
||||
c.JSON(http.StatusOK, g)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func workAuthHandler(f func(Work, *User, []byte) HTTPResponse) func(*User, httprouter.Params, []byte) HTTPResponse {
|
||||
return func(u *User, ps httprouter.Params, body []byte) HTTPResponse {
|
||||
if wid, err := strconv.Atoi(string(ps.ByName("wid"))); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
} else if work, err := getWork(wid); err != nil {
|
||||
return APIErrorResponse{err: err}
|
||||
} else {
|
||||
return f(work, u, body)
|
||||
}
|
||||
func workHandler(c *gin.Context) {
|
||||
if wid, err := strconv.Atoi(string(c.Param("wid"))); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": "Bad work identifier."})
|
||||
return
|
||||
} else if work, err := getWork(wid); err != nil {
|
||||
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Work not found."})
|
||||
return
|
||||
} else {
|
||||
c.Set("work", work)
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -171,7 +246,7 @@ type OneWork struct {
|
|||
EndAvailability time.Time `json:"end_availability"`
|
||||
}
|
||||
|
||||
func allWorks(cnd string, param ...interface{}) (items []OneWork, err error) {
|
||||
func allWorks(cnd string, param ...interface{}) (items []*OneWork, err error) {
|
||||
if rows, errr := DBQuery("SELECT kind, id, title, promo, grp, shown, direct, submission_url, corrected, start_availability, end_availability FROM all_works "+cnd, param...); errr != nil {
|
||||
return nil, errr
|
||||
} else {
|
||||
|
|
@ -182,7 +257,7 @@ func allWorks(cnd string, param ...interface{}) (items []OneWork, err error) {
|
|||
if err = rows.Scan(&w.Kind, &w.Id, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.Direct, &w.SubmissionURL, &w.Corrected, &w.StartAvailability, &w.EndAvailability); err != nil {
|
||||
return
|
||||
}
|
||||
items = append(items, w)
|
||||
items = append(items, &w)
|
||||
}
|
||||
if err = rows.Err(); err != nil {
|
||||
return
|
||||
|
|
@ -204,7 +279,7 @@ type Work struct {
|
|||
EndAvailability time.Time `json:"end_availability"`
|
||||
}
|
||||
|
||||
func getWorks(cnd string, param ...interface{}) (items []Work, err error) {
|
||||
func getWorks(cnd string, param ...interface{}) (items []*Work, err error) {
|
||||
if rows, errr := DBQuery("SELECT id_work, title, promo, grp, shown, submission_url, corrected, start_availability, end_availability FROM works "+cnd, param...); errr != nil {
|
||||
return nil, errr
|
||||
} else {
|
||||
|
|
@ -215,7 +290,7 @@ func getWorks(cnd string, param ...interface{}) (items []Work, err error) {
|
|||
if err = rows.Scan(&w.Id, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.SubmissionURL, &w.Corrected, &w.StartAvailability, &w.EndAvailability); err != nil {
|
||||
return
|
||||
}
|
||||
items = append(items, w)
|
||||
items = append(items, &w)
|
||||
}
|
||||
if err = rows.Err(); err != nil {
|
||||
return
|
||||
|
|
@ -225,7 +300,8 @@ func getWorks(cnd string, param ...interface{}) (items []Work, err error) {
|
|||
}
|
||||
}
|
||||
|
||||
func getWork(id int) (w Work, err error) {
|
||||
func getWork(id int) (w *Work, err error) {
|
||||
w = new(Work)
|
||||
err = DBQueryRow("SELECT id_work, title, promo, grp, shown, submission_url, corrected, start_availability, end_availability FROM works WHERE id_work=?", id).Scan(&w.Id, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.SubmissionURL, &w.Corrected, &w.StartAvailability, &w.EndAvailability)
|
||||
return
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue