mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

feat: leaderboard aggregation functionality

Browse Source 
feat: leaderboard ui design
This commit is contained in:
Ferdinand Mütsch
2022-10-03 23:52:22 +02:00
parent 1d7ff4bc2a
commit a27fe04919
17 changed files with 216 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
routes/leaderboard.go
View File

@@ -2,6 +2,7 @@ package routes
import (
"fmt"
"github.com/emvi/logbuch"
"github.com/gorilla/mux"
conf "github.com/muety/wakapi/config"
"github.com/muety/wakapi/middlewares"
@@ -45,29 +46,41 @@ func (h *LeaderboardHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
if h.config.IsDev() {
loadTemplates()
}
templates[conf.LeaderboardTemplate].Execute(w, h.buildViewModel(r))
if err := templates[conf.LeaderboardTemplate].Execute(w, h.buildViewModel(r)); err != nil {
logbuch.Error(err.Error())
}
}
func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardViewModel {
user := middlewares.GetPrincipal(r)
byParam := strings.ToLower(r.URL.Query().Get("by"))
keyParam := strings.ToLower(r.URL.Query().Get("key"))
var err error
var items []*models.LeaderboardItem
var leaderboard models.Leaderboard
var topKeys []string
if byParam == "" {
items, err = h.leaderboardService.GetByInterval(models.IntervalPast7Days)
leaderboard, err = h.leaderboardService.GetByInterval(models.IntervalPast7Days, true)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
}
} else {
if by, ok := allowedAggregations[byParam]; ok {
items, err = h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by)
leaderboard, err = h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by, true)
if err != nil {
conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
return &view.LeaderboardViewModel{Error: criticalError}
}
topKeys = leaderboard.TopKeys(by)
if len(topKeys) > 0 {
if keyParam == "" {
keyParam = strings.ToLower(topKeys[0])
}
leaderboard = leaderboard.TopByKey(by, keyParam)
}
} else {
return &view.LeaderboardViewModel{Error: fmt.Sprintf("unsupported aggregation '%s'", byParam)}
}
@@ -81,7 +94,9 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
return &view.LeaderboardViewModel{
User: user,
By: byParam,
Items: items,
Key: keyParam,
Items: leaderboard,
TopKeys: topKeys,
ApiKey: apiKey,
Success: r.URL.Query().Get("success"),
Error: r.URL.Query().Get("error"),

2
routes/routes.go
View File

@@ -35,9 +35,11 @@ func DefaultTemplateFuncs() template.FuncMap {
"join": strings.Join,
"add": utils.Add,
"capitalize": utils.Capitalize,
"lower": strings.ToLower,
"toRunes": utils.ToRunes,
"localTZOffset": utils.LocalTZOffset,
"entityTypes": models.SummaryTypes,
"strslice": utils.SubSlice[string],
"typeName": typeName,
"isDev": func() bool {
return config.Get().IsDev()