From 2054c44aa28b9f49936994a5877c53c0af17f5c2 Mon Sep 17 00:00:00 2001 From: andrusyakka Date: Wed, 16 Aug 2023 14:11:28 +0300 Subject: [PATCH] fix events filter --- handler/event.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/handler/event.go b/handler/event.go index c6b3b58..56eefee 100644 --- a/handler/event.go +++ b/handler/event.go @@ -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)