admin/astra-events
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix events filter

Browse Source
This commit is contained in:
andrusyakka
2023-08-16 14:11:28 +03:00
parent 5be30ff30f
commit 2054c44aa2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handler/event.go
View File

@@ -93,7 +93,6 @@ func (h *Handler) CreateEvent(c echo.Context) (err error) {
func (h *Handler) GetEvents(c echo.Context) (err error) {
var events []model.Event
query := c.Request().URL.Query()
_, _, filterMap := utils.GetFilterParams(query)
orgId, err := uuid.Parse(c.Request().Header.Get("X-User-Organization-Id"))
if err != nil {
@@ -102,8 +101,8 @@ func (h *Handler) GetEvents(c echo.Context) (err error) {
tx := h.DB.Where("org_id = ?", orgId)
if len(filterMap) > 0 {
tx = tx.Where("start >= ?", filterMap["start"]).Where("\"end\" <= ?", filterMap["end"])
if query.Has("start") && query.Has("end") {
tx = tx.Where("start >= ?", query.Get("start")).Where("\"end\" <= ?", query.Get("end"))
}
tx.Find(&events)