fix:#25 added tests and schedule updates

backend/service/fetch/sport/sportFetcher.go

@@ -24,6 +24,7 @@ import (
 	"htwkalender/model"
 	"htwkalender/service/db"
 	"htwkalender/service/functions"
+	clock "htwkalender/service/functions/time"
 	"io"
 	"log/slog"
 	"net/http"
@@ -81,7 +82,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.DeleteAllEventsByCourse(app, "Sport", functions.GetCurrentSemesterString())
+	err = db.DeleteAllEventsByCourse(app, "Sport", functions.GetCurrentSemesterString(clock.RealClock{}))
 	if err != nil {
 		return nil, err
 	}

backend/service/fetch/v1/fetchSeminarGroupService.go

@@ -23,6 +23,8 @@ import (
 	"github.com/pocketbase/pocketbase/models"
 	"htwkalender/model"
 	"htwkalender/service/db"
+	"htwkalender/service/functions"
+	"htwkalender/service/functions/time"
 	"io"
 	"log/slog"
 	"net/http"
@@ -59,23 +61,19 @@ func getSeminarHTML(semester string) (string, error) {
 func FetchSeminarGroups(app *pocketbase.PocketBase) ([]*models.Record, error) {
 	var groups []model.SeminarGroup
 
-	resultSummer, err := getSeminarHTML("ss")
+	semesterString := functions.CalculateSemesterList(time.RealClock{})
+	var results [2]string
+	var err error
 
-	if err != nil {
-		slog.Error("Error while fetching seminar groups for winter semester", err)
-		return nil, err
+	for i, semester := range semesterString {
+		results[i], err = getSeminarHTML(semester)
+		if err != nil {
+			slog.Error("Error while fetching seminar groups for: "+semester, err)
+			return nil, err
+		}
+		groups = append(groups, parseSeminarGroups(results[i], semester)...)
 	}
 
-	resultWinter, _ := getSeminarHTML("ws")
-
-	if err != nil {
-		slog.Error("Error while fetching seminar groups for summer semester", err)
-		return nil, err
-	}
-
-	groups = parseSeminarGroups(resultSummer, "ss")
-	groups = append(groups, parseSeminarGroups(resultWinter, "ws")...)
-
 	// filter duplicates
 	groups = removeDuplicates(groups)
 

backend/service/fetch/v2/fetcher.go

@@ -25,10 +25,10 @@ import (
 	"htwkalender/service/db"
 	"htwkalender/service/fetch"
 	v1 "htwkalender/service/fetch/v1"
+	"htwkalender/service/functions"
 	localTime "htwkalender/service/functions/time"
 	"log/slog"
 	"strings"
-	"time"
 )
 
 func ParseEventsFromRemote(app *pocketbase.PocketBase) (model.Events, error) {
@@ -70,7 +70,7 @@ func FetchAllEventsAndSave(app *pocketbase.PocketBase, clock localTime.Clock) ([
 	}
 
 	// Fetch and save events for all semesters
-	for _, semester := range calculateSemesterList(clock) {
+	for _, semester := range functions.CalculateSemesterList(clock) {
 		events, fetchErr := fetchAndSaveAllEventsForSemester(app, semester, stubUrl)
 		if fetchErr != nil {
 			return nil, fmt.Errorf("failed to fetch and save events for "+semester+": %w", err)
@@ -104,25 +104,6 @@ func fetchAndSaveAllEventsForSemester(
 	return savedRecords, err
 }
 
-func calculateSemesterList(clock localTime.Clock) []string {
-	summerSemester := clock.Now().Month() >= time.March && clock.Now().Month() <= time.September
-	winterSemester := clock.Now().Month() <= time.March || clock.Now().Month() >= time.September
-
-	if summerSemester && winterSemester {
-		return []string{"ss", "ws"}
-	}
-
-	if summerSemester {
-		return []string{"ss"}
-	}
-
-	if winterSemester {
-		return []string{"ws"}
-	}
-
-	return []string{"ss", "ws"}
-}
-
 func parseEventForOneSemester(url string) ([]model.Event, error) {
 	// Fetch Webpage from URL
 	webpage, err := fetch.GetHTML(url)

backend/service/fetch/v2/fetcher_test.go

@@ -18,10 +18,8 @@ package v2
 
 import (
 	"htwkalender/model"
-	mockTime "htwkalender/service/functions/time"
 	"reflect"
 	"testing"
-	"time"
 )
 
 func Test_switchNameAndNotesForExam(t *testing.T) {
@@ -99,49 +97,3 @@ func Test_switchNameAndNotesForExam(t *testing.T) {
 		})
 	}
 }
-
-func Test_calculateSemesterList(t *testing.T) {
-	type args struct {
-		clock mockTime.Clock
-	}
-	tests := []struct {
-		name string
-		args args
-		want []string
-	}{
-		{
-			name: "is summer semester",
-			args: args{
-				clock: mockTime.MockClock{
-					NowTime: time.Date(2024, 6, 1, 0, 0, 0, 0, time.UTC),
-				},
-			},
-			want: []string{"ss"},
-		},
-		{
-			name: "is winter semester",
-			args: args{
-				clock: mockTime.MockClock{
-					NowTime: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
-				},
-			},
-			want: []string{"ws"},
-		},
-		{
-			name: "is in both",
-			args: args{
-				clock: mockTime.MockClock{
-					NowTime: time.Date(2024, 3, 22, 0, 0, 0, 0, time.UTC),
-				},
-			},
-			want: []string{"ss", "ws"},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := calculateSemesterList(tt.args.clock); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("calculateSemesterList() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}