From 08ab0a570eb187cd6913dfd34ced8b5ce3b6457f Mon Sep 17 00:00:00 2001 From: Tom Wahl Date: Thu, 2 Nov 2023 16:43:04 +0100 Subject: [PATCH] [#43] Bugfix --- backend/service/db/dbRooms.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/service/db/dbRooms.go b/backend/service/db/dbRooms.go index 0aaa1f7..34c5d94 100644 --- a/backend/service/db/dbRooms.go +++ b/backend/service/db/dbRooms.go @@ -43,7 +43,11 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string) var events []model.Event // get all events from event records in the events collection - err := app.Dao().DB().Select("*").From("events").Where(dbx.Like("Rooms", room)).AndWhere(dbx.Like("Start", date)).All(&events) + err := app.Dao().DB().Select("*").From("events"). + Where(dbx.Like("Rooms", room).Escape("_", "_")). + AndWhere(dbx.Like("Start", date)). + GroupBy("Week", "Start", "End", "Rooms"). + All(&events) if err != nil { print("Error while getting events from database: ", err) return nil @@ -67,7 +71,7 @@ func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to st // get all events from event records in the events collection err = app.Dao().DB().Select("*").From("events"). - Where(dbx.Like("Rooms", room)). + Where(dbx.Like("Rooms", room).Escape("_", "_")). AndWhere(dbx.Between("Start", fromDate, toDate)). GroupBy("Week", "Start", "End", "Rooms"). All(&events)