firstOrFail method implemented, smartPaginate limit bug fixed

Author: begimov

src/Contracts/RepositoryInterface.php

@@ -117,6 +117,27 @@ public function detach($id, $relation, $ids);
      */
     public function findOrFail($id, $columns = ['*']);
 
+    /**
+     * Find a model by its primary key or throw an exception and return repository instance.
+     *
+     * @param  mixed  $id
+     * @param  array  $columns
+     * @return \AwesIO\Repository\Contracts\RepositoryInterface
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
+    public function findOrFailRepo($id, $columns = ['*']);
+
+    /**
+     * Execute the query and get the first result or throw an exception.
+     *
+     * @param  array  $columns
+     * @return \Illuminate\Database\Eloquent\Model|static
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
+    public function firstOrFail($columns = ['*']);
+
     /**
      * Paginate the given query by 'limit' request parameter
      * @return mixed

src/Eloquent/BaseRepository.php

@@ -213,6 +213,23 @@ public function findOrFailRepo($id, $columns = ['*'])
         return $this;
     }
 
+    /**
+     * Execute the query and get the first result or throw an exception.
+     *
+     * @param  array  $columns
+     * @return \Illuminate\Database\Eloquent\Model|static
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException
+     */
+    public function firstOrFail($columns = ['*'])
+    {
+        $results = $this->entity->firstOrFail($columns);
+
+        $this->reset();
+
+        return $results;
+    }
+
     /**
      * Paginate the given query by 'limit' request parameter
      * @return mixed
@@ -224,6 +241,8 @@ public function smartPaginate()
             config('awesio-repository.smart_paginate.default_limit')
         );
 
+        if ($limit === 0) $limit = config('awesio-repository.smart_paginate.default_limit');
+
         $maxLimit = config('awesio-repository.smart_paginate.max_limit');
 
         $limit = ($limit <= $maxLimit) ? $limit : $maxLimit;

tests/Unit/RepositoryTest.php

@@ -285,6 +285,24 @@ public function it_finds_and_returns_respository_instance_or_fails()
         $repository->findOrFailRepo(22);
     }
 
+    /** @test */
+    public function it_finds_first_or_fails()
+    {
+        $model = factory(Model::class)->create();
+        
+        $repository = new Repository;
+
+        $result = $repository->where('id', $model->id)->firstOrFail();
+
+        $this->assertInstanceOf(Model::class, $result);
+
+        $this->assertEquals($model->name, $result->name);
+
+        $this->expectException(ModelNotFoundException::class);
+
+        $repository->where('id', $model->id + 1)->firstOrFail();
+    }
+
     /** @test */
     public function it_can_smart_paginate()
     {