HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-03 18:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/main' into 7-scalability

Browse Source 
# Conflicts:
#	backend/service/addCalDavRoutes.go
This commit is contained in:
Elmar Kresse
2024-06-10 21:01:12 +02:00
parent 4e8dfc9588 0a508e104d
commit 813dd5085f
23 changed files with 566 additions and 20957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/data-manager/service/events/eventService.go
View File

@@ -95,7 +95,7 @@ func GetModuleByUUID(app *pocketbase.PocketBase, uuid string) (model.Module, err
// If the deletion was successful, nil is returned
// If the deletion was not successful, an error is returned
func DeleteAllEventsByCourseAndSemester(app *pocketbase.PocketBase, course string, semester string) error {
err := db.DeleteAllEventsByCourse(app, course, semester)
err := db.DeleteAllEventsByCourse(app.Dao(), course, semester)
if err != nil {
return err
} else {
@@ -174,7 +174,7 @@ func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Ev
}
// save all events that are in the insertList
savedEvents, err := db.SaveEvents(insertList, app)
savedEvents, err := db.SaveEvents(insertList, app.Dao())
if err != nil {
slog.Error("Failed to save events: ", "error", err)
return nil, err