From 32c6f962d560a5e46b8fb2a244c5c89014c9e884 Mon Sep 17 00:00:00 2001
From: Elmar Kresse <elmar.kresse@stud.htwk-leipzig.de>
Date: Sun, 21 Jan 2024 18:51:02 +0100
Subject: [PATCH] fix:#150 fixed return

---
 backend/service/db/dbRooms.go       | 10 +++++++---
 backend/service/room/roomService.go |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/service/db/dbRooms.go b/backend/service/db/dbRooms.go
index c344b16..1c49a54 100644
--- a/backend/service/db/dbRooms.go
+++ b/backend/service/db/dbRooms.go
@@ -23,18 +23,22 @@ func GetRooms(app *pocketbase.PocketBase) ([]string, error) {
 		return nil, err
 	}
 
-	roomArray := clearAndSeparateRooms([]struct {
+	roomArray, err := clearAndSeparateRooms([]struct {
 		Rooms  string
 		Course string
 	}(events))
 
-	return roomArray
+	if err != nil {
+		return nil, err
+	}
+
+	return roomArray, nil
 }
 
 func clearAndSeparateRooms(events []struct {
 	Rooms  string
 	Course string
-}) []string {
+}) ([]string, error) {
 	var roomArray []string
 	for _, event := range events {
 
diff --git a/backend/service/room/roomService.go b/backend/service/room/roomService.go
index 5fcc80b..e8ff456 100644
--- a/backend/service/room/roomService.go
+++ b/backend/service/room/roomService.go
@@ -3,6 +3,7 @@ package room
 import (
 	"htwkalender/model"
 	"htwkalender/service/db"
+	"log/slog"
 	"net/http"
 
 	"github.com/labstack/echo/v5"
@@ -13,7 +14,8 @@ func GetRooms(c echo.Context, app *pocketbase.PocketBase) error {
 	rooms, err := db.GetRooms(app)
 
 	if err != nil {
-		return c.JSON(http.StatusNotFound, err)
+		slog.Error("Error getting rooms: ", err)
+		return c.JSON(http.StatusNotFound, "No rooms found")
 	} else {
 		return c.JSON(http.StatusOK, rooms)
 	}