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

fix: critical fixes related to alias resolution

Browse Source
This commit is contained in:
Ferdinand Mütsch
2020-11-01 12:50:59 +01:00
parent 861c81e414
commit c2d30826f6
11 changed files with 159 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
routes/compat/shields/v1/badge.go
View File

@@ -20,6 +20,7 @@ const (
type BadgeHandler struct {
userSrvc *services.UserService
summarySrvc *services.SummaryService
aliasSrvc *services.AliasService
config *config2.Config
}
@@ -57,18 +58,18 @@ func (h *BadgeHandler) ApiGet(w http.ResponseWriter, r *http.Request) {
interval = groups[1]
}
filters := &models.Filters{}
var filters *models.Filters
switch filterEntity {
case "project":
filters.Project = filterKey
filters = models.NewFiltersWith(models.SummaryProject, filterKey)
case "os":
filters.OS = filterKey
filters = models.NewFiltersWith(models.SummaryOS, filterKey)
case "editor":
filters.Editor = filterKey
filters = models.NewFiltersWith(models.SummaryEditor, filterKey)
case "language":
filters.Language = filterKey
filters = models.NewFiltersWith(models.SummaryLanguage, filterKey)
case "machine":
filters.Machine = filterKey
filters = models.NewFiltersWith(models.SummaryMachine, filterKey)
}
summary, err, status := h.loadUserSummary(user, interval)
@@ -94,7 +95,9 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval string) (*mod
User: user,
}
summary, err := h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute)
summary, err := h.summarySrvc.PostProcessWrapped(
h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute),
)
if err != nil {
return nil, err, http.StatusInternalServerError
}

4
routes/compat/wakatime/v1/all_time.go
View File

@@ -55,7 +55,9 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User) (*models.Summary, er
Recompute: false,
}
summary, err := h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute) // 'to' is always constant
summary, err := h.summarySrvc.PostProcessWrapped(
h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute), // 'to' is always constant
)
if err != nil {
return nil, err, http.StatusInternalServerError
}

4
routes/compat/wakatime/v1/summaries.go
View File

@@ -86,7 +86,9 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
summaries := make([]*models.Summary, len(intervals))
for i, interval := range intervals {
summary, err := h.summarySrvc.Construct(interval[0], interval[1], user, false) // 'to' is always constant
summary, err := h.summarySrvc.PostProcessWrapped(
h.summarySrvc.Construct(interval[0], interval[1], user, false), // 'to' is always constant
)
if err != nil {
return nil, err, http.StatusInternalServerError
}

4
routes/summary.go
View File

@@ -69,7 +69,9 @@ func (h *SummaryHandler) loadUserSummary(r *http.Request) (*models.Summary, erro
return nil, err, http.StatusBadRequest
}
summary, err := h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute) // 'to' is always constant
summary, err := h.summarySrvc.PostProcessWrapped(
h.summarySrvc.Construct(summaryParams.From, summaryParams.To, summaryParams.User, summaryParams.Recompute), // 'to' is always constant
)
if err != nil {
return nil, err, http.StatusInternalServerError
}