From 343d372aa809f806c39df3f8d76edd410e0dc3ea Mon Sep 17 00:00:00 2001
From: Richard Dern <richard@athaliasoft.com>
Date: Wed, 8 May 2024 17:40:24 +0200
Subject: [PATCH] Refactoring

---
 .../BundleRenderers/Renderers/BaseRenderer.php    | 15 +++++++++++----
 .../BundleRenderers/Renderers/DossierRenderer.php |  4 ++--
 .../BundleRenderers/Renderers/TermRenderer.php    |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/Services/BundleRenderers/Renderers/BaseRenderer.php b/app/Services/BundleRenderers/Renderers/BaseRenderer.php
index aa46968..99e4cb5 100644
--- a/app/Services/BundleRenderers/Renderers/BaseRenderer.php
+++ b/app/Services/BundleRenderers/Renderers/BaseRenderer.php
@@ -44,17 +44,17 @@ public function render()
                 $this->prepareRender($currentPage);
 
                 if ($currentPage === 1) {
-                    $result[$this->bundle->getPath()] = (string) view('article', $this->viewData);
+                    $result[$this->bundle->getPath()] = $this->renderView();
                 }
 
                 $page = sprintf('%spage/%s/', $this->bundle->getPath(), $currentPage);
 
-                $result[$page] = (string) view('article', $this->viewData);
+                $result[$page] = $this->renderView();
             }
         } else {
             $this->prepareRender(1);
 
-            $result[$this->bundle->getPath()] = (string) view('article', $this->viewData);
+            $result[$this->bundle->getPath()] = $this->renderView();
         }
 
         return $result;
@@ -67,7 +67,7 @@ public function renderCard()
     {
         $this->prepareRenderCard();
 
-        return view('article-card', $this->viewData);
+        return $this->renderView('article-card');
     }
 
     /**
@@ -214,4 +214,11 @@ protected function collectSubBundles()
 
         return $subBundles;
     }
+
+    protected function renderView(?string $view = 'article')
+    {
+        $html = (string) view($view, $this->viewData);
+
+        return $html;
+    }
 }
diff --git a/app/Services/BundleRenderers/Renderers/DossierRenderer.php b/app/Services/BundleRenderers/Renderers/DossierRenderer.php
index 97ad073..1c5b23e 100644
--- a/app/Services/BundleRenderers/Renderers/DossierRenderer.php
+++ b/app/Services/BundleRenderers/Renderers/DossierRenderer.php
@@ -20,7 +20,7 @@ public function render()
         data_set($this->viewData, 'showToc', true);
         data_set($this->viewData, 'dossier', $dossier);
 
-        return [$this->bundle->getPath() => (string) view('article', $this->viewData)];
+        return [$this->bundle->getPath() => $this->renderView()];
     }
 
     /**
@@ -30,7 +30,7 @@ public function renderCard()
     {
         $this->prepareRenderCard();
 
-        return view('dossier-card', $this->viewData);
+        return $this->renderView('dossier-card');
     }
 
     /**
diff --git a/app/Services/BundleRenderers/Renderers/TermRenderer.php b/app/Services/BundleRenderers/Renderers/TermRenderer.php
index a245ab3..e46ae22 100644
--- a/app/Services/BundleRenderers/Renderers/TermRenderer.php
+++ b/app/Services/BundleRenderers/Renderers/TermRenderer.php
@@ -27,7 +27,7 @@ public function render()
 
         data_set($this->viewData, 'relations', $relations);
 
-        return [$this->bundle->getPath() => (string) view('term', $this->viewData)];
+        return [$this->bundle->getPath() => $this->renderView('term')];
     }
 
     /**