feat:#150 extracted functions rewrote error pipe for feed routes

backend/service/addRoute.go

@@ -1,14 +1,12 @@
 package service
 
 import (
-	"htwkalender/service/db"
 	"htwkalender/service/events"
 	"htwkalender/service/fetch/sport"
 	v1 "htwkalender/service/fetch/v1"
 	v2 "htwkalender/service/fetch/v2"
 	"htwkalender/service/ical"
 	"htwkalender/service/room"
-	"io"
 	"log/slog"
 	"net/http"
 
@@ -72,8 +70,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			Path:   "/api/fetch/sports",
 			Handler: func(c echo.Context) error {
 
-				sportEvents := sport.FetchAndUpdateSportEvents(app)
-				return c.JSON(200, sportEvents)
+				sportEvents, err := sport.FetchAndUpdateSportEvents(app)
+				if err != nil {
+					return c.JSON(http.StatusInternalServerError, "Failed to fetch sport events")
+				}
+				return c.JSON(http.StatusOK, sportEvents)
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -91,7 +92,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			Method: http.MethodDelete,
 			Path:   "/api/modules",
 			Handler: func(c echo.Context) error {
-				return events.DeleteAllEvents(app)
+				err := events.DeleteAllEvents(app)
+				if err != nil {
+					return c.JSON(http.StatusInternalServerError, "Failed to delete events")
+				}
+				return c.JSON(http.StatusOK, "Events deleted")
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -109,7 +114,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			Method: http.MethodGet,
 			Path:   "/api/rooms",
 			Handler: func(c echo.Context) error {
-				return room.GetRooms(c, app)
+				rooms, err := room.GetRooms(app)
+				if err != nil {
+					return c.JSON(http.StatusInternalServerError, "Failed to get rooms")
+				}
+				return c.JSON(http.StatusOK, rooms)
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -129,7 +138,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			Handler: func(c echo.Context) error {
 				roomParam := c.QueryParam("room")
 				date := c.QueryParam("date")
-				return room.GetRoomScheduleForDay(c, app, roomParam, date)
+				roomSchedule, err := room.GetRoomScheduleForDay(app, roomParam, date)
+				if err != nil {
+					return c.JSON(http.StatusInternalServerError, "Failed to get room schedule for day")
+				}
+				return c.JSON(http.StatusOK, roomSchedule)
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -150,30 +163,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 				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,
-			Path:   "/api/createFeed",
-			Handler: func(c echo.Context) error {
-				requestBody, _ := io.ReadAll(c.Request().Body)
-				result, err := ical.CreateIndividualFeed(requestBody, app)
+				roomSchedule, err := room.GetRoomSchedule(app, roomParam, from, to)
 				if err != nil {
-					return c.JSON(http.StatusInternalServerError, err)
+					return c.JSON(http.StatusInternalServerError, "Failed to get room schedule")
 				}
-				return c.JSON(http.StatusOK, result)
-
+				return c.JSON(http.StatusOK, roomSchedule)
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
@@ -185,64 +179,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 		return nil
 	})
 
-	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
-		_, err := e.Router.AddRoute(echo.Route{
-			Method: http.MethodGet,
-			Path:   "/api/feed",
-			Handler: func(c echo.Context) error {
-				token := c.QueryParam("token")
-				return ical.Feed(c, app, token)
-			},
-			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.MethodDelete,
-			Path:   "/api/feed",
-			Handler: func(c echo.Context) error {
-				token := c.QueryParam("token")
-				err := db.DeleteFeed(app.Dao(), token)
-				if err != nil {
-					return c.JSON(http.StatusNotFound, err)
-				} else {
-					return c.JSON(http.StatusOK, "Feed deleted")
-				}
-			},
-			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.MethodPut,
-			Path:   "/api/feed",
-			Handler: func(c echo.Context) error {
-				token := c.QueryParam("token")
-				return c.JSON(http.StatusOK, "token: "+token)
-			},
-			Middlewares: []echo.MiddlewareFunc{
-				apis.ActivityLogger(app),
-			},
-		})
-		if err != nil {
-			return err
-		}
-		return nil
-	})
+	addFeedRoutes(app)
 
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{