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: respect timezone parameter for wakatime summary endpoint (resolve #195)

Browse Source
This commit is contained in:
Ferdinand Mütsch 2021-05-01 12:46:53 +02:00
parent 11b224fc24
commit 0fbb554fc3
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get) r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
} }
// TODO: Support parameters: project, branches, timeout, writes_only, timezone // TODO: Support parameters: project, branches, timeout, writes_only
// See https://wakatime.com/developers#summaries. // See https://wakatime.com/developers#summaries.
// Timezone can be specified via an offset suffix (e.g. +02:00) in date strings. // Timezone can be specified via an offset suffix (e.g. +02:00) in date strings.
// Requires https://github.com/muety/wakapi/issues/108. // Requires https://github.com/muety/wakapi/issues/108.
@ -82,35 +82,42 @@ func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) { func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) {
user := middlewares.GetPrincipal(r) user := middlewares.GetPrincipal(r)
params := r.URL.Query() params := r.URL.Query()
rangeParam, startParam, endParam := params.Get("range"), params.Get("start"), params.Get("end") rangeParam, startParam, endParam, tzParam := params.Get("range"), params.Get("start"), params.Get("end"), params.Get("timezone")
timezone := user.TZ()
if tzParam != "" {
if tz, err := time.LoadLocation(tzParam); err == nil {
timezone = tz
}
}
var start, end time.Time var start, end time.Time
if rangeParam != "" { if rangeParam != "" {
// range param takes precedence // range param takes precedence
if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(rangeParam, user.TZ()); err == nil { if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(rangeParam, timezone); err == nil {
start, end = parsedFrom, parsedTo start, end = parsedFrom, parsedTo
} else { } else {
return nil, errors.New("invalid 'range' parameter"), http.StatusBadRequest return nil, errors.New("invalid 'range' parameter"), http.StatusBadRequest
} }
} else if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(startParam, user.TZ()); err == nil && startParam == endParam { } else if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(startParam, timezone); err == nil && startParam == endParam {
// also accept start param to be a range param // also accept start param to be a range param
start, end = parsedFrom, parsedTo start, end = parsedFrom, parsedTo
} else { } else {
// eventually, consider start and end params a date // eventually, consider start and end params a date
var err error var err error
start, err = utils.ParseDateTimeTZ(strings.Replace(startParam, " ", "+", 1), user.TZ()) start, err = utils.ParseDateTimeTZ(strings.Replace(startParam, " ", "+", 1), timezone)
if err != nil { if err != nil {
return nil, errors.New("missing required 'start' parameter"), http.StatusBadRequest return nil, errors.New("missing required 'start' parameter"), http.StatusBadRequest
} }
end, err = utils.ParseDateTimeTZ(strings.Replace(endParam, " ", "+", 1), user.TZ()) end, err = utils.ParseDateTimeTZ(strings.Replace(endParam, " ", "+", 1), timezone)
if err != nil { if err != nil {
return nil, errors.New("missing required 'end' parameter"), http.StatusBadRequest return nil, errors.New("missing required 'end' parameter"), http.StatusBadRequest
} }
} }
// wakatime iterprets end date as "inclusive", wakapi usually as "exclusive" // wakatime interprets end date as "inclusive", wakapi usually as "exclusive"
// i.e. for wakatime, an interval 2021-04-29 - 2021-04-29 is actually 2021-04-29 - 2021-04-30, // i.e. for wakatime, an interval 2021-04-29 - 2021-04-29 is actually 2021-04-29 - 2021-04-30,
// while for wakapi it would be empty // while for wakapi it would be empty
// see https://github.com/muety/wakapi/issues/192 // see https://github.com/muety/wakapi/issues/192