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

fix:eventの取得ロジックの時間フィルタを変更 #571

Merged
merged 3 commits into from
Nov 9, 2024
Merged

fix:eventの取得ロジックの時間フィルタを変更 #571

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34c0042
fix:eventの取得ロジックの時間フィルタを変更
mathsuky Oct 28, 2024
adde449
fix:startまたはendがないときの処理
mathsuky Oct 29, 2024
3ba23d4
fix:FilterDurationを使うように
mathsuky Oct 31, 2024
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
12 changes: 9 additions & 3 deletions router/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,15 @@ func (h *Handlers) HandleGetEvents(c echo.Context) error {
if err != nil {
return badRequest(err, message("invalid time"))
}
events, err := h.Repo.GetEvents(
filter.AddAnd(expr, filter.FilterTime(start, end)),
getConinfo(c))

durationExpr, err := filter.FilterDuration(start, end)
if err != nil {
return badRequest(err, message("filter duration error"))
}

combinedExpr := filter.AddAnd(expr, durationExpr)

events, err := h.Repo.GetEvents(combinedExpr, getConinfo(c))
if err != nil {
return judgeErrorResponse(err)
}
Expand Down