Repository with relations

albertchristanto · Aug 23, 2016 · 0fa7452 · 0fa7452
1 parent e520ebf
commit 0fa7452
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 186 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
@@ -129,7 +129,7 @@ public function edit($id)
     {
         $data['title'] = $this->user->getTableName();
         $data['roles'] = Role::all();
-        $data['user'] = $this->user->userWithFindbyId($id);
+        $data['user'] = $this->user->with('role')->findId($id);
         return view('users.edit', $data);
     }
 

diff --git a/app/Repositories/Contracts/RepositoryInterface.php b/app/Repositories/Contracts/RepositoryInterface.php
@@ -76,6 +76,13 @@ public function findOrFail($value);
      */
     public function whereIn($field, $value = array());
 
+    /**
+     * @param $field
+     * @param $value
+     * @return mixed
+     */
+    public function with($relation);
+
     /**
      * @param $field
      * @param $value

diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php
@@ -40,16 +40,6 @@ public function getParents($parent)
             ->lists('product_id');
     }
 
-    /**
-     * @param $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Eloquent\Model
-     */
-    public function ItemProperty($id)
-    {
-        return $this->model->with('category', 'size', 'color')
-            ->findOrFail($id);
-    }
-
     /**
      * @return mixed
      */

diff --git a/app/Repositories/Repository.php b/app/Repositories/Repository.php
@@ -47,6 +47,13 @@ abstract class Repository implements RepositoryInterface
      */
     protected $model;
 
+    /**
+     * The relations to eager load.
+     *
+     * @var
+     */
+    protected $with = [];
+
     /**
      * @param App $app
      *
@@ -129,14 +136,34 @@ public function whereIn($attribute, $value = array())
     }
 
     /**
-     * @param array $relations
+     * Sets relations for eager loading.
+     *
+     * @param $relations
      * @return $this
      */
-    /*public function with(array $relations)
+    public function with($relations)
     {
-        $this->model = $this->model->with($relations);
+
+        if (is_string($relations))
+        {
+            $this->with = explode(',', $relations);
+
+            return $this;
+        }
+
+        $this->with = is_array($relations) ? $relations : [];
+
         return $this;
-    }*/
+    }
+
+    /**
+     * @param $value
+     * @return mixed
+     */
+    public function findId($value)
+    {
+        return $this->query()->findOrFail($value);
+    }
 
     /**
      * @param $id
@@ -155,4 +182,14 @@ public function makeModel()
         $model = $this->app->make($this->model());
         return $this->model = $model;
     }
+
+    /**
+     * Creates a new QueryBuilder instance including eager loads
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    protected function query ()
+    {
+        return $this->model->newQuery()->with($this->with);
+    }
 }
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
@@ -48,15 +48,6 @@ public function userWithPaginate()
             ->paginate(10);
     }
 
-    /**
-     * @param $id
-     * @return \Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Eloquent\Model
-     */
-    public function userWithFindbyId($id)
-    {
-        return $this->model->with('role')->findOrFail($id);
-    }
-
     /**
      * Users role
      * @return \Illuminate\Database\Eloquent\Collection|static[]

diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php
@@ -127,7 +127,7 @@ public function getProductInfo($slug, $id)
     {
         $data['latest'] = $this->product->latest();;
         $data['products'] = $this->product->product();
-        $data['item'] = $this->product->ItemProperty($id);
+        $data['item'] = $this->product->with('category', 'size', 'color')->findId($id);
         return $data;
     }
 
@@ -137,7 +137,7 @@ public function getProductInfo($slug, $id)
      */
     public function getFrameContent($id)
     {
-        $data = $this->product->ItemProperty($id);
+        $data = $this->product->with('category', 'size', 'color')->findId($id);
         return $data;
     }