Merge remote-tracking branch 'origin/staging' into new-user-atrbs

SkautDevs · Nov 27, 2023 · 6386ce7 · 6386ce7
2 parents c5bf563 + a07c7ab
commit 6386ce7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/Application/Route.php b/src/Application/Route.php
@@ -283,6 +283,9 @@ public function addRoutesInto(App $app): App
                 })->add(AdminsOnlyMiddleware::class)->add(LoggedOnlyMiddleware::class);
             });
         });
+
+		$app->get($app->getBasePath() . '/{eventSlug}', EventController::class . '::redirectEvent')
+			->setName('redirectEvent');
 
         return $app;
     }

diff --git a/src/Event/EventController.php b/src/Event/EventController.php
@@ -21,6 +21,17 @@ public function list(Response $response): Response
             ['events' => $this->eventRepository->findActiveNontestEvents()],
         );
     }
+
+	public function redirectEvent(string $eventSlug, Request $request, Response $response): Response
+	{
+		$event = $this->eventRepository->findBySlug($eventSlug);
+		if ($event === null) {
+			return $this->redirect($request, $response, 'eventList');
+		}
+
+		return $this->redirect($request, $response, 'getDashboard', ['eventSlug' => $event->slug]);
+	}
+
     /*
     public function createEvent(Request $request, Response $response, array $args) {
         $params = $request->getParams();
@@ -67,6 +78,5 @@ public function createEvent(Request $request, Response $response, array $args) {
         $this->flashMessages->warning('Některé údaje nebyly validní - prosím zkus zadání údajů znovu.');
 
         return $response->withRedirect($this->router->urlFor('createEvent'));
-        // TODO add event-admins (roles table?)
     }*/
 }
diff --git a/src/Event/EventRepository.php b/src/Event/EventRepository.php
@@ -40,4 +40,9 @@ public function findActiveNontestAutopaymentsOnEvents(): array
             'end_day' => new Relation(DateTimeUtils::getDateTime('-3 month')->format(DATE_ATOM), '>'),
         ]);
     }
+
+	public function findBySlug(string $eventSlug): ?Event
+	{
+		return $this->findOneBy(['slug' => $eventSlug]);
+	}
 }
diff --git a/src/Middleware/EventInfoMiddleware.php b/src/Middleware/EventInfoMiddleware.php
@@ -30,7 +30,7 @@ public function process(Request $request, ResponseHandler $handler): Response
         $route = $routeContext->getRoute();
 
         $eventSlug = $route?->getArgument('eventSlug') ?? '';
-        $event = $this->eventRepository->findOneBy(['slug' => $eventSlug]);
+        $event = $this->eventRepository->findBySlug($eventSlug);
         if ($event instanceof Event) {
             $request = $request->withAttribute('event', $event);
             $this->view->getEnvironment()->addGlobal('event', $event); // used in templates