Improve calendar exports

Closes #1219 (closed)

What does this MR do?

Adds a link to the store page in the description of pickup calendar entries and adds calendar entries for foodsharing events.

Apart from that it refactors a method for fetching events to allow for specific statuses to be included. That way two of the functions previously defined in that class could be joined.

How confident are you it won't break things if deployed?

I am not 100% confident, that all calendar programs support html, but all I know about and have tested do. The refactor is probably more error prone, but I tested the different views where the function is used.

How to test

1. Sign up for a pickup
2. Create three events. Select "bin dabei" or "vielleicht" for one, "kann nicht" for another and nothing for the third.
3. Export the calendar (for example as ics file)
4. Import the calendar into a program of your choice
5. Check the imported events. There should be a pickup and two events. One of the events should include the italic hint.
6. Check that the links work properly.

Screenshots (if applicable)

Events:

Pickups:

This is how the entries are displayed in google calendar.

Checklist

• added a test, or explain why one is not needed/possible...
• no unrelated changes
• asked someone for a code review
• set a "for:" label to indicate who will be affected by this change
• used "state:" labels to track this MR's state until it was beta tested
• added to the next milestone (see https://gitlab.com/foodsharing-dev/foodsharing/-/milestones, unless it has a "for:Dev" label)
• added an entry to CHANGELOG.md
• added a short text that can be used in the release notes
• Once your MR has been merged, you are responsible to create a testing issue in the Beta Testing forum: https://foodsharing.de/?page=bezirk&bid=734&sub=forum. Please change the MRs label to "state:Beta testing".
  • Consider writing a detailed description in German.
  • Describe in a few sentences, what should be tested from a user perspective.
  • Also mention different settings (e.g. different browsers, roles, ...) how this change can be tested.
  • Be aware, that also non technical people should understand.

Release notes text in German

Die Betriebsseite ist nun in Kalenderexporten verlinkt. Außerdem werden Foodsharing Events im Kalender aufgeführt.

src/RestApi/CalendarRestController.php

@@ -208,9 +208,6 @@ class CalendarRestController extends AbstractFOSRestController
 			. '<b>' . $this->translator->trans('calendar.export.event.description') . '</b>: '
 			. str_replace("\n", '<br>', $meeting['description']);
 
-		$full_address = $meeting['street'] . ', ' . $meeting['zip'] . ' ' . $meeting['city'];
-		$location = (new Location())->setName($full_address);
-
 		$event = $this->icalFactory->createCalendarEvent();
 		$event->setStart(Carbon::createFromTimestamp($meeting['start_ts']));
 		$event->setEnd(Carbon::createFromTimestamp($meeting['end_ts']));
@@ -219,7 +216,12 @@ class CalendarRestController extends AbstractFOSRestController
 		$event->setDescription($description);
 		$event->setUrl($url);
 		$event->setStatus(['TENTATIVE', 'CONFIRMED', 'TENTATIVE'][$meeting['status']]);
-		$event->addLocation($location);
+
+		if ($meeting['street']) {
+			$full_address = $meeting['street'] . ', ' . $meeting['zip'] . ' ' . $meeting['city'];
+			$location = (new Location())->setName($full_address);
+			$event->addLocation($location);
+		}
 
 		return $event;
 	}