feat:#57 updated function and calc

backend/service/fetch/v2/fetcher.go

@@ -69,17 +69,15 @@ func FetchAllEventsAndSave(app *pocketbase.PocketBase, clock localTime.Clock) ([
 			"%0A?&template=sws_modul&weeks=1-65&combined=yes",
 	}
 
-	if isSummerSemester(clock) {
-		savedRecordsSs, errSs := fetchAndSaveAllEventsForSemester(app, "ss", stubUrl)
-		if errSs == nil {
-			savedRecords = append(savedRecords, savedRecordsSs...)
-		}
-	} else {
-		savedRecordsWs, errWs := fetchAndSaveAllEventsForSemester(app, "ws", stubUrl)
-		if errWs == nil {
-			savedRecords = append(savedRecords, savedRecordsWs...)
+	// Fetch and save events for all semesters
+	for _, semester := range 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)
 		}
+		savedRecords = append(savedRecords, events...)
 	}
+
 	return savedRecords, err
 }
 
@@ -106,12 +104,23 @@ func fetchAndSaveAllEventsForSemester(
 	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 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) {
@@ -131,7 +140,6 @@ func parseEventForOneSemester(url string) ([]model.Event, error) {
 	// Get all event tables and all day labels
 	eventTables := getEventTables(doc)
 	allDayLabels := getAllDayLabels(doc)
-
 	eventsWithCombinedWeeks := toEvents(eventTables, allDayLabels)
 
 	splitEventsByWeekVal := splitEventsByWeek(eventsWithCombinedWeeks)