Merge branch 'main' into 11-enhanced-module-titles

# Conflicts:
#	backend/model/eventModel.go
#	backend/service/fetch/fetchSeminarEventService.go

backend/service/fetch/fetchSeminarEventService.go

@@ -13,10 +13,10 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-
 	"github.com/labstack/echo/v5"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
+	"github.com/pocketbase/pocketbase/tools/types"
 	"golang.org/x/net/html"
 )
 
@@ -142,27 +142,23 @@ func convertWeeksToDates(events []model.Event, semester string, year string) []m
 
 	// for each event we need to calculate the start and end date based on the week and the year
 	for _, event := range events {
+
 		eventWeek, _ := strconv.Atoi(event.Week)
 		eventDay, _ := date.GetDateFromWeekNumber(eventYear, eventWeek, event.Day)
-		start := addTimeToDate(eventDay, event.Start)
-		end := addTimeToDate(eventDay, event.End)
+		start := replaceTimeForDate(eventDay, event.Start.Time())
+		end := replaceTimeForDate(eventDay, event.End.Time())
 		newEvent := event
-		newEvent.Start = start.String()
-		newEvent.End = end.String()
+		newEvent.Start, _ = types.ParseDateTime(start.In(time.UTC))
+		newEvent.End, _ = types.ParseDateTime(end.In(time.UTC))
 		newEvent.Semester = semester
 		newEvents = append(newEvents, newEvent)
 	}
 	return newEvents
 }
 
-func addTimeToDate(date time.Time, timeString string) time.Time {
-	europeTime, _ := time.LoadLocation("Europe/Berlin")
-	//convert time functions to time
-	timeParts := strings.Split(timeString, ":")
-	hour, _ := strconv.Atoi(timeParts[0])
-	minute, _ := strconv.Atoi(timeParts[1])
-
-	return time.Date(date.Year(), date.Month(), date.Day(), hour, minute, 0, 0, europeTime)
+// replaceTimeForDate replaces hour, minute, second, nsec for the selected date
+func replaceTimeForDate(date time.Time, replacementTime time.Time) time.Time {
+	return time.Date(date.Year(), date.Month(), date.Day(), replacementTime.Hour(), replacementTime.Minute(), replacementTime.Second(), replacementTime.Nanosecond(), date.Location())
 }
 
 func extractSemesterAndYear(semesterString string) (string, string) {
@@ -206,11 +202,13 @@ func toEvents(tables [][]*html.Node, days []string) []model.Event {
 
 			tableData := findTableData(tables[table][row])
 			if len(tableData) > 0 {
+				start, _ := types.ParseDateTime(createTimeFromHourAndMinuteString(getTextContent(tableData[1])))
+				end, _ := types.ParseDateTime(createTimeFromHourAndMinuteString(getTextContent(tableData[2])))
 				events = append(events, model.Event{
 					Day:       days[table],
 					Week:      getTextContent(tableData[0]),
-					Start:     getTextContent(tableData[1]),
-					End:       getTextContent(tableData[2]),
+					Start:     start,
+					End:       end,
 					Name:      getTextContent(tableData[3]),
 					EventType: getTextContent(tableData[4]),
 					Prof:      getTextContent(tableData[5]),
@@ -226,6 +224,16 @@ func toEvents(tables [][]*html.Node, days []string) []model.Event {
 	return events
 }
 
+// createEventFromTableData should create an event from the table data
+// tableTime represents Hour and Minute like HH:MM
+// tableDate returns a Time
+func createTimeFromHourAndMinuteString(tableTime string) time.Time {
+	timeParts := strings.Split(tableTime, ":")
+	hour, _ := strconv.Atoi(timeParts[0])
+	minute, _ := strconv.Atoi(timeParts[1])
+	return time.Date(0, 0, 0, hour, minute, 0, 0, time.UTC)
+}
+
 func splitEventsByWeek(events []model.Event) []model.Event {
 	var newEvents []model.Event
 

backend/service/fetch/fetchSeminarEventService_test.go

@@ -4,6 +4,7 @@ import (
 	"htwkalender/model"
 	"reflect"
 	"testing"
+	"time"
 )
 
 func Test_extractSemesterAndYear(t *testing.T) {
@@ -262,3 +263,80 @@ func Test_generateUUIDs(t *testing.T) {
 		})
 	}
 }
+
+func Test_createTimeFromHourAndMinuteString(t *testing.T) {
+	europeTime, _ := time.LoadLocation("Europe/Berlin")
+	type args struct {
+		tableTime string
+	}
+	tests := []struct {
+		name string
+		args args
+		want time.Time
+	}{
+		{
+			name: "Test 1",
+			args: args{
+				tableTime: "08:00",
+			},
+			want: time.Date(0, 0, 0, 8, 0, 0, 0, europeTime),
+		},
+		{
+			name: "Test 2",
+			args: args{
+				tableTime: "08:15",
+			},
+			want: time.Date(0, 0, 0, 8, 15, 0, 0, europeTime),
+		},
+		{
+			name: "Test 3",
+			args: args{
+				tableTime: "08:30",
+			},
+			want: time.Date(0, 0, 0, 8, 30, 0, 0, europeTime),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := createTimeFromHourAndMinuteString(tt.args.tableTime); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("createTimeFromHourAndMinuteString() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_replaceTimeInDate(t *testing.T) {
+	type args struct {
+		date time.Time
+		time time.Time
+	}
+	tests := []struct {
+		name string
+		args args
+		want time.Time
+	}{
+		{
+			name: "Test 1",
+			args: args{
+				date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
+				time: time.Date(0, 0, 0, 8, 0, 0, 0, time.UTC),
+			},
+			want: time.Date(2021, 1, 1, 8, 0, 0, 0, time.UTC),
+		},
+		{
+			name: "Test 2",
+			args: args{
+				date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
+				time: time.Date(0, 0, 0, 8, 15, 0, 0, time.UTC),
+			},
+			want: time.Date(2021, 1, 1, 8, 15, 0, 0, time.UTC),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := replaceTimeForDate(tt.args.date, tt.args.time); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("addTimeToDate() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}