add date to badges endpoint and rapair 404 response if user or badges dont exist
This commit is contained in:
@@ -2,13 +2,27 @@ package v1
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"gractwo-api/database"
|
"gractwo-api/database"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetUserBadges(c *gin.Context) {
|
func GetUserBadges(c *gin.Context) {
|
||||||
var badges []database.Badge
|
type badge struct {
|
||||||
|
Id string
|
||||||
|
Name string
|
||||||
|
Desc string
|
||||||
|
Expl string
|
||||||
|
Img string
|
||||||
|
Date *time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
var badges []badge
|
||||||
userId := c.Param("user")
|
userId := c.Param("user")
|
||||||
database.DB.Model(&database.User{}).Select("badges.id, badges.name, badges.desc, badges.expl, badges.img").Joins("join given_badges on users.user_id = given_badges.user_id").Joins("join badges on badges.id = badges.id").Where("users.user_id = ?", userId).Scan(&badges)
|
database.DB.Model(&database.User{}).Select("badges.id, badges.name, badges.desc, badges.expl, badges.img, given_badges.date").Joins("join given_badges on users.user_id = given_badges.user_id").Joins("join badges on badges.id = badges.id").Where("users.user_id = ?", userId).Scan(&badges)
|
||||||
c.JSON(200, badges)
|
if badges == nil {
|
||||||
|
c.JSON(404, "Not found")
|
||||||
|
} else {
|
||||||
|
c.JSON(200, badges)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user