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

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

Browse Source 
fix:#53 added empty events check

Closes #53

See merge request ekresse/htwkalender!50
This commit is contained in:
ekresse
2024-04-15 19:56:19 +00:00
parent ae58a9ef80 bad94d86fa
commit 4e3cbd1861
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/service/feed/feedFunctions.go
View File

@@ -55,6 +55,8 @@ func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) {
func CombineEventsInFeed(events model.Events) model.Events { func CombineEventsInFeed(events model.Events) model.Events {
// Combine events with the same name, start, end and course // Combine events with the same name, start, end and course
// check if there are events
if len(events) > 0 {
combinedEvents := model.Events{events[0]} combinedEvents := model.Events{events[0]}
for i := 1; i < len(events); i++ { for i := 1; i < len(events); i++ {
@@ -78,6 +80,8 @@ func CombineEventsInFeed(events model.Events) model.Events {
} }
} }
return combinedEvents return combinedEvents
}
return model.Events{}
} }
func addNotesIfAlreadyRoomsAdded(events model.Events, combinedEvents model.Events, index2 int, index1 int) string { func addNotesIfAlreadyRoomsAdded(events model.Events, combinedEvents model.Events, index2 int, index1 int) string {

7
backend/service/feed/feedFunctions_test.go
View File

@@ -182,6 +182,13 @@ func TestCombineEventsInFeed(t *testing.T) {
}, },
}, },
}, },
{
name: "NoEventsInFeed",
args: args{
events: model.Events{},
},
want: model.Events{},
},
} }
for _, tt := range testCases { for _, tt := range testCases {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {