From 3c1bec857b4bbfc24c03cfdc35c3476ff4db33b7 Mon Sep 17 00:00:00 2001 From: "Buster \"Silver Eagle\" Neece" Date: Tue, 31 May 2022 00:46:45 -0500 Subject: [PATCH] Fixes #5444 -- Fix typing on delete request. --- .../Api/Stations/Reports/RequestsController.php | 2 +- src/Entity/Repository/StationRequestRepository.php | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Controller/Api/Stations/Reports/RequestsController.php b/src/Controller/Api/Stations/Reports/RequestsController.php index 39ecef857..15cce8e28 100644 --- a/src/Controller/Api/Stations/Reports/RequestsController.php +++ b/src/Controller/Api/Stations/Reports/RequestsController.php @@ -67,7 +67,7 @@ final class RequestsController ServerRequest $request, Response $response, string $station_id, - int $request_id + string $request_id ): ResponseInterface { $station = $request->getStation(); $media = $this->requestRepo->getPendingRequest($request_id, $station); diff --git a/src/Entity/Repository/StationRequestRepository.php b/src/Entity/Repository/StationRequestRepository.php index 926c17e40..1e2e06684 100644 --- a/src/Entity/Repository/StationRequestRepository.php +++ b/src/Entity/Repository/StationRequestRepository.php @@ -34,7 +34,7 @@ class StationRequestRepository extends AbstractStationBasedRepository parent::__construct($em, $serializer, $environment, $logger); } - public function getPendingRequest(int $id, Entity\Station $station): ?Entity\StationRequest + public function getPendingRequest(int|string $id, Entity\Station $station): ?Entity\StationRequest { return $this->repository->findOneBy( [ @@ -82,11 +82,7 @@ class StationRequestRepository extends AbstractStationBasedRepository } // Verify that Track ID exists with station. - $media_item = $this->mediaRepo->findByUniqueId($trackId, $station); - - if (!($media_item instanceof Entity\StationMedia)) { - throw new Exception(__('The song ID you specified could not be found in the station.')); - } + $media_item = $this->mediaRepo->requireByUniqueId($trackId, $station); if (!$media_item->isRequestable()) { throw new Exception(__('The song ID you specified cannot be requested for this station.'));