Merge branch 'main' into 53-bug-merge-events-in-ical-feed

backend/service/fetch/sport/sportFetcher.go

@@ -208,7 +208,7 @@ func getWeekEvents(start time.Time, end time.Time, cycle string) ([]time.Time, [
 			for _, day := range days {
 				weekDay, err := getDayInt(day)
 				if err != nil {
-					slog.Error("Error while getting day int", err)
+					slog.Error("Error while getting day int: "+day+" ", err)
 				} else {
 					weekEvents = append(weekEvents, model.SportDayStartEnd{
 						Start: time.Date(start.Year(), start.Month(), start.Day(), startHour, startMinute, 0, 0, start.Location()),
@@ -233,7 +233,7 @@ func getWeekEvents(start time.Time, end time.Time, cycle string) ([]time.Time, [
 			endI, endIErr = getDayInt(days[1])
 
 			if endIErr != nil || startIErr != nil {
-				slog.Error("Error while getting day int", startIErr, endIErr)
+				slog.Error("Error while getting day int: "+days[0]+" - "+days[1]+" :", startIErr, endIErr)
 			} else {
 				//create a int array with all days from start to end day
 				var daysBetween []int
@@ -258,7 +258,7 @@ func getWeekEvents(start time.Time, end time.Time, cycle string) ([]time.Time, [
 
 				dayInt, err := getDayInt(day)
 				if err != nil {
-					slog.Error("Error while getting day int", err)
+					slog.Error("Error while getting day int: "+day+" ", err)
 				} else {
 					dayNumbers = append(dayNumbers, dayInt)
 				}
@@ -270,7 +270,7 @@ func getWeekEvents(start time.Time, end time.Time, cycle string) ([]time.Time, [
 
 				weekDay, err := getDayInt(day)
 				if err != nil {
-					slog.Error("Error while getting day int", err)
+					slog.Error("Error while getting day int: "+day+" ", err)
 				} else {
 					weekEvents = append(weekEvents, model.SportDayStartEnd{
 						Start: time.Date(start.Year(), start.Month(), start.Day(), startHour, startMinute, 0, 0, start.Location()),

backend/service/fetch/v2/fetcher.go

@@ -69,48 +69,60 @@ 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 errSs == nil {
-		savedRecords = append(savedRecords, savedRecordsSs...)
-	}
-	savedRecordsWs, errWs := fetchAndSaveAllEventsForSemester(app, time.September, time.April, "ws", clock, 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
 }
 
 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 "+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...)
+	url := stubUrl[0] + semester + stubUrl[1]
+	events, err := parseEventForOneSemester(url)
+	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...)
 	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)
@@ -128,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)

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,49 @@ 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)
+			}
+		})
+	}
+}

frontend/src/components/RoomOccupation.vue

@@ -172,10 +172,12 @@ const calendarOptions: ComputedRef<CalendarOptions> = computed(() => ({
           id: event.id.toString(),
           start: event.start,
           end: event.end,
-          color: event.showFree ? "var(--htwk-gruen-500)" : "var(--primary-color)",
+          color: event.showFree 
+            ? "var(--htwk-gruen-500)" 
+            : "var(--htwk-grau-60-500)",
           textColor: event.showFree
             ? "var(--green-50)"
-            : "var(--primary-color-text)",
+            : "white",
           title: event.showFree
             ? t("roomFinderPage.available")
             : t("roomFinderPage.occupied"),