HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-02 17:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed end before start

Browse Source
This commit is contained in:
masterelmar
2023-11-13 16:15:47 +01:00
parent ef8733d519
commit 7d0a04d728
2 changed files with 166 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/service/fetch/fetchSeminarEventService.go
View File

@@ -82,7 +82,7 @@ func GetSeminarGroupsEventsFromHTML(seminarGroupsLabel []string) []model.Seminar
func splitEventType(events []model.Event) []model.Event {
for i, event := range events {
matched, _ := regexp.Match("^(V|P|S)(w|p)$", []byte(event.EventType))
matched, _ := regexp.Match("^([VPS])([wp])$", []byte(event.EventType))
if matched {
eventType := event.EventType
event.EventType = eventType[0:1]
@@ -136,17 +136,27 @@ func generateUUIDs(events []model.Event, course string) []model.Event {
}
// convertWeeksToDates converts the week and year to a date
// The date is calculated based on the week and the year
// The time is unset and 23:00 is used as default
// Additionally the semester is added to the event
func convertWeeksToDates(events []model.Event, semester string, year string) []model.Event {
var newEvents []model.Event
eventYear, _ := strconv.Atoi(year)
// 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 := replaceTimeForDate(eventDay, event.Start.Time())
end := replaceTimeForDate(eventDay, event.End.Time())
//Check if end is before start
if end.Before(start) {
end = end.AddDate(0, 0, 1)
}
newEvent := event
newEvent.Start, _ = types.ParseDateTime(start.In(time.UTC))
newEvent.End, _ = types.ParseDateTime(end.In(time.UTC))

154
backend/service/fetch/fetchSeminarEventService_test.go
View File

@@ -1,6 +1,8 @@
package fetch
import (
"fmt"
"github.com/pocketbase/pocketbase/tools/types"
"htwkalender/model"
"reflect"
"testing"
@@ -340,3 +342,155 @@ func Test_replaceTimeInDate(t *testing.T) {
})
}
}
func Test_convertWeeksToDates(t *testing.T) {
type args struct {
events []model.Event
semester string
year string
}
returnDateTime := func(date time.Time) types.DateTime {
dateTime, err := types.ParseDateTime(date)
if err != nil {
fmt.Println(err)
}
return dateTime
}
tests := []struct {
name string
args args
want []model.Event
}{
{
name: "Test Wintertime",
args: args{
events: []model.Event{
{
Week: "1",
Day: "Montag",
Start: returnDateTime(time.Date(0, 0, 0, 7, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(0, 0, 0, 9, 0, 0, 0, time.UTC)),
},
},
semester: "ws",
year: "2021",
},
want: []model.Event{
{
Week: "1",
Day: "Montag",
Start: returnDateTime(time.Date(2021, 1, 4, 6, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(2021, 1, 4, 8, 0, 0, 0, time.UTC)),
Semester: "ws",
},
},
},
{
name: "Test Summertime",
args: args{
events: []model.Event{
{
Week: "30",
Day: "Donnerstag",
Start: returnDateTime(time.Date(0, 0, 0, 7, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(0, 0, 0, 0, 0, 0, 0, time.UTC)),
},
},
semester: "ws",
year: "2023",
},
want: []model.Event{
{
Week: "30",
Day: "Donnerstag",
Start: returnDateTime(time.Date(2023, 7, 27, 5, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(2023, 7, 27, 22, 0, 0, 0, time.UTC)),
Semester: "ws",
},
},
},
{
name: "Test NextDay",
args: args{
events: []model.Event{
{
Week: "45",
Day: "Donnerstag",
Start: returnDateTime(time.Date(0, 0, 0, 7, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(0, 0, 0, 4, 0, 0, 0, time.UTC)),
},
},
semester: "ws",
year: "2023",
},
want: []model.Event{
{
Week: "45",
Day: "Donnerstag",
Start: returnDateTime(time.Date(2023, 11, 9, 6, 30, 0, 0, time.UTC)),
End: returnDateTime(time.Date(2023, 11, 10, 3, 0, 0, 0, time.UTC)),
Semester: "ws",
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := convertWeeksToDates(tt.args.events, tt.args.semester, tt.args.year); !reflect.DeepEqual(got, tt.want) {
t.Errorf("convertWeeksToDates() = %v, want %v", got, tt.want)
}
})
}
}
func Test_replaceTimeForDate(t *testing.T) {
type args struct {
date time.Time
replacementTime time.Time
}
tests := []struct {
name string
args args
want time.Time
}{
{
name: "Replace Hour",
args: args{
date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
replacementTime: time.Date(0, 0, 0, 8, 0, 0, 0, time.UTC),
},
want: time.Date(2021, 1, 1, 8, 0, 0, 0, time.UTC),
},
{
name: "Replace Hour and Minute",
args: args{
date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
replacementTime: time.Date(0, 0, 0, 8, 15, 0, 0, time.UTC),
},
want: time.Date(2021, 1, 1, 8, 15, 0, 0, time.UTC),
},
{
name: "Replace Hour and Minute",
args: args{
date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
replacementTime: time.Date(0, 0, 0, 8, 30, 0, 0, time.UTC),
},
want: time.Date(2021, 1, 1, 8, 30, 0, 0, time.UTC),
},
{
name: "Replace Hour and Minute without Year, Month, Day",
args: args{
date: time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC),
replacementTime: time.Date(2023, 10, 3, 8, 30, 0, 0, time.UTC),
},
want: time.Date(2021, 1, 1, 8, 30, 0, 0, time.UTC),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := replaceTimeForDate(tt.args.date, tt.args.replacementTime); !reflect.DeepEqual(got, tt.want) {
t.Errorf("replaceTimeForDate() = %v, want %v", got, tt.want)
}
})
}
}