Merge pull request #73 from joselfonseca/feature/move-to-models-dir

joselfonseca · web-flow · commit 1174b4d89f32 · 2020-10-19T14:39:53.000-05:00
Move models to a models directory
diff --git a/app/Events/AssetWasCreated.php b/app/Events/AssetWasCreated.php
@@ -2,22 +2,22 @@
 
 namespace App\Events;
 
-use App\Entities\Assets\Asset;
+use App\Models\Asset;
 
 /**
  * Class AssetWasCreated.
  */
 class AssetWasCreated
 {
     /**
-     * @var \App\Entities\Assets\Asset
+     * @var \App\Models\Asset
      */
     public $asset;
 
     /**
      * AssetWasCreated constructor.
      *
-     * @param \App\Entities\Assets\Asset $asset
+     * @param \App\Models\Asset $asset
      */
     public function __construct(Asset $asset)
     {
diff --git a/app/Http/Controllers/Api/Assets/RenderFileController.php b/app/Http/Controllers/Api/Assets/RenderFileController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api\Assets;
 
-use App\Entities\Assets\Asset;
 use App\Http\Controllers\Controller;
+use App\Models\Asset;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
@@ -15,14 +15,14 @@
 class RenderFileController extends Controller
 {
     /**
-     * @var \App\Entities\Assets\Asset
+     * @var \App\Models\Asset
      */
     protected $model;
 
     /**
      * RenderFileController constructor.
      *
-     * @param \App\Entities\Assets\Asset $model
+     * @param \App\Models\Asset $model
      */
     public function __construct(Asset $model)
     {
diff --git a/app/Http/Controllers/Api/Assets/UploadFileController.php b/app/Http/Controllers/Api/Assets/UploadFileController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Api\Assets;
 
-use App\Entities\Assets\Asset;
 use App\Events\AssetWasCreated;
 use App\Exceptions\BodyTooLargeException;
 use App\Http\Controllers\Controller;
@@ -46,17 +45,17 @@ class UploadFileController extends Controller
     protected $client;
 
     /**
-     * @var \App\Entities\Assets\Asset
+     * @var \App\Models\Asset
      */
     protected $model;
 
     /**
      * UploadFileController constructor.
      *
      * @param \GuzzleHttp\Client $client
-     * @param \App\Entities\Assets\Asset $model
+     * @param \App\Models\Asset $model
      */
-    public function __construct(Client $client, Asset $model)
+    public function __construct(Client $client, \App\Models\Asset $model)
     {
         $this->client = $client;
         $this->model = $model;
diff --git a/app/Http/Controllers/Api/Users/PermissionsController.php b/app/Http/Controllers/Api/Users/PermissionsController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api\Users;
 
-use App\Entities\Permission;
 use App\Http\Controllers\Controller;
+use App\Models\Permission;
 use App\Transformers\Users\PermissionTransformer;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Http\Request;
@@ -23,7 +23,7 @@ class PermissionsController extends Controller
     /**
      * PermissionsController constructor.
      *
-     * @param Permission $model
+     * @param \App\Models\Permission $model
      */
     public function __construct(Permission $model)
     {
diff --git a/app/Http/Controllers/Api/Users/RolesController.php b/app/Http/Controllers/Api/Users/RolesController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api\Users;
 
-use App\Entities\Role;
 use App\Http\Controllers\Controller;
+use App\Models\Role;
 use App\Transformers\Users\RoleTransformer;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Http\Request;
@@ -23,7 +23,7 @@ class RolesController extends Controller
     /**
      * RolesController constructor.
      *
-     * @param Role $model
+     * @param \App\Models\Role $model
      */
     public function __construct(Role $model)
     {
diff --git a/app/Http/Controllers/Api/Users/UsersController.php b/app/Http/Controllers/Api/Users/UsersController.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Api\Users;
 
-use App\Entities\User;
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Transformers\Users\UserTransformer;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Http\Request;
@@ -18,14 +18,14 @@ class UsersController extends Controller
     use Helpers;
 
     /**
-     * @var User
+     * @var \App\Model\\App\Models\User
      */
     protected $model;
 
     /**
      * UsersController constructor.
      *
-     * @param User $model
+     * @param \App\Model\User $model
      */
     public function __construct(User $model)
     {
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entities\Assets;
+namespace App\Models;
 
 use App\Support\UuidScopeTrait;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entities;
+namespace App\Models;
 
 use App\Support\UuidScopeTrait;
 
diff --git a/app/Models/Role.php b/app/Models/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entities;
+namespace App\Models;
 
 use App\Support\HasPermissionsUuid;
 use App\Support\UuidScopeTrait;
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entities;
+namespace App\Models;
 
 use App\Support\HasRolesUuid;
 use App\Support\UuidScopeTrait;
diff --git a/app/Services/Installation/Events/ApplicationWasInstalled.php b/app/Services/Installation/Events/ApplicationWasInstalled.php
@@ -2,7 +2,7 @@
 
 namespace App\Services\Installation\Events;
 
-use App\Entities\User;
+use App\Models\User;
 
 /**
  * Class ApplicationWasInstalled.
@@ -27,7 +27,7 @@ class ApplicationWasInstalled
     /**
      * ApplicationWasInstalled constructor.
      *
-     * @param User $adminUser
+     * @param \App\Models\User $adminUser
      * @param $roles
      * @param $permissions
      */
diff --git a/app/Services/Installation/InstallAppHandler.php b/app/Services/Installation/InstallAppHandler.php
@@ -2,9 +2,9 @@
 
 namespace App\Services\Installation;
 
-use App\Entities\Permission;
-use App\Entities\Role;
-use App\Entities\User;
+use App\Models\Permission;
+use App\Models\Role;
+use App\Models\User;
 use App\Services\Installation\Events\ApplicationWasInstalled;
 use Closure;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Support/HasPermissionsUuid.php b/app/Support/HasPermissionsUuid.php
@@ -2,7 +2,7 @@
 
 namespace App\Support;
 
-use App\Entities\Permission as PermissionEntity;
+use App\Models\Permission as PermissionEntity;
 use Spatie\Permission\Contracts\Permission;
 
 /**
diff --git a/app/Support/HasRolesUuid.php b/app/Support/HasRolesUuid.php
@@ -2,7 +2,7 @@
 
 namespace App\Support;
 
-use App\Entities\Role as RoleEntity;
+use App\Models\Role as RoleEntity;
 use Spatie\Permission\Contracts\Role;
 
 trait HasRolesUuid
diff --git a/app/Transformers/Assets/AssetTransformer.php b/app/Transformers/Assets/AssetTransformer.php
@@ -2,7 +2,6 @@
 
 namespace App\Transformers\Assets;
 
-use App\Entities\Assets\Asset;
 use League\Fractal\TransformerAbstract;
 
 /**
@@ -11,10 +10,10 @@
 class AssetTransformer extends TransformerAbstract
 {
     /**
-     * @param \App\Entities\Assets\Asset $model
+     * @param \App\Models\Asset $model
      * @return array
      */
-    public function transform(Asset $model)
+    public function transform(\App\Models\Asset $model)
     {
         return [
             'id' => $model->uuid,
diff --git a/app/Transformers/Users/PermissionTransformer.php b/app/Transformers/Users/PermissionTransformer.php
@@ -2,7 +2,7 @@
 
 namespace App\Transformers\Users;
 
-use App\Entities\Permission;
+use App\Models\Permission;
 use League\Fractal\TransformerAbstract;
 
 /**
@@ -11,7 +11,7 @@
 class PermissionTransformer extends TransformerAbstract
 {
     /**
-     * @param Permission $model
+     * @param \App\Models\Permission $model
      * @return array
      */
     public function transform(Permission $model)
diff --git a/app/Transformers/Users/RoleTransformer.php b/app/Transformers/Users/RoleTransformer.php
@@ -2,7 +2,7 @@
 
 namespace App\Transformers\Users;
 
-use App\Entities\Role;
+use App\Models\Role;
 use League\Fractal\TransformerAbstract;
 
 /**
@@ -16,7 +16,7 @@ class RoleTransformer extends TransformerAbstract
     protected $defaultIncludes = ['permissions'];
 
     /**
-     * @param Role $model
+     * @param \App\Models\Role $model
      * @return array
      */
     public function transform(Role $model)
diff --git a/app/Transformers/Users/UserTransformer.php b/app/Transformers/Users/UserTransformer.php
@@ -2,7 +2,7 @@
 
 namespace App\Transformers\Users;
 
-use App\Entities\User;
+use App\Models\User;
 use League\Fractal\TransformerAbstract;
 
 /**
@@ -16,7 +16,7 @@ class UserTransformer extends TransformerAbstract
     protected $defaultIncludes = ['roles'];
 
     /**
-     * @param User $model
+     * @param \App\Model\User $model
      * @return array
      */
     public function transform(User $model)
@@ -31,7 +31,7 @@ public function transform(User $model)
     }
 
     /**
-     * @param User $model
+     * @param \App\Model\User $model
      * @return \League\Fractal\Resource\Collection
      */
     public function includeRoles(User $model)
diff --git a/config/auth.php b/config/auth.php
@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\Entities\User::class,
+            'model' => \App\Models\User::class,
         ],
 
         // 'users' => [
diff --git a/config/permission.php b/config/permission.php
@@ -13,7 +13,7 @@
          * `Spatie\Permission\Contracts\Permission` contract.
          */
 
-        'permission' => \App\Entities\Permission::class,
+        'permission' => \App\Models\Permission::class,
 
         /*
          * When using the "HasRoles" trait from this package, we need to know which
@@ -24,7 +24,7 @@
          * `Spatie\Permission\Contracts\Role` contract.
          */
 
-        'role' => \App\Entities\Role::class,
+        'role' => \App\Models\Role::class,
 
     ],
 
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -14,7 +14,7 @@
 */
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
-$factory->define(App\Entities\User::class, function (Faker\Generator $faker) {
+$factory->define(\App\Models\User::class, function (Faker\Generator $faker) {
     static $password;
 
     return [
@@ -26,14 +26,14 @@
     ];
 });
 
-$factory->define(App\Entities\Role::class, function (Faker\Generator $faker) {
+$factory->define(\App\Models\Role::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->name,
         'uuid' => $faker->uuid
     ];
 });
 
-$factory->define(App\Entities\Permission::class, function (Faker\Generator $faker) {
+$factory->define(\App\Models\Permission::class, function (Faker\Generator $faker) {
     return [
         'name' => $faker->name,
         'uuid' => $faker->uuid
diff --git a/database/seeds/Users/RoleTableSeeder.php b/database/seeds/Users/RoleTableSeeder.php
@@ -11,10 +11,10 @@ class RoleTableSeeder extends Seeder
      */
     public function run()
     {
-        factory(\App\Entities\Role::class)->create([
+        factory(\App\Models\Role::class)->create([
             'name' => 'Guest'
         ]);
-        factory(\App\Entities\Role::class)->create([
+        factory(\App\Models\Role::class)->create([
             'name' => 'Member'
         ]);
     }
diff --git a/database/seeds/Users/UsersTableSeeder.php b/database/seeds/Users/UsersTableSeeder.php
@@ -11,10 +11,10 @@ class UsersTableSeeder extends Seeder
      */
     public function run()
     {
-        factory(\App\Entities\User::class, 1500)->create()->each(function($user) {
+        factory(\App\Models\User::class, 1500)->create()->each(function($user) {
             $user->assignRole('Guest');
         });
-        factory(\App\Entities\User::class, 1500)->create()->each(function($user) {
+        factory(\App\Models\User::class, 1500)->create()->each(function($user) {
             $user->assignRole('Member');
         });
     }
diff --git a/routes/console.php b/routes/console.php
@@ -14,7 +14,7 @@
 */
 
 Artisan::command('dev:generate-personal-token {userId}', function ($userId) {
-    $user = \App\Entities\User::find($userId);
+    $user = \App\Models\User::find($userId);
     $this->info('Token for user '.$user->name);
     $token = $user->createToken('Personal Access Token')->accessToken;
     $this->info($token);
diff --git a/tests/Feature/Assets/RenderFileTest.php b/tests/Feature/Assets/RenderFileTest.php
diff --git a/tests/Feature/Assets/UploadImageTest.php b/tests/Feature/Assets/UploadImageTest.php
diff --git a/tests/Feature/Users/PermissionsEndpointsTest.php b/tests/Feature/Users/PermissionsEndpointsTest.php
diff --git a/tests/Feature/Users/ProfileEndpointsTest.php b/tests/Feature/Users/ProfileEndpointsTest.php
diff --git a/tests/Feature/Users/RolesEndpointsTest.php b/tests/Feature/Users/RolesEndpointsTest.php
diff --git a/tests/Feature/Users/UsersEndpointsTest.php b/tests/Feature/Users/UsersEndpointsTest.php
diff --git a/tests/Unit/Entities/RoleTest.php b/tests/Unit/Entities/RoleTest.php
diff --git a/tests/Unit/Services/Installation/AppInstallationServiceTest.php b/tests/Unit/Services/Installation/AppInstallationServiceTest.php
diff --git a/tests/Unit/Services/Installation/InstallAppHandlerTest.php b/tests/Unit/Services/Installation/InstallAppHandlerTest.php
