HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-07-16 09:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix:#65 reworked path param upgrade

Browse Source
This commit is contained in:
Elmar Kresse
2025-04-22 16:46:08 +02:00
parent 3e07451c47
commit 1e3fea26e3
4 changed files with 49 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
services/data-manager/service/addCalDavRoutes.go
View File

@ -19,38 +19,37 @@ package service
import ( import (
"github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"
"htwkalender/data-manager/model"
"htwkalender/data-manager/service/feed" "htwkalender/data-manager/service/feed"
"htwkalender/data-manager/service/ical" "htwkalender/data-manager/service/ical"
"io"
"log/slog" "log/slog"
"net/http" "net/http"
) )
func addFeedRoutes(app *pocketbase.PocketBase) { func addFeedRoutes(se *core.ServeEvent, pb *pocketbase.PocketBase) {
app.OnServe().BindFunc(func(se *core.ServeEvent) error { se.Router.POST("/api/feed", func(e *core.RequestEvent) error {
se.Router.POST("/api/feed", func(e *core.RequestEvent) error { var feedCollection []model.FeedCollection
requestBody, _ := io.ReadAll(e.Request.Body) err := e.BindBody(&feedCollection)
result, err := ical.CreateIndividualFeed(requestBody, app) if err != nil {
if err != nil { slog.Error("Failed to bind request body", "error", err)
slog.Error("Failed to create individual feed", "error", err) return e.JSON(http.StatusBadRequest, "Invalid request body")
return e.JSON(http.StatusInternalServerError, "Failed to create individual feed") }
} result, err := ical.CreateIndividualFeed(feedCollection, pb)
return e.JSON(http.StatusOK, result) if err != nil {
}) slog.Error("Failed to create individual feed", "error", err)
return se.Next() return e.JSON(http.StatusInternalServerError, "Failed to create individual feed")
}
return e.JSON(http.StatusOK, result)
}) })
app.OnServe().BindFunc(func(se *core.ServeEvent) error { se.Router.DELETE("/api/feed", func(e *core.RequestEvent) error {
se.Router.DELETE("/api/feed", func(e *core.RequestEvent) error { token := e.Request.URL.Query().Get("token")
token := e.Request.PathValue("token") err := feed.MarkFeedForDeletion(pb, token)
err := feed.MarkFeedForDeletion(app, token) if err != nil {
if err != nil { return e.JSON(http.StatusNotFound, err)
return e.JSON(http.StatusNotFound, err) } else {
} else { return e.JSON(http.StatusOK, "Feed deleted")
return e.JSON(http.StatusOK, "Feed deleted") }
}
})
return se.Next()
}) })
} }

88
services/data-manager/service/addRoute.go
View File

