Issue 23 code improvement + add 404 if something happens and cannot generate feed

Author: OStefan2001

bin/generate-feed

@@ -20,4 +20,4 @@ printf(
     $count === 1 ? '' : 's',
     $feedGenerator->getFeedFile(),
     PHP_EOL
-);
+);

config/autoload/app.global.php

@@ -23,7 +23,7 @@
 return [
     'app'  => $app,
     'feed' => [
-        'file' => 'public/feed.xml',
+        'path' => realpath(__DIR__ . '/../../public/feed.xml'),
     ],
     'twig' => [
         'globals' => [

src/App/src/Factory/FeedGeneratorFactory.php

@@ -22,7 +22,7 @@ public function __invoke(ContainerInterface $container): FeedGenerator
 
         return new FeedGenerator(
             $postRepository,
-            $config['feed']['file'],
+            $config['feed']['path'],
             rtrim($config['application']['url'] ?? '', '/') . '/',
             $config['app']['meta']['title'] ?? '',
             $config['app']['meta']['description'] ?? '',

src/App/src/Factory/GetFeedViewHandlerFactory.php

@@ -6,6 +6,8 @@
 
 use Light\App\Handler\GetFeedViewHandler;
 use Light\App\Service\FeedGenerator;
+use Light\Blog\Repository\CategoryRepository;
+use Mezzio\Template\TemplateRendererInterface;
 use Psr\Container\ContainerInterface;
 
 use function assert;
@@ -17,9 +19,15 @@ class GetFeedViewHandlerFactory
      */
     public function __invoke(ContainerInterface $container, string $requestedName): GetFeedViewHandler
     {
+        $template = $container->get(TemplateRendererInterface::class);
+        assert($template instanceof TemplateRendererInterface);
+
+        $categoryRepository = $container->get(CategoryRepository::class);
+        assert($categoryRepository instanceof CategoryRepository);
+
         $feedGenerator = $container->get(FeedGenerator::class);
         assert($feedGenerator instanceof FeedGenerator);
 
-        return new GetFeedViewHandler($feedGenerator);
+        return new GetFeedViewHandler($template, $categoryRepository, $feedGenerator);
     }
 }

src/App/src/Fixture/PostLoader.php

@@ -119,7 +119,7 @@ public function load(ObjectManager $manager): void
                         $article->setExcerpt($excerpt);
                         $changed = true;
                     }
-                    if ($article->getTldr() !== $tlDr) {
+                    if ($article->getTlDr() !== $tlDr) {
                         $article->setTldr($tlDr);
                         $changed = true;
                     }

src/App/src/Handler/GetFeedViewHandler.php

@@ -4,11 +4,17 @@
 
 namespace Light\App\Handler;
 
+use Fig\Http\Message\StatusCodeInterface;
+use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\XmlResponse;
 use Light\App\Service\FeedGenerator;
+use Light\Blog\Entity\Category;
+use Light\Blog\Repository\CategoryRepository;
+use Mezzio\Template\TemplateRendererInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Throwable;
 
 use function file_get_contents;
 use function filesize;
@@ -17,6 +23,8 @@
 class GetFeedViewHandler implements RequestHandlerInterface
 {
     public function __construct(
+        private readonly TemplateRendererInterface $template,
+        private readonly CategoryRepository $categoryRepository,
         private readonly FeedGenerator $feedGenerator,
     ) {
     }
@@ -26,13 +34,33 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $feedFile = $this->feedGenerator->getFeedFile();
 
         if (! is_file($feedFile) || filesize($feedFile) === 0) {
-            $this->feedGenerator->write();
+            try {
+                $this->feedGenerator->write();
+            } catch (Throwable) {
+            }
+        }
+
+        if (! is_file($feedFile) || filesize($feedFile) === 0) {
+            return $this->notFound($this->categoryRepository->getCategories());
         }
 
         return new XmlResponse(
             (string) file_get_contents($feedFile),
-            200,
-            ['content-type' => FeedGenerator::CONTENT_TYPE]
+            StatusCodeInterface::STATUS_OK,
+            ['Content-Type' => FeedGenerator::CONTENT_TYPE]
+        );
+    }
+
+    /**
+     * @param Category[] $categories
+     */
+    private function notFound(array $categories): HtmlResponse
+    {
+        return new HtmlResponse(
+            $this->template->render('error::404', [
+                'categories' => $categories,
+            ]),
+            StatusCodeInterface::STATUS_NOT_FOUND
         );
     }
 }

src/App/src/Service/FeedGenerator.php

@@ -62,7 +62,7 @@ public function write(): int
 
             $this->appendText($dom, $item, 'title', $post->getTitle());
             $this->appendText($dom, $item, 'link', $link);
-            $this->appendText($dom, $item, 'description', $post->getTldr() ?? $post->getExcerpt());
+            $this->appendText($dom, $item, 'description', $post->getTlDr() ?? $post->getExcerpt());
             $this->appendText($dom, $item, 'pubDate', $post->getPostDate()->format(DateTimeInterface::RSS));
             $this->appendText(
                 $dom,

src/Blog/src/Entity/Post.php

@@ -116,12 +116,12 @@ public function setExcerpt(string $excerpt): void
         $this->excerpt = $excerpt;
     }
 
-    public function getTldr(): ?string
+    public function getTlDr(): ?string
     {
         return $this->tlDr;
     }
 
-    public function setTldr(?string $tlDr): void
+    public function setTlDr(?string $tlDr): void
     {
         $this->tlDr = $tlDr;
     }