Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API: Fix GetQueryBeforeSince (#13559) #13560

Merged
merged 3 commits into from
Nov 15, 2020
Merged

API: Fix GetQueryBeforeSince (#13559) #13560

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745ac92
API: Fix GetQueryBeforeSince
6543 Nov 14, 2020
6357947
CI.restart()
6543 Nov 14, 2020
0d9f927
Merge branch 'release/v1.12' into api_fix-parse-time_v1.12
zeripath Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routers/api/v1/notify/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func ListRepoNotifications(ctx *context.APIContext) {

before, since, err := utils.GetQueryBeforeSince(ctx)
if err != nil {
ctx.InternalServerError(err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}
opts := models.FindNotificationOptions{
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/notify/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func ListNotifications(ctx *context.APIContext) {

before, since, err := utils.GetQueryBeforeSince(ctx)
if err != nil {
ctx.InternalServerError(err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}
opts := models.FindNotificationOptions{
Expand Down
4 changes: 2 additions & 2 deletions routers/api/v1/repo/issue_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func ListIssueComments(ctx *context.APIContext) {

before, since, err := utils.GetQueryBeforeSince(ctx)
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetQueryBeforeSince", err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
Expand Down Expand Up @@ -132,7 +132,7 @@ func ListRepoIssueComments(ctx *context.APIContext) {

before, since, err := utils.GetQueryBeforeSince(ctx)
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetQueryBeforeSince", err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}

Expand Down
6 changes: 3 additions & 3 deletions routers/api/v1/repo/issue_tracked_time.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func ListTrackedTimes(ctx *context.APIContext) {
}

if opts.CreatedBeforeUnix, opts.CreatedAfterUnix, err = utils.GetQueryBeforeSince(ctx); err != nil {
ctx.InternalServerError(err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}

Expand Down Expand Up @@ -491,7 +491,7 @@ func ListTrackedTimesByRepository(ctx *context.APIContext) {

var err error
if opts.CreatedBeforeUnix, opts.CreatedAfterUnix, err = utils.GetQueryBeforeSince(ctx); err != nil {
ctx.InternalServerError(err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}

Expand Down Expand Up @@ -554,7 +554,7 @@ func ListMyTrackedTimes(ctx *context.APIContext) {

var err error
if opts.CreatedBeforeUnix, opts.CreatedAfterUnix, err = utils.GetQueryBeforeSince(ctx); err != nil {
ctx.InternalServerError(err)
ctx.Error(http.StatusUnprocessableEntity, "GetQueryBeforeSince", err)
return
}

Expand Down
52 changes: 36 additions & 16 deletions routers/api/v1/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package utils

import (
"net/url"
"strings"
"time"

Expand All @@ -15,28 +16,47 @@ import (

// GetQueryBeforeSince return parsed time (unix format) from URL query's before and since
func GetQueryBeforeSince(ctx *context.APIContext) (before, since int64, err error) {
qCreatedBefore := strings.Trim(ctx.Query("before"), " ")
if qCreatedBefore != "" {
createdBefore, err := time.Parse(time.RFC3339, qCreatedBefore)
if err != nil {
return 0, 0, err
}
if !createdBefore.IsZero() {
before = createdBefore.Unix()
}
qCreatedBefore, err := prepareQueryArg(ctx, "before")
if err != nil {
return 0, 0, err
}

qCreatedSince, err := prepareQueryArg(ctx, "since")
if err != nil {
return 0, 0, err
}

before, err = parseTime(qCreatedBefore)
if err != nil {
return 0, 0, err
}

qCreatedAfter := strings.Trim(ctx.Query("since"), " ")
if qCreatedAfter != "" {
createdAfter, err := time.Parse(time.RFC3339, qCreatedAfter)
since, err = parseTime(qCreatedSince)
if err != nil {
return 0, 0, err
}
return before, since, nil
}

// parseTime parse time and return unix timestamp
func parseTime(value string) (int64, error) {
if len(value) != 0 {
t, err := time.Parse(time.RFC3339, value)
if err != nil {
return 0, 0, err
return 0, err
}
if !createdAfter.IsZero() {
since = createdAfter.Unix()
if !t.IsZero() {
return t.Unix(), nil
}
}
return before, since, nil
return 0, nil
}

// prepareQueryArg unescape and trim a query arg
func prepareQueryArg(ctx *context.APIContext, name string) (value string, err error) {
value, err = url.PathUnescape(ctx.Query(name))
value = strings.Trim(value, " ")
return
}

// GetListOptions returns list options using the page and limit parameters
Expand Down