add local data source attribute attendeeWaitingList

Author: tobiasgv

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Add local data attribute attendeeWaitingList
+
 ## v0.2.8
 
 - Add local data source attributes expectedPreviousKnowledge, teachingMethodKey, and teachingMethodDescription

composer.json

@@ -5,7 +5,7 @@
     "require": {
         "php": ">=8.2",
         "ext-json": "*",
-        "dbp/campusonline-api": "^0.3.37",
+        "dbp/campusonline-api": "^0.3.43",
         "dbp/relay-base-course-bundle": "^0.2.17",
         "dbp/relay-core-bundle": "^0.1.228",
         "doctrine/dbal": "^4.2",

composer.lock

@@ -4,6 +4,7 @@
 
 namespace Dbp\Relay\BaseCourseConnectorCampusonlineBundle\EventSubscriber;
 
+use Dbp\CampusonlineApi\PublicRestApi\Courses\CourseRegistrationResource;
 use Dbp\Relay\BaseCourseBundle\Entity\Course;
 use Dbp\Relay\BaseCourseConnectorCampusonlineBundle\Event\CoursePostEvent;
 use Dbp\Relay\BaseCourseConnectorCampusonlineBundle\Event\CoursePreEvent;
@@ -15,6 +16,7 @@ class CourseEventSubscriber extends AbstractLocalDataEventSubscriber
 {
     public const LECTURERS_SOURCE_DATA_ATTRIBUTE = 'lecturers';
     public const ATTENDEES_SOURCE_DATA_ATTRIBUTE = 'attendees';
+    public const ATTENDEE_WAITING_LIST_SOURCE_DATA_ATTRIBUTE = 'attendeeWaitingList';
     public const COURSE_GROUPS_SOURCE_DATA_ATTRIBUTE = 'courseGroups';
     public const DESCRIPTION_SOURCE_DATA_ATTRIBUTE = 'description';
     public const STATUS_WITHIN_CURRICULUM_URL_SOURCE_DATA_ATTRIBUTE = 'statusWithinCurriculumUrl';
@@ -51,7 +53,11 @@ protected function getAttributeValue(LocalDataPostEvent $postEvent, array $attri
 
             case self::ATTENDEES_SOURCE_DATA_ATTRIBUTE:
                 return $this->courseProvider->getAttendeesByCourse(
-                    $course->getIdentifier(), $postEvent->getOptions());
+                    $course->getIdentifier(), CourseRegistrationResource::REGISTRATION_STATUS_FIXED);
+
+            case self::ATTENDEE_WAITING_LIST_SOURCE_DATA_ATTRIBUTE:
+                return $this->courseProvider->getAttendeesByCourse(
+                    $course->getIdentifier(), CourseRegistrationResource::REGISTRATION_STATUS_WAITING_LIST);
 
             case self::COURSE_GROUPS_SOURCE_DATA_ATTRIBUTE:
                 return $this->courseProvider->getGroupsByCourse(

src/EventSubscriber/CourseEventSubscriber.php

@@ -338,20 +338,24 @@ public function getCourseEvents(int $currentPageNumber, int $maxNumItemsPerPage,
     }
 
     /**
-     * @param array $options Available options:
-     *                       * Locale::LANGUAGE_OPTION (language in ISO 639‑1 format)
+     * @param string|null $registrationStatus if specified, only attendees with the given registration status are returned, otherwise all attendees are returned
      *
      * @return array<int, array<string, mixed>>
      *
      * @throws ApiError
      */
-    public function getAttendeesByCourse(string $courseIdentifier, array $options = []): array
+    public function getAttendeesByCourse(
+        string $courseIdentifier,
+        ?string $registrationStatus = CourseRegistrationResource::REGISTRATION_STATUS_FIXED): array
     {
         $attendeeIds = [];
         foreach ($this->getCourseRegistrationResourcesCached($courseIdentifier) as $registrationResource) {
-            $attendeeIds[] = [
-                'personIdentifier' => $registrationResource->getPersonUid(),
-            ];
+            if ($registrationStatus === null
+                || $registrationStatus === $registrationResource->getRegistrationStatus()) {
+                $attendeeIds[] = [
+                    'personIdentifier' => $registrationResource->getPersonUid(),
+                ];
+            }
         }
 
         return $attendeeIds;
@@ -390,6 +394,7 @@ public function getGroupsByCourse(string $courseIdentifier, array $options = [])
             $courseGroupApi = new CourseGroupApi($this->getCourseApi()->getConnection());
 
             $ATTENDEE_PERSON_IDENTIFIERS_KEY = 'attendeeIdentifiers';
+            $ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY = 'attendeeWaitingListIdentifiers';
             $LECTURER_PERSON_IDENTIFIERS_KEY = 'lecturerIdentifiers';
 
             $courseGroupPeopleMap = [];
@@ -398,17 +403,26 @@ public function getGroupsByCourse(string $courseIdentifier, array $options = [])
                 if (null === ($courseGroupPeopleMap[$courseGroupIdentifier] ?? null)) {
                     $courseGroupPeople = [
                         $ATTENDEE_PERSON_IDENTIFIERS_KEY => [],
+                        $ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY => [],
                         $LECTURER_PERSON_IDENTIFIERS_KEY => [],
                     ];
                     $courseGroupPeopleMap[$courseGroupIdentifier] = $courseGroupPeople;
                 }
-                $courseGroupPeopleMap[$courseGroupIdentifier][$ATTENDEE_PERSON_IDENTIFIERS_KEY][] = $registrationResource->getPersonUid();
+                switch ($registrationResource->getRegistrationStatus()) {
+                    case CourseRegistrationResource::REGISTRATION_STATUS_FIXED:
+                        $courseGroupPeopleMap[$courseGroupIdentifier][$ATTENDEE_PERSON_IDENTIFIERS_KEY][] = $registrationResource->getPersonUid();
+                        break;
+                    case CourseRegistrationResource::REGISTRATION_STATUS_WAITING_LIST:
+                        $courseGroupPeopleMap[$courseGroupIdentifier][$ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY][] = $registrationResource->getPersonUid();
+                        break;
+                }
             }
             foreach ($this->getLectureshipResourcesCached($courseIdentifier) as $lectureshipResource) {
                 foreach ($lectureshipResource->getGroupUids() as $courseGroupIdentifier) {
                     if (null === ($courseGroupPeopleMap[$courseGroupIdentifier] ?? null)) {
                         $courseGroupPeople = [
                             $ATTENDEE_PERSON_IDENTIFIERS_KEY => [],
+                            $ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY => [],
                             $LECTURER_PERSON_IDENTIFIERS_KEY => [],
                         ];
                         $courseGroupPeopleMap[$courseGroupIdentifier] = $courseGroupPeople;
@@ -423,6 +437,7 @@ public function getGroupsByCourse(string $courseIdentifier, array $options = [])
                     'identifier' => $courseGroupPeople->getUid(),
                     'name' => $courseGroupPeople->getName(Options::getLanguage($options) ?? self::DEFAULT_LANGUAGE_TAG),
                     $ATTENDEE_PERSON_IDENTIFIERS_KEY => $courseGroupPeopleMap[$courseGroupPeople->getUid()][$ATTENDEE_PERSON_IDENTIFIERS_KEY] ?? [],
+                    $ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY => $courseGroupPeopleMap[$courseGroupPeople->getUid()][$ATTENDEE_WAITING_LIST_PERSON_IDENTIFIERS_KEY] ?? [],
                     $LECTURER_PERSON_IDENTIFIERS_KEY => $courseGroupPeopleMap[$courseGroupPeople->getUid()][$LECTURER_PERSON_IDENTIFIERS_KEY] ?? [],
                 ];
             }
@@ -538,6 +553,7 @@ private function getCourseApi(): CourseApi
                     $this->config[Configuration::CAMPUS_ONLINE_NODE][Configuration::CLIENT_SECRET_NODE] ?? ''
                 )
             );
+            $this->courseApi->setLogger($this->logger);
         }
 
         return $this->courseApi;
@@ -576,7 +592,6 @@ public function getCoursesInternal(int $currentPageNumber, int $maxNumItemsPerPa
         }
 
         if ($filter = Options::getFilter($options)) {
-            dump($filter);
             $pathMapping = [
                 'identifier' => $CACHED_COURSE_ENTITY_ALIAS.'.'.CachedCourse::UID_COLUMN_NAME,
                 'code' => $CACHED_COURSE_ENTITY_ALIAS.'.'.CachedCourse::COURSE_CODE_COLUMN_NAME,