Рефакторинг класса WidgetRepository

KodiComponents · May 26, 2016 · 35057a4 · 35057a4
1 parent e6fed82
commit 35057a4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 25 deletions.
diff --git a/src/Http/Controllers/WidgetController.php b/src/Http/Controllers/WidgetController.php
@@ -25,7 +25,7 @@ public function getIndex(WidgetManager $widgetManager, WidgetRepository $reposit
     {
         Meta::loadPackage('editable');
 
-        $query = $repository->getModel()->newQuery();
+        $query = $repository->query();
 
         $widgetTypeLinks = [
             link_to_route(
@@ -91,10 +91,8 @@ public function getCreate(WidgetManager $widgetManager, $type = 'html')
      */
     public function postCreate(WidgetRepository $repository)
     {
-        $data = $this->request->all();
-
-        $repository->validateOnCreate($data);
-        $widget = $repository->create($data);
+        $repository->validateOnCreate($this->request);
+        $widget = $repository->create($this->request->all());
 
         return $this->smartRedirect([$widget])
             ->with('success', trans($this->wrapNamespace('core.messages.created'), [
@@ -127,10 +125,8 @@ public function getEdit(WidgetRepository $repository, $id)
      */
     public function postEdit(WidgetRepository $repository, $id)
     {
-        $data = $this->request->all();
-
-        $repository->validateOnUpdate($data);
-        $widget = $repository->update($id, $data);
+        $repository->validateOnUpdate($id, $this->request);
+        $widget = $repository->update($id, $this->request->all());
 
         return $this->smartRedirect([$widget])
             ->with('success', trans($this->wrapNamespace('core.messages.updated'), [

diff --git a/src/Repository/WidgetRepository.php b/src/Repository/WidgetRepository.php
@@ -3,6 +3,7 @@
 namespace KodiCMS\Widgets\Repository;
 
 use DB;
+use Illuminate\Http\Request;
 use KodiCMS\Widgets\Model\Widget;
 use KodiCMS\CMS\Repository\BaseRepository;
 
@@ -17,34 +18,25 @@ public function __construct(Widget $model)
     }
 
     /**
-     * @param array $data
-     *
-     * @return bool
-     * @throws \KodiCMS\CMS\Exceptions\ValidationException
+     * @param Request $request
      */
-    public function validateOnCreate(array $data = [])
+    public function validateOnCreate(Request $request)
     {
-        $validator = $this->validator($data, [
+        $this->validate($request, [
             'name' => 'required|max:255',
             'type' => 'required',
         ]);
-
-        return $this->_validate($validator);
     }
 
     /**
-     * @param array $data
-     *
-     * @return bool
-     * @throws \KodiCMS\CMS\Exceptions\ValidationException
+     * @param int     $id
+     * @param Request $request
      */
-    public function validateOnUpdate(array $data = [])
+    public function validateOnUpdate($id, Request $request)
     {
-        $validator = $this->validator($data, [
+        $this->validate($request, [
             'name' => 'required|max:255',
         ]);
-
-        return $this->_validate($validator);
     }
 
     /**