fixed merge issue with main

backend/.gitignore

@@ -21,3 +21,8 @@
 go.work
 
 /pb_data/
+
+.idea/
+*.iml
+.vscode/
+.DS_Store

backend/.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="data" uuid="0cac75ec-a154-4b0c-a84d-58425c2050de">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/pb_data/data.db</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

backend/.idea/jpa-buddy.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JpaBuddyIdeaProjectConfig">
+    <option name="renamerInitialized" value="true" />
+  </component>
+</project>

backend/.idea/misc.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
+</project>

backend/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/backend.iml" filepath="$PROJECT_DIR$/backend.iml" />
+    </modules>
+  </component>
+</project>

backend/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

backend/backend.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

backend/service/addRoute.go

@@ -107,6 +107,26 @@ func AddRoutes(app *pocketbase.PocketBase) {
 	})
 
 	// API Endpoint to create a new iCal feed
+	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		_, err := e.Router.AddRoute(echo.Route{
+			Method: http.MethodGet,
+			Path:   "/api/schedule",
+			Handler: func(c echo.Context) error {
+				roomParam := c.QueryParam("room")
+				to := c.QueryParam("to")
+				from := c.QueryParam("from")
+				return room.GetRoomSchedule(c, app, roomParam, from, to)
+			},
+			Middlewares: []echo.MiddlewareFunc{
+				apis.ActivityLogger(app),
+			},
+		})
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
 			Method: http.MethodPost,

backend/service/db/dbRooms.go

@@ -1,11 +1,14 @@
 package db
 
 import (
-	"github.com/pocketbase/dbx"
-	"github.com/pocketbase/pocketbase"
+	"fmt"
 	"htwkalender/model"
 	"htwkalender/service/functions"
 	"strings"
+	"time"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase"
 )
 
 func GetRooms(app *pocketbase.PocketBase) []string {
@@ -47,3 +50,31 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
 	}
 	return events
 }
+
+func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to string) []model.Event {
+	var events []model.Event
+
+	fromDate, err := time.Parse("2006-01-02", from)
+	if err != nil {
+		fmt.Println("Error parsing date 'from':", err)
+		return nil
+	}
+	toDate, err := time.Parse("2006-01-02", to)
+	if err != nil {
+		fmt.Println("Error parsing date 'to':", err)
+		return nil
+	}
+
+	// get all events from event records in the events collection
+	err = app.Dao().DB().Select("*").From("events").
+		Where(dbx.Like("Rooms", room)).
+		AndWhere(dbx.Between("Start", fromDate, toDate)).
+		GroupBy("Week", "Start", "End", "Rooms").
+		All(&events)
+
+	if err != nil {
+		print("Error while getting events from database: ", err)
+		return nil
+	}
+	return events
+}

backend/service/room/roomService.go

@@ -16,3 +16,8 @@ func GetRoomScheduleForDay(c echo.Context, app *pocketbase.PocketBase, room stri
 	events := db.GetRoomScheduleForDay(app, room, date)
 	return c.JSON(http.StatusOK, events)
 }
+
+func GetRoomSchedule(c echo.Context, app *pocketbase.PocketBase, room string, from string, to string) error {
+	events := db.GetRoomSchedule(app, room, from, to)
+	return c.JSON(http.StatusOK, events)
+}