diff --git a/backend/service/addSchedule.go b/backend/service/addSchedule.go index 3c56d8b..8b262c9 100644 --- a/backend/service/addSchedule.go +++ b/backend/service/addSchedule.go @@ -5,7 +5,6 @@ import ( "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/cron" "htwkalender/service/course" - "htwkalender/service/events" "htwkalender/service/feed" "htwkalender/service/fetch/sport" v2 "htwkalender/service/fetch/v2" @@ -34,7 +33,7 @@ func AddSchedules(app *pocketbase.PocketBase) { feed.ClearFeeds(app.Dao(), 6, time.RealClock{}) }) - // Every sunday at 2am fetch all sport events (5 segments - minute, hour, day, month, weekday) "0 2 * * 0" + // Every sunday at 3am fetch all sport events (5 segments - minute, hour, day, month, weekday) "0 2 * * 0" scheduler.MustAdd("fetchSportEvents", "0 3 * * 0", func() { slog.Info("Started fetching sport events schedule") sportEvents, err := sport.FetchAndUpdateSportEvents(app) @@ -44,13 +43,8 @@ func AddSchedules(app *pocketbase.PocketBase) { slog.Info("Successfully fetched " + strconv.FormatInt(int64(len(sportEvents)), 10) + " sport events") }) - //delete all events and then fetch all events from remote this should be done every sunday at 2am + //fetch all events for semester and delete from remote this should be done every sunday at 2am scheduler.MustAdd("fetchEvents", "0 2 * * 0", func() { - err := events.DeleteAllEvents(app) - if err != nil { - slog.Error("Failed to delete all events: %v", err) - } - savedEvents, err := v2.FetchAllEventsAndSave(app, time.RealClock{}) if err != nil { slog.Error("Failed to fetch and save events: %v", err) diff --git a/backend/service/db/dbEvents.go b/backend/service/db/dbEvents.go index 2bdb2b7..c293fd8 100644 --- a/backend/service/db/dbEvents.go +++ b/backend/service/db/dbEvents.go @@ -203,7 +203,7 @@ func GetAllModulesDistinctByNameAndCourse(app *pocketbase.PocketBase) ([]model.M return modules, nil } -func DeleteAllEventsForCourse(app *pocketbase.PocketBase, course string, semester string) error { +func DeleteAllEventsByCourse(app *pocketbase.PocketBase, course string, semester string) error { _, err := app.Dao().DB().Delete("events", dbx.NewExp("course = {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute() if err != nil { @@ -212,6 +212,25 @@ func DeleteAllEventsForCourse(app *pocketbase.PocketBase, course string, semeste return nil } +func DeleteAllEventsBySemesterWithoutCourse(app *pocketbase.PocketBase, course string, semester string) error { + _, err := app.Dao().DB().Delete("events", dbx.NewExp("course != {:course} AND semester = {:semester}", dbx.Params{"course": course, "semester": semester})).Execute() + + if err != nil { + return err + } + return nil +} + +func DeleteAllEventsBySemester(app *pocketbase.PocketBase, semester string) error { + _, err := app.Dao().DB().Delete("events", dbx.NewExp("semester = {:semester}", dbx.Params{"semester": semester})).Execute() + + if err != nil { + return err + } + return nil + +} + func DeleteAllEvents(app *pocketbase.PocketBase) error { _, err := app.Dao().DB().Delete("events", dbx.NewExp("1=1")).Execute() diff --git a/backend/service/events/eventService.go b/backend/service/events/eventService.go index 409d351..8c48688 100644 --- a/backend/service/events/eventService.go +++ b/backend/service/events/eventService.go @@ -77,7 +77,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.DeleteAllEventsForCourse(app, course, semester) + err := db.DeleteAllEventsByCourse(app, course, semester) if err != nil { return err } else { diff --git a/backend/service/fetch/sport/sportFetcher.go b/backend/service/fetch/sport/sportFetcher.go index 2265aa2..e34519e 100644 --- a/backend/service/fetch/sport/sportFetcher.go +++ b/backend/service/fetch/sport/sportFetcher.go @@ -65,7 +65,7 @@ func FetchAndUpdateSportEvents(app *pocketbase.PocketBase) ([]model.Event, error } // @TODO: delete and save events in one transaction and it only should delete events that are not in the new events list and save events that are not in the database - err = db.DeleteAllEventsForCourse(app, "Sport", functions.GetCurrentSemesterString()) + err = db.DeleteAllEventsByCourse(app, "Sport", functions.GetCurrentSemesterString()) if err != nil { return nil, err } diff --git a/backend/service/fetch/v2/fetcher.go b/backend/service/fetch/v2/fetcher.go index c05ad79..dcd8b95 100644 --- a/backend/service/fetch/v2/fetcher.go +++ b/backend/service/fetch/v2/fetcher.go @@ -12,6 +12,7 @@ import ( localTime "htwkalender/service/functions/time" "log/slog" "strings" + "time" ) func ParseEventsFromRemote(app *pocketbase.PocketBase) (model.Events, error) { @@ -24,6 +25,7 @@ func ParseEventsFromRemote(app *pocketbase.PocketBase) (model.Events, error) { func FetchAllEventsAndSave(app *pocketbase.PocketBase, clock localTime.Clock) ([]model.Event, error) { var savedRecords []model.Event + var err error = nil var stubUrl = [2]string{ "https://stundenplan.htwk-leipzig.de/", @@ -51,32 +53,46 @@ func FetchAllEventsAndSave(app *pocketbase.PocketBase, clock localTime.Clock) ([ "%0A?&template=sws_modul&weeks=1-65&combined=yes", } - if (clock.Now().Month() >= 3) && (clock.Now().Month() <= 10) { - url := stubUrl[0] + "ss" + stubUrl[1] - events, err := parseEventForOneSemester(url) - if err != nil { - return nil, fmt.Errorf("failed to parse events for summmer semester: %w", err) - } - savedEvents, dbError := db.SaveEvents(events, app) - if dbError != nil { - return nil, fmt.Errorf("failed to save events: %w", dbError) - } - savedRecords = append(savedEvents, events...) + savedRecordsSs, errSs := fetchAndSaveAllEventsForSemester(app, time.March, time.October, "ss", clock, stubUrl) + if errSs == nil { + savedRecords = append(savedRecords, savedRecordsSs...) } + savedRecordsWs, errWs := fetchAndSaveAllEventsForSemester(app, time.September, time.April, "ws", clock, stubUrl) + if errWs == nil { + savedRecords = append(savedRecords, savedRecordsWs...) + } + return savedRecords, err +} - if (clock.Now().Month() >= 9) || (clock.Now().Month() <= 4) { - url := stubUrl[0] + "ws" + stubUrl[1] - events, err := parseEventForOneSemester(url) +func fetchAndSaveAllEventsForSemester( + app *pocketbase.PocketBase, + before time.Month, + after time.Month, + semester string, + clock localTime.Clock, + stubUrl [2]string, +) ([]model.Event, error) { + var err error = nil + var savedRecords []model.Event + + if (clock.Now().Month() >= after) || (clock.Now().Month() <= before) { + url := stubUrl[0] + semester + stubUrl[1] + var events []model.Event + events, err = parseEventForOneSemester(url) if err != nil { - return nil, fmt.Errorf("failed to parse events for winter semester: %w", err) + return nil, fmt.Errorf("failed to parse events for "+semester+": %w", err) + } + err = db.DeleteAllEventsBySemesterWithoutCourse(app, "Sport", semester) + if err != nil { + return nil, fmt.Errorf("failed to delete all events for "+semester+": %w", err) } savedEvents, dbError := db.SaveEvents(events, app) if dbError != nil { - return nil, fmt.Errorf("failed to save events: %w", dbError) + return nil, fmt.Errorf("failed to save events for "+semester+": %w", dbError) } savedRecords = append(savedRecords, savedEvents...) } - return savedRecords, nil + return savedRecords, err } func parseEventForOneSemester(url string) ([]model.Event, error) { diff --git a/reverseproxy.conf b/reverseproxy.conf index 04f63a6..8f6f7dc 100644 --- a/reverseproxy.conf +++ b/reverseproxy.conf @@ -37,6 +37,7 @@ http { # Docker IP Ranges (https://docs.docker.com/network/iptables/) set_real_ip_from 172.16.0.0/12; + set_real_ip_from 141.57.0.0/16; real_ip_header CF-Connecting-IP; @@ -89,14 +90,14 @@ http { } # Limit the number of requests per IP - limit_req_zone $limit_key zone=feed:20m rate=10r/m; + limit_req_zone $limit_key zone=feed:20m rate=20r/m; limit_req_zone $limit_key zone=createFeed:10m rate=1r/m; - limit_req_zone $limit_key zone=modules:10m rate=3r/m; + limit_req_zone $limit_key zone=modules:10m rate=30r/m; server { listen 80; listen [::]:80; - server_name htwekalender.de www.htwekalender.de; + server_name htwkalender.de www.htwkalender.de; location /api { proxy_pass http://htwkalender-backend:8090; @@ -118,7 +119,7 @@ http { proxy_cache_bypass 0; proxy_no_cache 0; proxy_cache mcache; # mcache=RAM - proxy_cache_valid 200 301 302 30m; + proxy_cache_valid 200 301 302 10m; proxy_cache_valid 403 404 5m; proxy_cache_lock on; proxy_cache_use_stale timeout updating; @@ -136,7 +137,7 @@ http { proxy_cache_bypass 0; proxy_no_cache 0; proxy_cache mcache; # mcache=RAM - proxy_cache_valid 200 301 302 30m; + proxy_cache_valid 200 301 302 10m; proxy_cache_valid 403 404 5m; proxy_cache_lock on; proxy_cache_use_stale timeout updating; @@ -154,7 +155,7 @@ http { proxy_cache_bypass 0; proxy_no_cache 0; proxy_cache mcache; # mcache=RAM - proxy_cache_valid 200 301 302 30m; + proxy_cache_valid 200 301 302 10m; proxy_cache_valid 403 404 5m; proxy_cache_lock on; proxy_cache_use_stale timeout updating; @@ -172,7 +173,7 @@ http { proxy_cache_bypass 0; proxy_no_cache 0; proxy_cache mcache; # mcache=RAM - proxy_cache_valid 200 301 302 30m; + proxy_cache_valid 200 301 302 10m; proxy_cache_valid 403 404 5m; proxy_cache_lock on; proxy_cache_use_stale timeout updating;