minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE: move bussiness logic out of models

Browse Source
This commit is contained in:
Michal Kváček
2016-10-17 01:05:20 +02:00
parent 2ded2924a1
commit e26e6fd460
46 changed files with 1069 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Widgets/ModelTraits/Widget.php
+41
View File
@@ -0,0 +1,41 @@
<?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
+24
View File
@@ -0,0 +1,24 @@
<?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/ModelTraits/WidgetInWidgetArea.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Models\Widgets\ModelTraits;
use App\Models\Widgets\WidgetInWidgetArea as WidgetInWidgetAreaModel;
trait WidgetInWidgetArea
{
public static function getWidgetIdsFromArea($widgetAreaId)
{
$models = WidgetInWidgetAreaModel::where('widget_area_id', $widgetAreaId)
->get();
$ids = [];
foreach ($models as $model) {
$ids[] = $model->widget_id;
}
return $ids;
}
}
app/Models/Widgets/Widget.php
-41
View File
@@ -22,45 +22,4 @@ class Widget extends Model
'viewed',
'deletable'
];
protected $guarded = [];
/**
* Create new widget of given type
*
* @param WidgetType $widgetType
* @param $data
*
* @return Widget
*/
public function createNew(WidgetType $widgetType, $data)
{
// convert array or whatever into object
if (!is_object($data)) {
$data = (object)$data;
}
// create new widget
$widget = new Widget();
$widget->widget_type_handler = $widgetType->handler;
$widget->language = LaravelLocalization::getCurrentLocale();
$widget->user_id = \Auth::user()->id;
$widget->name = $data->name;
$widget->container_class = $data->containerClass;
$widget->container_id = empty($data->containerId) ? null : $data->containerId;
// save description if available
if (isset($data->description)) {
$widget->description = $data->description;
}
$widget = call_user_func([$widgetType->handler, 'save'], $widget, $data);
// save into database
$widget->save();
// fire event with newly created widget
Event::fire(new \App\Events\CreateNewWidget($widget));
return $widget;
}
}
app/Models/Widgets/WidgetArea.php
+2 -18
View File
@@ -3,13 +3,14 @@
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;
protected $fillable = [
'name',
@@ -17,21 +18,4 @@ class WidgetArea extends Model
'description',
'deletable'
];
protected $guarded = [];
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/WidgetInWidgetArea.php
+2 -14
View File
@@ -9,6 +9,8 @@ use Illuminate\Database\Eloquent\Model;
*/
class WidgetInWidgetArea extends Model
{
use ModelTraits\WidgetInWidgetArea;
protected $table = 'widget_in_widget_area';
public $timestamps = false;
protected $fillable = [
@@ -16,18 +18,4 @@ class WidgetInWidgetArea extends Model
'widget_area_id',
'position'
];
protected $guarded = [];
public static function getWidgetIdsFromArea($widgetAreaId)
{
$models = WidgetInWidgetArea::where('widget_area_id', $widgetAreaId)
->get();
$ids = [];
foreach ($models as $model) {
$ids[] = $model->widget_id;
}
return $ids;
}
}
app/Models/Widgets/WidgetType.php
-5
View File
@@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class WidgetType extends Model
{
public $timestamps = false;
protected $fillable = [
@@ -19,8 +18,4 @@ class WidgetType extends Model
'module_id',
'description'
];
protected $guarded = [];
}