added leave API route

SkautDevs · May 31, 2024 · 0ccb193 · 0ccb193
1 parent 01af873
commit 0ccb193
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 7 deletions.
diff --git a/src/Application/Route.php b/src/Application/Route.php
@@ -315,7 +315,6 @@ public function addRoutesInto(App $app): App
                 ->setName('deal-catch-data-from-google-form');
 
             $app->group('/entry', function (RouteCollectorProxy $app) {
-
                 $app->get('/list', EntryController::class . '::list')
                     ->add(ApiAuthorizedOnlyMiddleware::class)
                     ->setName('entry-list');
@@ -333,14 +332,26 @@ public function addRoutesInto(App $app): App
                     ->add(AddCorsHeaderForAppDomainsMiddleware::class)
                     ->setName('entry-troop-from-web-app');
             });
-            $app->group('/vendor', function (RouteCollectorProxy $app) {
 
+            $app->group('/leave', function (RouteCollectorProxy $app) {
+                $app->map(['POST', 'OPTIONS'], '/participant/{participantId}', EntryController::class . '::leaveParticipantFromWebApp')
+                    ->add(ApiAuthorizedOnlyMiddleware::class)
+                    ->add(AddCorsHeaderForAppDomainsMiddleware::class)
+                    ->setName('leave-participant-from-web-app');
+
+                $app->map(['POST', 'OPTIONS'], '/troop/{participantId}', EntryController::class . '::leaveTroopFromWebApp')
+                    ->add(ApiAuthorizedOnlyMiddleware::class)
+                    ->add(AddCorsHeaderForAppDomainsMiddleware::class)
+                    ->setName('leave-troop-from-web-app');
+            });
+
+            $app->group('/vendor', function (RouteCollectorProxy $app) {
                 $app->map(['POST', 'OPTIONS'], '/bearercheck', function (Response $response) { return $response->withStatus(200); })
                     ->add(ApiAuthorizedOnlyMiddleware::class)
                     ->add(AddCorsHeaderForAppDomainsMiddleware::class)
                     ->setName('entry-participant-from-web-app');
 
-                $app->map(['GET', 'OPTIONS'],'/participant/{tieCode}', ParticipantVendorController::class . '::retrieveParticipantByTieCode')
+                $app->map(['GET', 'OPTIONS'], '/participant/{tieCode}', ParticipantVendorController::class . '::retrieveParticipantByTieCode')
                     ->add(ApiAuthorizedOnlyMiddleware::class)
                     ->add(AddCorsHeaderForAppDomainsMiddleware::class)
                     ->setName('entry-troop-from-web-app');

diff --git a/src/Application/migrations/20240531104721_add_leave_date.php b/src/Application/migrations/20240531104721_add_leave_date.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddLeaveDate extends AbstractMigration
+{
+    public function up(): void
+    {
+        $tableParticipant = $this->table('participant');
+        $tableParticipant->addColumn('leave_date', 'datetime', ['null' => true]);
+        $tableParticipant->save();
+    }
+
+    public function down(): void
+    {
+        $participantTable = $this->table('participant');
+        $participantTable->removeColumn('leave_date');
+        $participantTable->save();
+    }
+}
diff --git a/src/Entry/EntryController.php b/src/Entry/EntryController.php
@@ -115,6 +115,36 @@ public function entryParticipantFromWebApp(
         );
     }
 
+    public function leaveParticipantFromWebApp(
+        Response $response,
+        Event $authorizedEvent,
+        int $participantId,
+    ): Response {
+        $participant = $this->participantRepository->findParticipantById($participantId, $authorizedEvent);
+        if ($participant === null) {
+            return $this->createErrorEntryResponse($response, 'participant not found');
+        }
+
+        if ($participant->leaveDate !== null) {
+            return $this->getResponseWithJson(
+                $response,
+                [
+                    'status' => EntryStatus::ENTRY_STATUS_VALID,
+                    'entryDateTime' => null,
+                ],
+            );
+        }
+
+        $this->participantService->setAsLeaved($participant);
+
+        return $this->getResponseWithJson(
+            $response,
+            [
+                'status' => EntryStatus::ENTRY_STATUS_LEAVED,
+            ],
+        );
+    }
+
     public function entryFromAdmin(Request $request, Response $response, Event $event, int $participantId): Response
     {
         $participant = $this->participantRepository->getParticipantById($participantId, $event);

diff --git a/src/Entry/EntryStatus.php b/src/Entry/EntryStatus.php
@@ -11,8 +11,9 @@ enum EntryStatus: string
     case ENTRY_STATUS_VALID = 'valid';
     case ENTRY_STATUS_USED = 'used';
     case ENTRY_STATUS_INVALID = 'invalid';
+    case ENTRY_STATUS_LEAVED = 'leaved';
 
-    public static function fromDatetime(?DateTimeInterface $entryDate): self
+    public static function entryFromDatetime(?DateTimeInterface $entryDate): self
     {
         return match ($entryDate) {
             null => self::ENTRY_STATUS_VALID,

diff --git a/src/Participant/Participant.php b/src/Participant/Participant.php
@@ -60,6 +60,7 @@
  * @property string                 $tieCode
  * @property string                 $entryCode
  * @property DateTimeInterface|null $entryDate m:passThru(dateFromString|dateToString)
+ * @property DateTimeInterface|null $leaveDate m:passThru(dateFromString|dateToString)
  *
  * @property Payment[]              $payment m:belongsToMany
  * @property Deal[]      $deals m:belongsToMany

diff --git a/src/Participant/ParticipantRepository.php b/src/Participant/ParticipantRepository.php
@@ -309,8 +309,8 @@ public function findOneByTieCodeAndEvent(string $tieCode, Event $authorizedEvent
         if ($participant === null) {
             return null;
         }
-        
-        if ($participant->user->event->id === $authorizedEvent->id) {
+
+        if ($participant->user?->event->id === $authorizedEvent->id) {
             return $participant;
         }
 
@@ -443,7 +443,7 @@ private function mapDataToEntryParticipant(Row $row): EntryParticipant
             $array['patrol_name'] ?? '',
             $array['tie_code'],
             $array['birth_date'] ?? DateTimeUtils::getDateTime(),
-            EntryStatus::fromDatetime($array['entry_date']),
+            EntryStatus::entryFromDatetime($array['entry_date']),
             $array['sfh_done'] ?? false,
         );
     }

diff --git a/src/Participant/ParticipantService.php b/src/Participant/ParticipantService.php
@@ -450,6 +450,21 @@ public function setAsUnentered(Participant $participant): Participant
 
         return $participant;
     }
+    public function setAsLeaved(Participant $participant): Participant
+    {
+        $participant->leaveDate = DateTimeUtils::getDateTime();
+        $this->participantRepository->persist($participant);
+
+        return $participant;
+    }
+
+    public function setAsUnleaved(Participant $participant): Participant
+    {
+        $participant->leaveDate = null;
+        $this->participantRepository->persist($participant);
+
+        return $participant;
+    }
 
     public function tryChangeRoleWithMessages(string $roleFromBody, Participant $participant, Event $event): bool
     {