FEATURE #2042: refactorize widgets

app/CMS/Helpers/WidgetAreas.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace App\CMS\Helpers;
 
+use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
 use App\Models\Widgets\WidgetArea;
 use Illuminate\Support\Facades\Cache;
 
@@ -25,15 +27,16 @@ class WidgetAreas
 
     protected static function loadWidgetArea($uniqueCode)
     {
-        $widgets = Cache::remember('widget-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
+        dd($uniqueCode);
+        WidgetArea::where('code', $uniqueCode)
+                  ->increment('viewed');
+
+        $widgets = Cache::remember('widget-area-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
             $widgetArea = new WidgetArea();
             return $widgetArea->getWidgets($uniqueCode)
                               ->get();
         });
 
-        WidgetArea::where('code', $uniqueCode)
-                  ->increment('viewed');
-
         self::saveRenderedWidgetArea($widgets);
     }
 
@@ -44,7 +47,7 @@ class WidgetAreas
         }
 
         $widgets = Cache::remember('widgets', setting('widgetCacheLifetime', 5), function () {
-            $widgetArea = new WidgetArea();
+            $widgetArea = app(WidgetAreaRepository::class);
             return $widgetArea->getWidgets()
                               ->get();
         });
@@ -58,7 +61,7 @@ class WidgetAreas
      *
      * @param $uniqueCode
      *
-     * @return mixed
+     * @return void
      */
     public static function render($uniqueCode)
     {