2.0.0-a.1

Author: craigAtCD

src/Contracts/Parser.php

@@ -87,7 +87,7 @@ protected function parseIncludeParams(): void
             $withs[$with] = $this->setWithQuery($where, $fields);
         }
 
-        $this->repository->with($withs);
+        $this->builder->with($withs);
     }
 
     /**
@@ -114,7 +114,7 @@ protected function parseSortParams(): void
                 continue;
             }
 
-            $this->repository->orderBy($sortF, $sortD);
+            $this->builder->orderBy($sortF, $sortD);
         }
 
         if ($withSorts->count() > 0) {
@@ -130,7 +130,7 @@ protected function parseJoinSorts(Collection $sorts)
             return $currentTable.'.'.$field;
         }, $this->parseFieldParams());
 
-        $this->repository->select($fields);
+        $this->builder->select($fields);
 
         foreach ($sorts as $sortF => $sortD) {
             [$with, $key] = explode('.', $sortF);
@@ -153,8 +153,8 @@ protected function parseJoinSorts(Collection $sorts)
 
             $withTableName = strpos($withTable, '.') === false ? $withConnection.'.'.$withTable : $withTable;
 
-            $this->repository->leftJoin($withTableName, "{$withTableName}.{$foreignKey}", "{$currentTable}.{$localKey}");
-            $this->repository->orderBy("{$withTableName}.{$key}", $sortD);
+            $this->builder->leftJoin($withTableName, "{$withTableName}.{$foreignKey}", "{$currentTable}.{$localKey}");
+            $this->builder->orderBy("{$withTableName}.{$key}", $sortD);
         }
     }
 
@@ -197,7 +197,7 @@ protected function parseFilterParams(): void
             } elseif (! in_array($whr['key'], $tableColumns)) {
                 continue;
             }
-            $this->setQueryBuilderWhereStatement($this->repository, $table.'.'.$whr['key'], $whr);
+            $this->setQueryBuilderWhereStatement($this->builder, $table.'.'.$whr['key'], $whr);
         }
     }
 
@@ -215,7 +215,7 @@ protected function setWhereHasClause(array $where): void
         }
         $subKey = $sub->qualifyColumn($key);
 
-        $this->repository->whereHas(Helpers::camel($with), function ($q) use ($where, $subKey) {
+        $this->builder->whereHas(Helpers::camel($with), function ($q) use ($where, $subKey) {
             $this->setQueryBuilderWhereStatement($q, $subKey, $where);
         });
     }

src/Contracts/Relationships.php

@@ -89,7 +89,7 @@ protected function storeRelated($item, array $includes, array $data): void
             $type = class_basename(get_class($relation));
             $relatedRecords = $data[Helpers::snake($with)];
 
-            $this->repository->with($with);
+            $this->builder->with($with);
 
             switch ($type) {
                 case 'HasOne':

src/Http/Api/Contracts/HasModel.php

@@ -16,6 +16,12 @@ trait HasModel
      */
     protected static $model;
 
+    /**
+     *
+     * @var \Illuminate\Database\Eloquent\Builder
+     */
+    protected $builder;
+
     /**
      * Do we need to unguard the model before create/update?
      *
@@ -49,6 +55,8 @@ protected function makeModel(): void
         }
 
         self::$model = $model;
+
+        $this->builder = $model->newQuery();
     }
 
     /**

src/Http/Api/Contracts/HasPolicies.php

@@ -16,7 +16,7 @@ protected function qualifyCollectionQuery(): void
         $modelPolicy = Gate::getPolicyFor(self::$model);
 
         if ($modelPolicy && method_exists($modelPolicy, 'qualifyCollectionQueryWithUser')) {
-            $modelPolicy->qualifyCollectionQueryWithUser($user, $this->repository);
+            $modelPolicy->qualifyCollectionQueryWithUser($user, $this->builder);
         }
     }
 
@@ -31,7 +31,7 @@ protected function qualifyItemQuery(): void
         $modelPolicy = Gate::getPolicyFor(self::$model);
 
         if ($modelPolicy && method_exists($modelPolicy, 'qualifyItemQueryWithUser')) {
-            $modelPolicy->qualifyItemQueryWithUser($user, $this->repository);
+            $modelPolicy->qualifyItemQueryWithUser($user, $this->builder);
         }
     }
 

src/Http/Api/Contracts/HasRepository.php

@@ -15,6 +15,8 @@ trait HasRepository
 
     /**
      * Creates our repository linkage.
+     *
+     * @deprecated
      */
     protected function makeRepository()
     {

src/Http/Api/Contracts/HasResources.php

@@ -83,7 +83,7 @@ protected function parseAllowedScopes($request): void
 
             if ($request->has($snake) || $request->has($camel)) {
                 $value = $this->parseScopeValue($request->has($snake) ? $request->get($snake) : $request->get($camel));
-                call_user_func([$this->repository, $camel], $value);
+                call_user_func([$this->builder, $camel], $value);
             }
         }
     }

src/Http/Api/Controller.php

@@ -69,7 +69,7 @@ abstract class Controller extends BaseController
     public function __construct()
     {
         $this->makeModel();
-        $this->makeRepository();
+      //  $this->makeRepository();
     }
 
     /**
@@ -85,7 +85,7 @@ public function handleIndexAction($request = null, array $extraParams = [])
         $fields = $this->parseFieldParams();
         $limit = $this->parseLimitParams();
 
-        $items = $limit > 0 ? $this->repository->paginate($limit, $fields)->appends($this->originalQueryParams) : $this->repository->get($fields);
+        $items = $limit > 0 ? $this->builder->paginate($limit, $fields)->appends($this->originalQueryParams) : $this->builder->get($fields);
 
         return $this->handleIndexResponse($items);
     }
@@ -97,7 +97,7 @@ public function handleIndexActionRaw($request = null, array $extraParams = [])
         $fields = $this->parseFieldParams();
         $limit = $this->parseLimitParams();
 
-        $items = $limit > 0 ? $this->repository->paginateRaw($limit, $fields)->appends($this->originalQueryParams) : $this->repository->getRaw($fields);
+        $items = $limit > 0 ? $this->builder->paginateRaw($limit, $fields)->appends($this->originalQueryParams) : $this->builder->getRaw($fields);
 
         return $this->handleIndexResponse($items);
     }
@@ -189,7 +189,7 @@ public function handleShowAction($id, $request = null, array $extraParams = [])
         $this->qualifyItemQuery();
 
         try {
-            $item = $this->repository->find($id, $fields);
+            $item = $this->builder->find($id, $fields);
             $this->authoriseUserAction('view', $item);
         } catch (ModelNotFoundException $exception) {
             return $this->errorNotFound('Record not found');
@@ -213,7 +213,7 @@ public function handleUpdateAction($id, $request, array $extraParams = [])
         $this->handleCommonActions($request);
 
         try {
-            $item = $this->repository->find($id);
+            $item = $this->builder->find($id);
             $this->authoriseUserAction('update', $item);
         } catch (ModelNotFoundException $exception) {
             return $this->errorNotFound('Record does not exist');
@@ -263,7 +263,7 @@ public function handleDestroyAction($id, $request = null)
         $this->qualifyItemQuery();
 
         try {
-            $item = $this->repository->find($id);
+            $item = $this->builder->find($id);
             $this->authoriseUserAction('delete', $item);
             $item->delete();
         } catch (ModelNotFoundException $exception) {