added left status into entry list endpoint

SkautDevs · Jun 1, 2024 · 9c21c34 · 9c21c34
1 parent 0ccb193
commit 9c21c34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Entry/EntryStatus.php b/src/Entry/EntryStatus.php
@@ -11,10 +11,16 @@ enum EntryStatus: string
     case ENTRY_STATUS_VALID = 'valid';
     case ENTRY_STATUS_USED = 'used';
     case ENTRY_STATUS_INVALID = 'invalid';
-    case ENTRY_STATUS_LEAVED = 'leaved';
+    case ENTRY_STATUS_LEAVED = 'left';
+
+    public static function entryFromDatetime(
+        ?DateTimeInterface $entryDate,
+        ?DateTimeInterface $leaveDate,
+    ): self {
+        if ($leaveDate !== null) {
+            return self::ENTRY_STATUS_LEAVED;
+        }
 
-    public static function entryFromDatetime(?DateTimeInterface $entryDate): self
-    {
         return match ($entryDate) {
             null => self::ENTRY_STATUS_VALID,
             default => self::ENTRY_STATUS_USED,

diff --git a/src/Participant/ParticipantRepository.php b/src/Participant/ParticipantRepository.php
@@ -431,6 +431,7 @@ private function mapDataToEntryParticipant(Row $row): EntryParticipant
          *     patrol_leader_id: int|null,
          *     sfh_done: bool|null,
          *     entry_date: \DateTimeInterface|null,
+         *     leave_date: \DateTimeInterface|null,
          *     role: string|null
          * } $array */
         $array = $row->toArray();
@@ -443,7 +444,10 @@ private function mapDataToEntryParticipant(Row $row): EntryParticipant
             $array['patrol_name'] ?? '',
             $array['tie_code'],
             $array['birth_date'] ?? DateTimeUtils::getDateTime(),
-            EntryStatus::entryFromDatetime($array['entry_date']),
+            EntryStatus::entryFromDatetime(
+                $array['entry_date'],
+                $array['leave_date'],
+            ),
             $array['sfh_done'] ?? false,
         );
     }