From 334dd406a75c59ecb6635bd91f1fa3d8c297f379 Mon Sep 17 00:00:00 2001
From: Elmar Kresse <18119527+masterElmar@users.noreply.github.com>
Date: Fri, 22 Sep 2023 16:31:12 +0200
Subject: [PATCH] fixed CustomName whitespace

---
 backend/service/events/eventService.go     | 4 ++--
 backend/service/functions/string.go        | 2 +-
 backend/service/ical/icalFileGeneration.go | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/service/events/eventService.go b/backend/service/events/eventService.go
index 4e73775..b5684f0 100644
--- a/backend/service/events/eventService.go
+++ b/backend/service/events/eventService.go
@@ -22,7 +22,7 @@ func GetModulesForCourseDistinct(app *pocketbase.PocketBase, c echo.Context, cou
 func replaceEmptyEntryInStringArray(modules []string, replacement string) {
 	//replace empty functions with "Sonderveranstaltungen"
 	for i, module := range modules {
-		if functions.CheckIfOnlyWhitespace(module) {
+		if functions.OnlyWhitespace(module) {
 			modules[i] = replacement
 		}
 	}
@@ -34,7 +34,7 @@ func replaceEmptyEntry(modules []struct {
 }, replacement string) {
 	//replace empty functions with "Sonderveranstaltungen"
 	for i, module := range modules {
-		if functions.CheckIfOnlyWhitespace(module.Name) {
+		if functions.OnlyWhitespace(module.Name) {
 			modules[i].Name = replacement
 		}
 	}
diff --git a/backend/service/functions/string.go b/backend/service/functions/string.go
index dea7f7b..66bd45c 100644
--- a/backend/service/functions/string.go
+++ b/backend/service/functions/string.go
@@ -3,7 +3,7 @@ package functions
 import "unicode"
 
 // check if course is empty or contains only whitespaces
-func CheckIfOnlyWhitespace(word string) bool {
+func OnlyWhitespace(word string) bool {
 	for _, letter := range word {
 		if !unicode.IsSpace(letter) || !(letter == int32(160)) {
 			return false
diff --git a/backend/service/ical/icalFileGeneration.go b/backend/service/ical/icalFileGeneration.go
index ea250c8..0279bf7 100644
--- a/backend/service/ical/icalFileGeneration.go
+++ b/backend/service/ical/icalFileGeneration.go
@@ -43,7 +43,7 @@ func (icalModel IcalModel) EmitICal() goics.Componenter {
 
 func replaceNameIfUserDefined(name string, mapping []model.FeedCollection) string {
 	for _, mapEntry := range mapping {
-		if mapEntry.Name == name {
+		if mapEntry.Name == name && !functions.OnlyWhitespace(mapEntry.UserDefinedName) {
 			return mapEntry.UserDefinedName
 		}
 	}
@@ -53,13 +53,13 @@ func replaceNameIfUserDefined(name string, mapping []model.FeedCollection) strin
 func generateDescription(event *model.Event) string {
 	var description string
 
-	if !functions.CheckIfOnlyWhitespace(event.Notes) {
+	if !functions.OnlyWhitespace(event.Notes) {
 		description += "Notizen: " + event.Notes + "\n"
 	}
-	if !functions.CheckIfOnlyWhitespace(event.Prof) {
+	if !functions.OnlyWhitespace(event.Prof) {
 		description += "Prof: " + event.Prof + "\n"
 	}
-	if !functions.CheckIfOnlyWhitespace(event.Course) {
+	if !functions.OnlyWhitespace(event.Course) {
 		description += "Gruppe: " + event.Course + "\n"
 	}