Merge branch 'main' of github.com:masterElmar/htwkalender into 10-roomfinder

backend/service/addRoute.go

@@ -1,10 +1,6 @@
 package service
 
 import (
-	"github.com/labstack/echo/v5"
-	"github.com/pocketbase/pocketbase"
-	"github.com/pocketbase/pocketbase/apis"
-	"github.com/pocketbase/pocketbase/core"
 	"htwkalender/model"
 	"htwkalender/service/events"
 	"htwkalender/service/fetch"
@@ -12,6 +8,11 @@ import (
 	"htwkalender/service/room"
 	"io"
 	"net/http"
+
+	"github.com/labstack/echo/v5"
+	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/apis"
+	"github.com/pocketbase/pocketbase/core"
 )
 
 func AddRoutes(app *pocketbase.PocketBase) {
@@ -273,6 +274,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {

backend/service/date/dateFormat.go

@@ -4,7 +4,8 @@ import "time"
 
 func GetDateFromWeekNumber(year int, weekNumber int, dayName string) (time.Time, error) {
 	// Create a time.Date for the first day of the year
-	firstDayOfYear := time.Date(year, time.January, 1, 0, 0, 0, 0, time.UTC)
+	europeTime, _ := time.LoadLocation("Europe/Berlin")
+	firstDayOfYear := time.Date(year, time.January, 1, 0, 0, 0, 0, europeTime)
 
 	// Calculate the number of days to add to reach the desired week
 	daysToAdd := time.Duration((weekNumber-1)*7) * 24 * time.Hour

backend/service/db/dbEvents.go

@@ -1,9 +1,10 @@
 package db
 
 import (
+	"htwkalender/model"
+
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase"
-	"htwkalender/model"
 )
 
 func SaveEvents(seminarGroup []model.SeminarGroup, app *pocketbase.PocketBase) ([]model.Event, error) {

backend/service/fetch/fetchSeminarEventService.go

@@ -2,11 +2,6 @@ package fetch
 
 import (
 	"fmt"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v5"
-	"github.com/pocketbase/pocketbase"
-	"github.com/pocketbase/pocketbase/apis"
-	"golang.org/x/net/html"
 	"htwkalender/model"
 	"htwkalender/service/date"
 	"htwkalender/service/db"
@@ -16,6 +11,13 @@ import (
 	"strconv"
 	"strings"
 	"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"
 )
 
 func GetSeminarEvents(c echo.Context, app *pocketbase.PocketBase) error {
@@ -77,6 +79,21 @@ func GetSeminarGroupsEventsFromHTML(seminarGroupsLabel []string) []model.Seminar
 	return seminarGroups
 }
 
+func splitEventType(events []model.Event) []model.Event {
+
+	for i, event := range events {
+		matched, _ := regexp.Match("^(V|P|S)(w|p)$", []byte(event.EventType))
+		if matched {
+			eventType := event.EventType
+			event.EventType = eventType[0:1]
+			event.Compulsory = eventType[1:2]
+			events[i] = event
+		}
+	}
+
+	return events
+}
+
 func parseSeminarGroup(result string) model.SeminarGroup {
 	doc, err := html.Parse(strings.NewReader(result))
 	if err != nil {
@@ -100,6 +117,7 @@ func parseSeminarGroup(result string) model.SeminarGroup {
 	semester, year := extractSemesterAndYear(semesterString)
 	events = convertWeeksToDates(events, semester, year)
 	events = generateUUIDs(events, course)
+	events = splitEventType(events)
 	var seminarGroup = model.SeminarGroup{
 		University: findFirstSpanWithClass(table, "header-1-0-0").FirstChild.Data,
 		Course:     course,
@@ -124,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) {
@@ -188,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]),
@@ -208,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) {
@@ -119,6 +120,96 @@ func Test_replaceEmptyEventNames(t *testing.T) {
 	}
 }
 
+func Test_splitEventType(t *testing.T) {
+	type args struct {
+		events []model.Event
+	}
+	tests := []struct {
+		name string
+		args args
+		want []model.Event
+	}{
+		{
+			name: "Test 1",
+			args: args{
+				events: []model.Event{
+					{
+						EventType: "V",
+					},
+				},
+			},
+			want: []model.Event{
+				{
+					EventType:  "V",
+					Compulsory: "",
+				},
+			},
+		},
+		{
+			name: "Test 2",
+			args: args{
+				events: []model.Event{
+					{
+						EventType: "Vw",
+					},
+				},
+			},
+			want: []model.Event{
+				{
+					EventType:  "V",
+					Compulsory: "w",
+				},
+			},
+		},
+		{
+			name: "Test 3",
+			args: args{
+				events: []model.Event{
+					{
+						EventType: "Sperr",
+					},
+				},
+			},
+			want: []model.Event{
+				{
+					EventType:  "Sperr",
+					Compulsory: "",
+				},
+			},
+		},
+		{
+			name: "Test 4",
+			args: args{
+				events: []model.Event{
+					{
+						EventType: "Sperr",
+					},
+					{
+						EventType: "Vw",
+					},
+				},
+			},
+			want: []model.Event{
+				{
+					EventType:  "Sperr",
+					Compulsory: "",
+				},
+				{
+					EventType:  "V",
+					Compulsory: "w",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := splitEventType(tt.args.events); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("splitEventType() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
 func Test_generateUUIDs(t *testing.T) {
 	type args struct {
 		events []model.Event
@@ -172,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)
+			}
+		})
+	}
+}

backend/service/ical/icalFileGeneration.go

@@ -1,13 +1,15 @@
 package ical
 
 import (
-	"github.com/jordic/goics"
 	"htwkalender/model"
 	"htwkalender/service/functions"
+	"htwkalender/service/names"
 	"time"
+
+	"github.com/jordic/goics"
 )
 
-// local type for EmitICal function
+// IcalModel local type for EmitICal function
 type IcalModel struct {
 	Events  model.Events
 	Mapping []model.FeedCollection
@@ -15,7 +17,7 @@ type IcalModel struct {
 
 // EmitICal implements the interface for goics
 func (icalModel IcalModel) EmitICal() goics.Componenter {
-	layout := "2006-01-02 15:04:05 -0700 MST"
+	europeTime, _ := time.LoadLocation("Europe/Berlin")
 	c := goics.NewComponent()
 	c.SetType("VCALENDAR")
 	c.AddProperty("VERSION", "2.0")
@@ -27,13 +29,11 @@ func (icalModel IcalModel) EmitICal() goics.Componenter {
 	for _, event := range icalModel.Events {
 		s := goics.NewComponent()
 		s.SetType("VEVENT")
-		timeEnd, _ := time.Parse(layout, event.End)
-		timeStart, _ := time.Parse(layout, event.Start)
-		k, v := goics.FormatDateTime("DTEND;TZID=Europe/Berlin", timeEnd)
+		k, v := goics.FormatDateTime("DTEND;TZID=Europe/Berlin", event.End.Time().Local().In(europeTime))
 		s.AddProperty(k, v)
-		k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", timeStart)
+		k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", event.Start.Time().Local().In(europeTime))
 		s.AddProperty(k, v)
-		s.AddProperty("SUMMARY", replaceNameIfUserDefined(event.Name, icalModel.Mapping))
+		s.AddProperty("SUMMARY", replaceNameIfUserDefined(&event, icalModel.Mapping))
 		s.AddProperty("DESCRIPTION", generateDescription(event))
 		s.AddProperty("LOCATION", event.Rooms)
 		c.AddComponent(s)
@@ -41,13 +41,13 @@ func (icalModel IcalModel) EmitICal() goics.Componenter {
 	return c
 }
 
-func replaceNameIfUserDefined(name string, mapping []model.FeedCollection) string {
+func replaceNameIfUserDefined(event *model.Event, mapping []model.FeedCollection) string {
 	for _, mapEntry := range mapping {
-		if mapEntry.Name == name && !functions.OnlyWhitespace(mapEntry.UserDefinedName) {
-			return mapEntry.UserDefinedName
+		if mapEntry.Name == event.Name && !functions.OnlyWhitespace(mapEntry.UserDefinedName) {
+			return names.ReplaceTemplateSubStrings(mapEntry.UserDefinedName, *event)
 		}
 	}
-	return name
+	return event.Name
 }
 
 func generateDescription(event model.Event) string {
@@ -63,7 +63,7 @@ func generateDescription(event model.Event) string {
 		description += "Gruppe: " + event.Course + "\n"
 	}
 	if !functions.OnlyWhitespace(event.EventType) {
-		description += "Typ: " + event.EventType + "\n"
+		description += "Typ: " + event.EventType + event.Compulsory + "\n"
 	}
 
 	return description

backend/service/names/userDefinedNameTemplates.go

@@ -0,0 +1,23 @@
+package names
+
+import (
+	"htwkalender/model"
+	"regexp"
+)
+
+func ReplaceTemplateSubStrings(rawString string, event model.Event) string {
+	re := regexp.MustCompile(`\%(.)`)
+
+	return re.ReplaceAllStringFunc(rawString, func(match string) string {
+		switch match {
+		case "%%":
+			return "%"
+		case "%t":
+			return event.EventType
+		case "%p":
+			return event.Compulsory
+		default:
+			return match
+		}
+	})
+}

backend/service/names/userDefinedNameTemplates_test.go

@@ -0,0 +1,78 @@
+package names
+
+import (
+	"htwkalender/model"
+	"testing"
+)
+
+func TestReplaceTemplateSubStrings(t *testing.T) {
+	type args struct {
+		rawString string
+		event     model.Event
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "Test 1",
+			args: args{
+				rawString: "%t",
+				event: model.Event{
+					EventType: "Test",
+				},
+			},
+			want: "Test",
+		},
+		{
+			name: "Test 2",
+			args: args{
+				rawString: "%p",
+				event: model.Event{
+					Compulsory: "Test",
+				},
+			},
+			want: "Test",
+		},
+		{
+			name: "Test 3",
+			args: args{
+				rawString: "%%",
+				event: model.Event{
+					EventType: "Test",
+				},
+			},
+			want: "%",
+		},
+		{
+			name: "Test 4",
+			args: args{
+				rawString: "%t %p",
+				event: model.Event{
+					EventType:  "Test",
+					Compulsory: "Test",
+				},
+			},
+			want: "Test Test",
+		},
+		{
+			name: "Test 5",
+			args: args{
+				rawString: "%t %p %%",
+				event: model.Event{
+					EventType:  "Test",
+					Compulsory: "Test",
+				},
+			},
+			want: "Test Test %",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := ReplaceTemplateSubStrings(tt.args.rawString, tt.args.event); got != tt.want {
+				t.Errorf("ReplaceTemplateSubStrings() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}