Merge pull request #167 from os2display/feature/display-1019-feed-errors-cleanup

DISPLAY-1019: Removed references to non-existing exception

Author: tuj

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#167](https://github.com/os2display/display-api-service/pull/167)
+  - Removed references to non-existing exception.
 - [#166](https://github.com/os2display/display-api-service/pull/166)
   - Wrapped feeds in try-catch to avoid throwing errors.
   - Added unpublished flow to EventDatabase feed when occurrence returns 404.

src/DataProvider/FeedDataProvider.php

@@ -7,7 +7,6 @@
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
 use App\Entity\Tenant\Feed;
 use App\Entity\User;
-use App\Exceptions\MissingFeedConfigurationException;
 use App\Repository\FeedRepository;
 use App\Repository\PlaylistSlideRepository;
 use App\Service\FeedService;
@@ -19,7 +18,6 @@
 use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
-use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 
 final class FeedDataProvider implements ItemDataProviderInterface, RestrictedDataProviderInterface
 {
@@ -58,7 +56,7 @@ public function getItem(string $resourceClass, $id, string $operationName = null
         // Get result. If there is a result this is returned.
         try {
             $feed = $queryBuilder->getQuery()->getOneOrNullResult();
-        } catch (NonUniqueResultException $exception) {
+        } catch (NonUniqueResultException) {
             return null;
         }
 
@@ -91,12 +89,10 @@ public function getItem(string $resourceClass, $id, string $operationName = null
                 if ('get' === $operationName || 'get_feed_data' === $operationName) {
                     return new JsonResponse($this->feedService->getData($feed), 200);
                 }
-            } catch (MissingFeedConfigurationException $e) {
-                $this->logger->error(sprintf('Missing configuration for feed with id "%s" with message "%s"', $feed->getId()->jsonSerialize(), $e->getMessage()));
-            } catch (\JsonException $e) {
-                $this->logger->error(sprintf('JSON decode for feed with id "%s" with error "%s"', $feed->getId()->jsonSerialize(), $e->getMessage()));
-            } catch (ClientExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface|TransportExceptionInterface $e) {
+            } catch (ClientExceptionInterface|RedirectionExceptionInterface|ServerExceptionInterface $e) {
                 $this->logger->error(sprintf('Communication error "%s"', $e->getMessage()));
+            } catch (\Throwable $e) {
+                $this->logger->error(sprintf('Feed data error. ID: %s, MESSAGE: %s', $feed->getId()->jsonSerialize(), $e->getMessage()));
             }
         }
 

src/Service/FeedService.php

@@ -6,17 +6,12 @@
 use ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameGenerator;
 use App\Entity\Tenant\Feed;
 use App\Entity\Tenant\FeedSource;
-use App\Exceptions\MissingFeedConfigurationException;
 use App\Exceptions\UnknownFeedTypeException;
 use App\Feed\FeedTypeInterface;
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
-use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
-use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
-use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 
 class FeedService
 {
@@ -99,20 +94,14 @@ public function getFeedSourceConfigUrl(FeedSource $feedSource, string $name): st
      *
      * @return array|null
      *   Array with feed data
-     *
-     * @throws MissingFeedConfigurationException
-     * @throws \JsonException
-     * @throws ClientExceptionInterface
-     * @throws RedirectionExceptionInterface
-     * @throws ServerExceptionInterface
-     * @throws TransportExceptionInterface
      */
     public function getData(Feed $feed): ?array
     {
         // Get feed id.
         $feedId = $feed->getId()?->jsonSerialize();
+
         if (is_null($feedId)) {
-            throw new MissingFeedConfigurationException('Missing feed ID');
+            return null;
         }
 
         /** @var CacheItemInterface $cacheItem */