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

fix:#46 updated fetcher and empty course issue

Browse Source
This commit is contained in:
Elmar Kresse
2024-07-05 15:23:10 +02:00
parent a5a8c2a58d
commit ab22364ac8
7 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/data-manager/service/events/courseService.go
View File

@@ -18,6 +18,7 @@ package events
import (
"github.com/pocketbase/pocketbase"
"htwkalender/data-manager/model"
"htwkalender/data-manager/service/db"
"htwkalender/data-manager/service/functions"
)
@@ -26,7 +27,7 @@ func GetAllCourses(app *pocketbase.PocketBase) []string {
return db.GetAllCourses(app)
}
func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []string {
func GetAllCoursesForSemester(app *pocketbase.PocketBase, semester string) []model.SeminarGroup {
return db.GetAllCoursesForSemester(app, semester)
}

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

@@ -120,14 +120,12 @@ func DeleteAllEvents(app *pocketbase.PocketBase) error {
// 3. Save all events for the course and the semester
// If the update was successful, nil is returned
// If the update was not successful, an error is returned
func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Events, error) {
func UpdateModulesForCourse(app *pocketbase.PocketBase, seminarGroup model.SeminarGroup) (model.Events, error) {
seminarGroup, err := v1.GetSeminarGroupEventsFromHTML(course)
seminarGroup, err := v1.FetchAndParse(seminarGroup.Semester, seminarGroup.Course)
if err != nil {
return nil, err
}
seminarGroup = v1.ClearEmptySeminarGroups(seminarGroup)
seminarGroup = v1.ReplaceEmptyEventNames(seminarGroup)
//check if events in the seminarGroups Events are already in the database
@@ -136,7 +134,7 @@ func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Ev
//if there are no events in the database, save the new events
//get all events for the course and the semester
dbEvents, err := db.GetAllEventsForCourse(app, course)
dbEvents, err := db.GetAllEventsForCourse(app, seminarGroup.Course)
if err != nil {
return nil, err
}
@@ -182,7 +180,7 @@ func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Ev
return nil, err
}
slog.Info("Course: " + course + " - Event changes: " + strconv.FormatInt(int64(len(insertList)), 10) + " new events, " + strconv.FormatInt(int64(len(deleteList)), 10) + " deleted events")
slog.Info("Course: " + seminarGroup.Course + " - Event changes: " + strconv.FormatInt(int64(len(insertList)), 10) + " new events, " + strconv.FormatInt(int64(len(deleteList)), 10) + " deleted events")
return savedEvents, nil
}