@ -43,21 +43,15 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, savedEvents) return e.JSON(http.StatusOK, savedEvents)
} }
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/fetch/daily/events", func(e *core.RequestEvent) error { se.Router.GET("/api/fetch/daily/events", func(e *core.RequestEvent) error {
clock := time.RealClock{} clock := time.RealClock{}
course.UpdateCourse(services, clock) course.UpdateCourse(services, clock)
return e.JSON(http.StatusOK, "Daily events fetched") return e.JSON(http.StatusOK, "Daily events fetched")
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/fetch/group", func(e *core.RequestEvent) error { se.Router.GET("/api/fetch/group", func(e *core.RequestEvent) error {
seminarGroupString := e.Request.PathValue("seminarGroup") seminarGroupString := e.Request.URL.Query().Get("seminarGroup")
if seminarGroupString == "" { if seminarGroupString == "" {
return e.JSON(http.StatusBadRequest, "Seminar group could not be empty") return e.JSON(http.StatusBadRequest, "Seminar group could not be empty")
@ -76,10 +70,7 @@ func AddRoutes(services serviceModel.Service) {
} }
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/fetch/groups", func(e *core.RequestEvent) error { se.Router.GET("/api/fetch/groups", func(e *core.RequestEvent) error {
groups, err := v1.FetchSeminarGroups(services.App) groups, err := v1.FetchSeminarGroups(services.App)
if err != nil { if err != nil {
@ -89,10 +80,7 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, groups) return e.JSON(http.StatusOK, groups)
} }
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/fetch/sports", func(e *core.RequestEvent) error { se.Router.GET("/api/fetch/sports", func(e *core.RequestEvent) error {
sportEvents, err := sport.FetchAndUpdateSportEvents(services.App) sportEvents, err := sport.FetchAndUpdateSportEvents(services.App)
if err != nil { if err != nil {
@ -102,10 +90,7 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, sportEvents) return e.JSON(http.StatusOK, sportEvents)
} }
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.DELETE("/api/modules", func(e *core.RequestEvent) error { se.Router.DELETE("/api/modules", func(e *core.RequestEvent) error {
err := services.EventService.DeleteAllEvents() err := services.EventService.DeleteAllEvents()
if err != nil { if err != nil {
@ -113,10 +98,7 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, "Events deleted") return e.JSON(http.StatusOK, "Events deleted")
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/rooms", func(e *core.RequestEvent) error { se.Router.GET("/api/rooms", func(e *core.RequestEvent) error {
rooms, err := room.GetRooms(services.App) rooms, err := room.GetRooms(services.App)
if err != nil { if err != nil {
@ -124,13 +106,10 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, rooms) return e.JSON(http.StatusOK, rooms)
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/schedule/day", func(e *core.RequestEvent) error { se.Router.GET("/api/schedule/day", func(e *core.RequestEvent) error {
roomParam := e.Request.PathValue("room") roomParam := e.Request.URL.Query().Get("room")
date := e.Request.PathValue("date") date := e.Request.URL.Query().Get("date")
roomSchedule, err := room.GetRoomScheduleForDay(services.App, roomParam, date) roomSchedule, err := room.GetRoomScheduleForDay(services.App, roomParam, date)
if err != nil { if err != nil {
slog.Error("Failed to get room schedule for day: ", "error", err) slog.Error("Failed to get room schedule for day: ", "error", err)
@ -138,16 +117,12 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, roomSchedule) return e.JSON(http.StatusOK, roomSchedule)
}) })
return se.Next()
})
// API Endpoint to create a new iCal feed
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/schedule", func(e *core.RequestEvent) error { se.Router.GET("/api/schedule", func(e *core.RequestEvent) error {
roomParam := e.Request.PathValue("room") roomParam := e.Request.URL.Query().Get("room")
to := e.Request.PathValue("to") to := e.Request.URL.Query().Get("to")
from := e.Request.PathValue("from") from := e.Request.URL.Query().Get("from")
mapped := e.Request.PathValue("mapped") mapped := e.Request.URL.Query().Get("mapped")
roomSchedule, err := room.GetRoomSchedule(services.App, roomParam, from, to, mapped) roomSchedule, err := room.GetRoomSchedule(services.App, roomParam, from, to, mapped)
if err != nil { if err != nil {
slog.Error("Failed to get room schedule: ", "error", err) slog.Error("Failed to get room schedule: ", "error", err)
@ -155,18 +130,14 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, roomSchedule) return e.JSON(http.StatusOK, roomSchedule)
}) })
return se.Next()
})
// API Endpoint to get all rooms that have no events in a specific time frame
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/rooms/free", func(e *core.RequestEvent) error { se.Router.GET("/api/rooms/free", func(e *core.RequestEvent) error {
from, err := time.ParseTime(e.Request.PathValue("from")) from, err := time.ParseTime(e.Request.URL.Query().Get("from"))
if err != nil { if err != nil {
slog.Error("Failed to parse time: ", "error", err) slog.Error("Failed to parse time: ", "error", err)
return e.JSON(http.StatusBadRequest, "Failed to parse time") return e.JSON(http.StatusBadRequest, "Failed to parse time")
} }
to, err := time.ParseTime(e.Request.PathValue("to")) to, err := time.ParseTime(e.Request.URL.Query().Get("to"))
if err != nil { if err != nil {
slog.Error("Failed to parse time: ", "error", err) slog.Error("Failed to parse time: ", "error", err)
return e.JSON(http.StatusBadRequest, "Failed to parse time") return e.JSON(http.StatusBadRequest, "Failed to parse time")
@ -178,16 +149,11 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, rooms) return e.JSON(http.StatusOK, rooms)
}) })
return se.Next()
})
addFeedRoutes(services.App)
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/course/modules", func(e *core.RequestEvent) error { se.Router.GET("/api/course/modules", func(e *core.RequestEvent) error {
modules, err := services.EventService.GetModulesForCourseDistinct( modules, err := services.EventService.GetModulesForCourseDistinct(
e.Request.PathValue("course"), e.Request.URL.Query().Get("course"),
e.Request.PathValue("semester"), e.Request.URL.Query().Get("semester"),
) )
if err != nil { if err != nil {
slog.Error("Failed to get modules for course and semester: ", "error", err) slog.Error("Failed to get modules for course and semester: ", "error", err)
@ -195,10 +161,7 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, modules) return e.JSON(http.StatusOK, modules)
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/modules", func(e *core.RequestEvent) error { se.Router.GET("/api/modules", func(e *core.RequestEvent) error {
modules, err := services.EventService.GetAllModulesDistinct() modules, err := services.EventService.GetAllModulesDistinct()
if err != nil { if err != nil {
@ -207,12 +170,9 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, modules) return e.JSON(http.StatusOK, modules)
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/module", func(e *core.RequestEvent) error { se.Router.GET("/api/module", func(e *core.RequestEvent) error {
requestModule := e.Request.PathValue("uuid") requestModule := e.Request.URL.Query().Get("uuid")
module, err := services.EventService.GetModuleByUUID(requestModule) module, err := services.EventService.GetModuleByUUID(requestModule)
if err != nil { if err != nil {
slog.Error("Failed to get module: ", "error", err) slog.Error("Failed to get module: ", "error", err)
@ -220,12 +180,9 @@ func AddRoutes(services serviceModel.Service) {
} }
return e.JSON(http.StatusOK, module) return e.JSON(http.StatusOK, module)
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/courses", func(e *core.RequestEvent) error { se.Router.GET("/api/courses", func(e *core.RequestEvent) error {
semester := e.Request.PathValue("semester") semester := e.Request.URL.Query().Get("semester")
if semester == "" { if semester == "" {
courses := services.CourseService.GetAllCourses() courses := services.CourseService.GetAllCourses()
return e.JSON(200, courses) return e.JSON(200, courses)
@ -238,12 +195,9 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(200, courseStringList) return e.JSON(200, courseStringList)
} }
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/courses/events", func(e *core.RequestEvent) error { se.Router.GET("/api/courses/events", func(e *core.RequestEvent) error {
semester := e.Request.PathValue("semester") semester := e.Request.URL.Query().Get("semester")
courses, err := services.CourseService.GetAllCoursesForSemesterWithEvents(semester) courses, err := services.CourseService.GetAllCoursesForSemesterWithEvents(semester)
if err != nil { if err != nil {
slog.Error("Failed to get courses for semester with events: ", "error", err) slog.Error("Failed to get courses for semester with events: ", "error", err)
@ -252,11 +206,7 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, courses) return e.JSON(http.StatusOK, courses)
} }
}) })
return se.Next()
})
// API Endpoint to get all eventTypes from the database distinct
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.GET("/api/events/types", func(e *core.RequestEvent) error { se.Router.GET("/api/events/types", func(e *core.RequestEvent) error {
eventTypes, err := services.EventService.GetEventTypes() eventTypes, err := services.EventService.GetEventTypes()
if err != nil { if err != nil {
@ -266,14 +216,11 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, eventTypes) return e.JSON(http.StatusOK, eventTypes)
} }
}) })
return se.Next()
})
services.App.OnServe().BindFunc(func(se *core.ServeEvent) error {
se.Router.DELETE("/api/events", func(e *core.RequestEvent) error { se.Router.DELETE("/api/events", func(e *core.RequestEvent) error {
err := services.EventService.DeleteAllEventsByCourseAndSemester( err := services.EventService.DeleteAllEventsByCourseAndSemester(
e.Request.PathValue("course"), e.Request.URL.Query().Get("course"),
e.Request.PathValue("semester"), e.Request.URL.Query().Get("semester"),
) )
if err != nil { if err != nil {
slog.Error("Failed to delete events: ", "error", err) slog.Error("Failed to delete events: ", "error", err)
@ -282,6 +229,9 @@ func AddRoutes(services serviceModel.Service) {
return e.JSON(http.StatusOK, "Events deleted") return e.JSON(http.StatusOK, "Events deleted")
} }
}).Bind(apis.RequireSuperuserAuth()) }).Bind(apis.RequireSuperuserAuth())
addFeedRoutes(se, services.App)
return se.Next() return se.Next()
}) })
} }

