Merge branch 'feature/base-rework' into develop

Author: socheatsok78

src/Console/stubs/repository.model.stub

@@ -3,7 +3,7 @@
 namespace DummyNamespace;
 
 use DummyFullModelClass;
-use PPSpaces\Repositories\Model as Repository;
+use PPSpaces\Repositories\Repository;
 
 class DummyClass extends Repository {
 
@@ -12,17 +12,15 @@ class DummyClass extends Repository {
      *
      * @var \DummyFullModelClass
      */
-    protected $repository;
+    protected $model = "DummyFullModelClass";
 
     /**
-     * Create a new repository instance.
+     * Scope a query for the model before executing
      *
-     * @param  \DummyFullModelClass  $DummyModelVariable
+     * @param \Illuminate\Database\Query\Builder $query
      * @return void
      */
-    public function __construct(DummyModelClass $DummyModelVariable) {
-        $this->repository = $DummyModelVariable;
-    }
+    public function before($query) {}
 
     /**
      * Get all of the models from the database.

src/Contracts/Model.php renamed to src/Contracts/Repository.php

@@ -2,9 +2,17 @@
 
 namespace PPSpaces\Contracts;
 
-interface Model
+interface Repository
 {
 
+    /**
+     * Scope a query for the model before executing
+     *
+     * @param \Illuminate\Database\Query\Builder $query
+     * @return void
+     */
+    public function before($query);
+
     /**
      * Get all of the models from the database.
      *
@@ -65,9 +73,18 @@ public function delete($id);
     public static function destroy($ids);
 
     /**
-     * Convert the model to its string representation.
+     * Specify Model class name
      *
      * @return string
      */
-    public function __toString();
+    public function model();
+
+    /**
+     * Resolve the given model from the container.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     *
+     * @throws PPSpaces\Exceptions\RepositoryException
+     */
+    public function initializeRepository();
 }

src/Exceptions/RepositoryException.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace PPSpaces\Exceptions;
+
+use Exception;
+
+class RepositoryException extends Exception
+{
+    /**
+     * Report the exception.
+     *
+     * @return void
+     */
+    public function report()
+    {
+        //
+    }
+
+    /**
+     * Render the exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request)
+    {
+        // return response(...);
+    }
+}

src/Repositories/Model.php renamed to src/Repositories/Repository.php

@@ -2,32 +2,74 @@
 
 namespace PPSpaces\Repositories;
 
+use ReflectionClass;
 use JsonSerializable;
-use Illuminate\Support\Traits\ForwardsCalls;
+
+use Illuminate\Container\Container as App;
+
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Contracts\Routing\UrlRoutable;
-use PPSpaces\Contracts\Model as RepositoryContract;
 
-abstract class Model implements RepositoryContract, JsonSerializable, UrlRoutable {
+use PPSpaces\Exceptions\RepositoryException;
+use PPSpaces\Contracts\Repository as RepositoryContract;
 
-    use ForwardsCalls;
+abstract class Repository implements RepositoryContract, JsonSerializable, UrlRoutable {
+
+    /**
+     * The application instance being facaded.
+     *
+     * @var \Illuminate\Container\Container
+     */
+    protected $app;
+
+    /**
+     * The Model class name.
+     *
+     * @var string
+     */
+    protected $model;
 
     /**
      * The repository instance.
      *
-     * @var \Illuminate\Database\Eloquent\Model
+     * @var mixed
      */
     protected $repository;
 
+    /**
+     * The model instance.
+     *
+     * @var \Illuminate\Database\Eloquent\Model
+     */
+    protected $resolver;
+
+    /**
+     * The resolved model instance.
+     *
+     * @var \Illuminate\Database\Eloquent\Model
+     */
+    protected $resolved;
+
     /**
      * Create a new repository instance.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return void
      */
-    public function __construct($model) {
-        $this->repository = $model;
+    public function __construct(App $app) {
+        $this->app = $app;
+
+        $this->initializeRepository();
     }
 
+    /**
+     * Scope a query for the model before executing
+     *
+     * @param \Illuminate\Database\Query\Builder $query
+     * @return void
+     */
+    public function before($query) {}
+
     /**
      * Get all of the models from the database.
      *
@@ -100,14 +142,42 @@ public static function destroy($ids) {
         //
     }
 
+    /**
+     * Specify Model class name
+     *
+     * @return string
+     */
+    public function model() {
+        return $this->model;
+    }
+
+    /**
+     * Resolve the given model from the container.
+     *
+     * @return \Illuminate\Database\Eloquent\Builder
+     *
+     * @throws PPSpaces\Exceptions\RepositoryException
+     */
+    public function initializeRepository() {
+        $model = $this->app->make($this->model);
+
+        if (!$model instanceof Model) {
+            throw new RepositoryException("Class {$this->model} must be an instance of Illuminate\\Database\\Eloquent\\Model");
+        }
+
+        $this->repository = $model->newQuery();
+
+        $this->before($this->repository);
+    }
+
     /**
      * Get the value of the model's route key.
      *
      * @return mixed
      */
     public function getRouteKey()
     {
-        return $this->repository->getAttribute($this->getRouteKeyName());
+        return $this->resolver->getAttribute($this->getRouteKeyName());
     }
 
     /**
@@ -117,7 +187,7 @@ public function getRouteKey()
      */
     public function getRouteKeyName()
     {
-        return $this->repository->getKeyName();
+        return $this->resolver->getKeyName();
     }
 
     /**
@@ -128,7 +198,11 @@ public function getRouteKeyName()
      */
     public function resolveRouteBinding($value)
     {
-        return $this->repository->where($this->getRouteKeyName(), $value)->first();
+        $this->resolver = (new $this->model);
+
+        $this->resolved = $this->resolver->where($this->getRouteKeyName(), $value)->first() ?? abort(404);
+
+        return $this;
     }
 
     /**
@@ -138,7 +212,17 @@ public function resolveRouteBinding($value)
      */
     public function jsonSerialize()
     {
-        return $this->repository->toArray();
+        return $this->resolved->toArray();
+    }
+
+    /**
+     * Convert the model instance to an array.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->resolved->toArray();
     }
 
     /**
@@ -148,6 +232,6 @@ public function jsonSerialize()
      */
     public function __toString()
     {
-        return $this->repository->toJson();
+        return $this->resolved->toJson();
     }
 }