fix:#57 fixed ss/ws check

backend/service/fetch/v2/fetcher.go

@@ -69,48 +69,53 @@ func FetchAllEventsAndSave(app *pocketbase.PocketBase, clock localTime.Clock) ([
 			"%0A?&template=sws_modul&weeks=1-65&combined=yes",
 	}
 
-	savedRecordsSs, errSs := fetchAndSaveAllEventsForSemester(app, time.March, time.October, "ss", clock, stubUrl)
+	if isSummerSemester(clock) {
-	if errSs == nil {
+		savedRecordsSs, errSs := fetchAndSaveAllEventsForSemester(app, "ss", stubUrl)
-		savedRecords = append(savedRecords, savedRecordsSs...)
+		if errSs == nil {
-	}
+			savedRecords = append(savedRecords, savedRecordsSs...)
-	savedRecordsWs, errWs := fetchAndSaveAllEventsForSemester(app, time.September, time.April, "ws", clock, stubUrl)
+		}
-	if errWs == nil {
+	} else {
-		savedRecords = append(savedRecords, savedRecordsWs...)
+		savedRecordsWs, errWs := fetchAndSaveAllEventsForSemester(app, "ws", stubUrl)
+		if errWs == nil {
+			savedRecords = append(savedRecords, savedRecordsWs...)
+		}
 	}
 	return savedRecords, err
 }
 
 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
-
+	url := stubUrl[0] + semester + stubUrl[1]
-	if (clock.Now().Month() >= after) || (clock.Now().Month() <= before) {
+	var events []model.Event
-		url := stubUrl[0] + semester + stubUrl[1]
+	events, err = parseEventForOneSemester(url)
-		var events []model.Event
+	if err != nil {
-		events, err = parseEventForOneSemester(url)
+		return nil, fmt.Errorf("failed to parse events for "+semester+": %w", err)
-		if err != nil {
-			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 for "+semester+": %w", dbError)
-		}
-		savedRecords = append(savedRecords, savedEvents...)
 	}
+	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 for "+semester+": %w", dbError)
+	}
+	savedRecords = append(savedRecords, savedEvents...)
 	return savedRecords, err
 }
 
+func isSummerSemester(clock localTime.Clock) bool {
+	if clock.Now().Month() >= time.April && clock.Now().Month() <= time.September {
+		return true
+	} else {
+		return false
+	}
+}
+
 func parseEventForOneSemester(url string) ([]model.Event, error) {
 	// Fetch Webpage from URL
 	webpage, err := fetch.GetHTML(url)

backend/service/fetch/v2/fetcher_test.go

@@ -18,8 +18,10 @@ package v2
 
 import (
 	"htwkalender/model"
+	mockTime "htwkalender/service/functions/time"
 	"reflect"
 	"testing"
+	"time"
 )
 
 func Test_switchNameAndNotesForExam(t *testing.T) {
@@ -97,3 +99,40 @@ func Test_switchNameAndNotesForExam(t *testing.T) {
 		})
 	}
 }
+
+func Test_isSummerSemester(t *testing.T) {
+	type args struct {
+		clock mockTime.MockClock
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "is summer semester",
+			args: args{
+				clock: mockTime.MockClock{
+					NowTime: time.Date(2024, 6, 1, 0, 0, 0, 0, time.UTC),
+				},
+			},
+			want: true,
+		},
+		{
+			name: "is not summer semester",
+			args: args{
+				clock: mockTime.MockClock{
+					NowTime: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
+				},
+			},
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := isSummerSemester(tt.args.clock); got != tt.want {
+				t.Errorf("isSummerSemester() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}