REFACTORING: move part of content business logic into repository

This commit is contained in:
Michal Kváček
2016-10-18 15:36:26 +02:00
parent eabbf48ee0
commit 662700b4f2
19 changed files with 504 additions and 383 deletions
@@ -1,21 +1,19 @@
<?php
namespace App\Http\Controllers\Admin\Contents;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Enumerations\ContentStatuses;
use App\Cms\Handlers\Interactions\Interaction;
use App\Cms\Interactions\Admin\Content\NewContent;
use App\Events\CreateNewContent as CreateNewContentEvent;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\CreateNewContentRequest;
use App\Http\Requests\Request;
use App\Models\Content\Content;
use App\Models\FileManager\File;
use App\Models\Module;
use App\Models\Templates\Template;
use Illuminate\Support\Facades\Event;
use Modules\Categories\Entities\Category;
use Pingpong\Modules\Facades\Module as ModuleInstance;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**
* Class CreateNewContent
@@ -31,23 +29,29 @@ class CreateNewContent extends Controller
*/
private $file;
/**
* @var Content
* @var IContent
*/
private $content;
/**
* @var IModuleRepository
*/
private $module;
/**
* CreateNewContent constructor.
*
* Sets File and Content models into class variables
*
* @param File $file
* @param Content $content
* @param File $file
* @param Content $content
* @param IModuleRepository $module
*/
public function __construct(File $file, Content $content)
public function __construct(File $file, IContent $content, IModuleRepository $module)
{
parent::__construct();
$this->file = $file;
$this->content = $content;
$this->module = $module;
}
/**
@@ -57,7 +61,7 @@ class CreateNewContent extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function getNew($moduleId)
public function create($moduleId)
{
$module = Module::findOrFail($moduleId);
$statuses = ContentStatuses::getWithTranslations();
@@ -82,7 +86,7 @@ class CreateNewContent extends Controller
}
// create default content object
$this->content->status = Content::STATUS_DRAFT;
$this->content->status = IContent::STATUS_DRAFT;
// render view
return view('admin.content.new', [
@@ -110,21 +114,12 @@ class CreateNewContent extends Controller
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postNew(Request $request, $moduleId)
public function store(Request $request, $moduleId)
{
try {
$module = Module::findOrFail($moduleId);
} catch (NotFoundHttpException $e) {
return redirect()
->route('content.overview')
->withInput()
->with('error', trans('admin/contents.invalidModule'));
}
$request->handler = $module->handler;
$module = Module::findOrFail($moduleId);
// create new page
Interaction::handle($request, new NewContent());
Interaction::handle($request, new NewContent(), $module->handler);
return redirect()
->route('content.overview')