FEATURE #2042: refactorize widgets

app/Models/Widgets/ModelTraits/Widget.php

@@ -1,41 +0,0 @@
-<?php
-namespace App\Models\Widgets\ModelTraits;
-
-use App\Events\CreateNewWidget;
-use App\Http\Requests\Request;
-use App\Models\Widgets\Widget as WidgetModel;
-use App\Models\Widgets\WidgetType;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
-
-trait Widget
-{
-    /**
-     * Create new widget of given type
-     *
-     * @param WidgetType $widgetType
-     * @param Request    $request
-     *
-     * @return WidgetModel
-     */
-    public function createNew(WidgetType $widgetType, Request $request)
-    {
-        $settings = call_user_func([$widgetType->handler, 'save'], $request);
-
-        // create new widget
-        $widget = WidgetModel::create([
-                                          'widget_type_handler' => $widgetType->handler,
-                                          'language'            => LaravelLocalization::getCurrentLocale(),
-                                          'user_id'             => \Auth::user()->id,
-                                          'name'                => $request->name,
-                                          'container_class'     => $request->containerClass,
-                                          'container_id'        => empty($request->containerId) ? null : $request->containerId,
-                                          'description'         => $request->description,
-                                          'settings'            => json_encode($settings),
-                                      ]);
-
-        // fire event with newly created widget
-        \Event::fire(new CreateNewWidget($widget));
-
-        return $widget;
-    }
-}

app/Models/Widgets/ModelTraits/WidgetArea.php

@@ -1,24 +0,0 @@
-<?php
-namespace App\Models\Widgets\ModelTraits;
-
-use App\Models\Widgets\Widget;
-use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
-
-trait WidgetArea
-{
-    public function getWidgets($uniqueCode = false)
-    {
-        $widgets = Widget::select('widgets.*', 'widgets.widget_type_handler', 'widget_areas.code as widget_area_code', 'widgets.name as widget_name', 'widgets.settings')
-                         ->join('widget_in_widget_area', 'widget_in_widget_area.widget_id', '=', 'widgets.id')
-                         ->join('widget_areas', 'widget_in_widget_area.widget_area_id', '=', 'widget_areas.id')
-                         ->where('language', LaravelLocalization::getCurrentLocale())
-                         ->orderBy('widget_in_widget_area.position');
-        if (!$uniqueCode) {
-            $widgets = $widgets->where('widget_areas.viewed', '>=', setting('preloadFrequentedWidgetAreasTreshold', 10));
-        } else {
-            $widgets = $widgets->where('code', $uniqueCode);
-        }
-
-        return $widgets;
-    }
-}

app/Models/Widgets/Widget.php

@@ -22,4 +22,9 @@ class Widget extends Model
         'viewed',
         'deletable'
     ];
+
+    protected $casts = [
+        'settings' => 'object',
+        'deletable' => 'boolean',
+    ];
 }

app/Models/Widgets/WidgetArea.php

@@ -3,19 +3,24 @@
 namespace App\Models\Widgets;
 
 use Illuminate\Database\Eloquent\Model;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 /**
  * Class WidgetArea
  */
 class WidgetArea extends Model
 {
-    use ModelTraits\WidgetArea;
-
-    public $timestamps = false;
+    public $timestamps = true;
     protected $fillable = [
         'name',
         'code',
         'description',
         'deletable'
     ];
+
+    public function widgets()
+    {
+        return $this->hasMany(Widget::class)
+                    ->where('language', LaravelLocalization::getCurrentLocale());
+    }
 }