5
services/data-manager/service/db/dbFeeds.go
View File

@ -49,7 +49,7 @@ func (f *Feed) GetRetrieved() types.DateTime {
} }
func (f *Feed) SetRetrieved(retrieved types.DateTime) { func (f *Feed) SetRetrieved(retrieved types.DateTime) {
f.SetRetrieved(retrieved) f.Set("retrieved", retrieved)
} }
func (f *Feed) GetDeleted() bool { func (f *Feed) GetDeleted() bool {
@ -110,6 +110,9 @@ func (f *Feed) ToModel() model.Feed {
Created: f.GetCreated(), Created: f.GetCreated(),
Updated: f.GetUpdated(), Updated: f.GetUpdated(),
Deleted: f.GetDeleted(), Deleted: f.GetDeleted(),
BaseModel: core.BaseModel{
Id: f.GetId(),
},
} }
} }

13
services/data-manager/service/ical/ical.go
View File

@ -24,24 +24,17 @@ import (
"htwkalender/data-manager/service/db" "htwkalender/data-manager/service/db"
) )
func CreateIndividualFeed(requestBody []byte, app *pocketbase.PocketBase) (string, error) { func CreateIndividualFeed(modules []model.FeedCollection, pb *pocketbase.PocketBase) (string, error) {
var modules []model.FeedCollection
err := json.Unmarshal(requestBody, &modules)
if err != nil {
return "", apis.NewNotFoundError("Could not parse request body", err)
}
var icalFeed model.Feed var icalFeed model.Feed
jsonModules, _ := json.Marshal(modules) jsonModules, _ := json.Marshal(modules)
icalFeed.Modules = string(jsonModules) icalFeed.Modules = string(jsonModules)
collection, dbError := app.FindCollectionByNameOrId("feeds") collection, dbError := pb.FindCollectionByNameOrId("feeds")
if dbError != nil { if dbError != nil {
return "", apis.NewNotFoundError("Collection could not be found", dbError) return "", apis.NewNotFoundError("Collection could not be found", dbError)
} }
record, err := db.SaveFeed(icalFeed, collection, app) record, err := db.SaveFeed(icalFeed, collection, pb)
if err != nil { if err != nil {
return "", apis.NewNotFoundError("Could not save feed", err) return "", apis.NewNotFoundError("Could not save feed", err)
} }