Nachklang/API
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Fix URL null error when no url is given in event
All checks were successful
Jenkins Production Deployment
Details

Browse Source
This commit is contained in:
Patrick Müller 2022-12-28 01:20:06 +01:00
parent a34a5df5a3
commit fc071096d8
Signed by: Paddy
GPG Key ID: 37ABC11275CAABCE
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/models/calendar/events/icalgenerator.service.ts
View File

@ -39,7 +39,9 @@ const serializeIcalEvent = (icalevent: iCalEvent): string => {
returnString += 'SUMMARY:' + icalevent.summary; returnString += 'SUMMARY:' + icalevent.summary;
returnString += 'DESCRIPTION:' + icalevent.description; returnString += 'DESCRIPTION:' + icalevent.description;
returnString += 'LOCATION:' + icalevent.location; returnString += 'LOCATION:' + icalevent.location;
if(!isNullOrBlank(icalevent.url)) {
returnString += 'URL:' + icalevent.url; returnString += 'URL:' + icalevent.url;
}
returnString += icalevent.footer; returnString += icalevent.footer;
return returnString; return returnString;
@ -82,6 +84,8 @@ const addEventToFile = (ical: iCalFile, event: Event) => {
}; };
const createIcalEvent = (event: Event): iCalEvent => { const createIcalEvent = (event: Event): iCalEvent => {
let url = event.url ? event.url + '\n' : '';
return { return {
header: 'BEGIN:VEVENT\n', header: 'BEGIN:VEVENT\n',
uid: event.uuid + '\n', uid: event.uuid + '\n',
@ -92,7 +96,7 @@ const createIcalEvent = (event: Event): iCalEvent => {
summary: event.name + '\n', summary: event.name + '\n',
description: event.description + '\n', description: event.description + '\n',
location: event.location + '\n', location: event.location + '\n',
url: event.url + '\n', url: url,
footer: 'END:VEVENT\n' footer: 'END:VEVENT\n'
}; };
}; };
@ -130,3 +134,11 @@ export interface iCalEvent {
url: string; url: string;
footer: string; footer: string;
} }
/**
* Checks if a given string is null, undefined or blank
* @param str The string to check
*/
function isNullOrBlank(str: string | null): boolean {
return str === null || str === undefined || str.trim() === '';
}