Lots of cleanup, remove Laravel API Tools, Dingo and some tests.

Author: joselfonseca

.dockerignore

@@ -4,3 +4,8 @@ node_modules/
 .gitignore
 .DS_Store
 .env
+vendor/
+storage/logs/laravel.log
+framework/cache/
+framework/sessions/
+

Dockerfile

@@ -1,4 +1,4 @@
-FROM joselfonsecadt/php7.0:1.0.0
+FROM joselfonsecadt/php7.0:1.1.0
 
 MAINTAINER Jose Fonseca <[email protected]>
 
@@ -8,14 +8,23 @@ COPY docker/php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf
 
 COPY docker/www.conf /etc/php/7.0/fpm/pool.d/www.conf
 
-COPY . /var/www/html/
-
-EXPOSE 80
-
 COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 WORKDIR /var/www/html/
 
+COPY composer.json ./
+
+COPY composer.lock ./
+
+RUN composer install --no-dev --no-scripts --no-autoloader
+
+COPY . /var/www/html/
+
+RUN composer dump-autoload --optimize && \
+	php artisan optimize
+
 RUN cp .env.example .env
 
+EXPOSE 80
+
 CMD ["/usr/bin/supervisord"]

app/Contracts/Users/UsersServiceContract.php

@@ -2,7 +2,7 @@
 
 namespace App\Entities;
 
-use Joselfonseca\LaravelApiTools\Traits\UuidScopeTrait;
+use App\Support\UuidScopeTrait;
 
 /**
  * Class Permission

app/Entities/Permission.php

@@ -2,7 +2,7 @@
 
 namespace App\Entities;
 
-use Joselfonseca\LaravelApiTools\Traits\UuidScopeTrait;
+use App\Support\UuidScopeTrait;
 
 /**
  * Class Role

app/Entities/Role.php

@@ -2,11 +2,11 @@
 
 namespace App\Entities;
 
+use App\Support\UuidScopeTrait;
 use Laravel\Passport\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Joselfonseca\LaravelApiTools\Traits\UuidScopeTrait;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
 class User extends Authenticatable

app/Entities/User.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Http\Controllers\Api\Users;
+
+use App\Entities\User;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Transformers\Users\UserTransformer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+
+/**
+ * Class UsersController
+ * @package App\Http\Controllers\Users
+ */
+class UsersController extends Controller
+{
+
+    protected $model;
+
+    public function __construct(User $model)
+    {
+        $this->model = $model;
+        $this->middleware('permission:List users')->only('index');
+        $this->middleware('permission:List users')->only('show');
+        $this->middleware('permission:Create users')->only('store');
+        $this->middleware('permission:Update users')->only('update');
+        $this->middleware('permission:Delete users')->only('destroy');
+    }
+
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function index(Request $request)
+    {
+        $paginator = $this->model->with('roles.permissions')
+            ->paginate($request->get('limit', env('PAGINATE_LIMIT', 20)));
+        return fractal()->collection($paginator->getCollection(), new UserTransformer())
+            ->paginateWith(new IlluminatePaginatorAdapter($paginator))
+            ->respond();
+    }
+
+
+    /**
+     * @param $id
+     * @return mixed
+     */
+    public function show($id)
+    {
+
+    }
+
+
+    /**
+     * @param Request $request
+     * @return mixed
+     */
+    public function store(Request $request)
+    {
+
+    }
+
+
+    /**
+     * @param Request $request
+     * @param $uuid
+     * @return mixed
+     */
+    public function update(Request $request, $uuid)
+    {
+
+    }
+
+    /**
+     * @param Request $request
+     * @param $uuid
+     * @return mixed
+     */
+    public function partialUpdate(Request $request, $uuid)
+    {
+
+    }
+
+
+    /**
+     * @param Request $request
+     * @param $uuids
+     * @return mixed
+     */
+    public function destroy(Request $request, $uuids)
+    {
+
+    }
+}

app/Http/Controllers/Api/Users/UsersController.php

@@ -2,10 +2,7 @@
 
 namespace App\Providers;
 
-use App\Services\Users\UsersService;
 use Illuminate\Support\ServiceProvider;
-use App\Contracts\Users\UsersServiceContract;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -26,9 +23,6 @@ public function boot()
      */
     public function register()
     {
-        $this->app->bind(UsersServiceContract::class, UsersService::class);
-        app('Dingo\Api\Exception\Handler')->register(function (ModelNotFoundException $exception) {
-            throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-        });
+
     }
 }

app/Http/Controllers/Users/UsersController.php

@@ -4,7 +4,6 @@
 
 use Carbon\Carbon;
 use Laravel\Passport\Passport;
-use Joselfonseca\LaravelApiTools\Auth\PassportAuthenticationProvider;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
@@ -29,8 +28,5 @@ public function boot()
         Passport::routes();
         Passport::tokensExpireIn(Carbon::now()->addHours(10));
         Passport::refreshTokensExpireIn(Carbon::now()->addDays(3));
-        app('Dingo\Api\Auth\Auth')->extend('passport', function ($app) {
-            return app(PassportAuthenticationProvider::class);
-        });
     }
 }