Merge remote-tracking branch 'origin/master'

# Conflicts: # app/Application/Http/Controllers/Backend/User/Authentication/NewPasswordController.php # app/Application/Http/Controllers/Backend/User/Authentication/PasswordController.php # app/Application/Http/Controllers/Backend/User/Authentication/RegisteredUserController.php
AlexisVS · Aug 23, 2023 · 2a9ba43 · 2a9ba43
2 parents 4d010ec + c918787
commit 2a9ba43
Show file tree

Hide file tree

Showing 29 changed files with 50 additions and 48 deletions.
diff --git a/...plication/Http/Controllers/Controller.php → ...tp/Controllers/Application/Controller.php b/...plication/Http/Controllers/Controller.php → ...tp/Controllers/Application/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Application\Http\Controllers;
+namespace App\Application\Http\Controllers\Application;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;

diff --git a/...Account/Controllers/AccountController.php → ...ers/Backend/Account/AccountController.php b/...Account/Controllers/AccountController.php → ...ers/Backend/Account/AccountController.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 
-namespace App\Domain\Account\Controllers;
+namespace App\Application\Http\Controllers\Backend\Account;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use Inertia\Inertia;
 use Inertia\Response;
 

diff --git a/...ollers/AuthenticatedSessionController.php → ...cation/AuthenticatedSessionController.php b/...ollers/AuthenticatedSessionController.php → ...cation/AuthenticatedSessionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
+use App\Application\Http\Requests\User\Authentication\LoginRequest;
 use App\Application\Providers\RouteServiceProvider;
-use App\Domain\User\Authentication\Requests\LoginRequest;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;

diff --git a/...rollers/ConfirmablePasswordController.php → ...ication/ConfirmablePasswordController.php b/...rollers/ConfirmablePasswordController.php → ...ication/ConfirmablePasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use App\Application\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

diff --git a/...ailVerificationNotificationController.php → ...ailVerificationNotificationController.php b/...ailVerificationNotificationController.php → ...ailVerificationNotificationController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use App\Application\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

diff --git a/...ers/EmailVerificationPromptController.php → ...ion/EmailVerificationPromptController.php b/...ers/EmailVerificationPromptController.php → ...ion/EmailVerificationPromptController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use App\Application\Providers\RouteServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

diff --git a/...ion/Controllers/NewPasswordController.php → .../Authentication/NewPasswordController.php b/...ion/Controllers/NewPasswordController.php → .../Authentication/NewPasswordController.php
diff --git a/...cation/Controllers/PasswordController.php → ...ser/Authentication/PasswordController.php b/...cation/Controllers/PasswordController.php → ...ser/Authentication/PasswordController.php
diff --git a/...ntrollers/PasswordResetLinkController.php → ...ntication/PasswordResetLinkController.php b/...ntrollers/PasswordResetLinkController.php → ...ntication/PasswordResetLinkController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;

diff --git a/.../Controllers/RegisteredUserController.php → ...thentication/RegisteredUserController.php b/.../Controllers/RegisteredUserController.php → ...thentication/RegisteredUserController.php
diff --git a/...ion/Controllers/VerifyEmailController.php → .../Authentication/VerifyEmailController.php b/...ion/Controllers/VerifyEmailController.php → .../Authentication/VerifyEmailController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Authentication\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Authentication;
 
-use App\Application\Http\Controllers\Controller;
+use App\Application\Http\Controllers\Application\Controller;
 use App\Application\Providers\RouteServiceProvider;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;

diff --git a/...Profile/Controllers/ProfileController.php → ...ackend/User/Profile/ProfileController.php b/...Profile/Controllers/ProfileController.php → ...ackend/User/Profile/ProfileController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Domain\User\Profile\Controllers;
+namespace App\Application\Http\Controllers\Backend\User\Profile;
 
-use App\Application\Http\Controllers\Controller;
-use App\Domain\User\Profile\Requests\ProfileUpdateRequest;
+use App\Application\Http\Controllers\Application\Controller;
+use App\Application\Http\Requests\User\Profile\ProfileUpdateRequest;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

diff --git a/app/Application/Http/Controllers/DashboardController.php b/app/Application/Http/Controllers/DashboardController.php
@@ -4,6 +4,7 @@
 
 namespace App\Application\Http\Controllers;
 
+use App\Application\Http\Controllers\Application\Controller;
 use Inertia\Inertia;
 use Inertia\Response;
 

diff --git a/app/Application/Http/Controllers/HomeController.php b/app/Application/Http/Controllers/HomeController.php
@@ -4,6 +4,7 @@
 
 namespace App\Application\Http\Controllers;
 
+use App\Application\Http\Controllers\Application\Controller;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
 use Inertia\Response;

diff --git a/.../Authentication/Requests/LoginRequest.php → ...ests/User/Authentication/LoginRequest.php b/.../Authentication/Requests/LoginRequest.php → ...ests/User/Authentication/LoginRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Requests;
+namespace App\Application\Http\Requests\User\Authentication;
 
 use Illuminate\Auth\Events\Lockout;
 use Illuminate\Foundation\Http\FormRequest;

diff --git a/...Profile/Requests/ProfileUpdateRequest.php → ...sts/User/Profile/ProfileUpdateRequest.php b/...Profile/Requests/ProfileUpdateRequest.php → ...sts/User/Profile/ProfileUpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Profile\Requests;
+namespace App\Application\Http\Requests\User\Profile;
 
 use App\Domain\User\User;
 use Illuminate\Foundation\Http\FormRequest;

diff --git a/app/Domain/User/User.php b/app/Domain/User/User.php
@@ -32,6 +32,7 @@ protected static function newFactory(): Factory
         'name',
         'email',
         'password',
+        'uuid'
     ];
 
     /**
@@ -42,6 +43,7 @@ protected static function newFactory(): Factory
     protected $hidden = [
         'password',
         'remember_token',
+        'uuid'
     ];
 
     /**

diff --git a/database/factories/Domain/Account/AccountFactory.php b/database/factories/Domain/Account/AccountFactory.php
@@ -4,8 +4,9 @@
 
 use App\Application\Infrastructure\Database\Factories\Traits\SupportProjections;
 use App\Domain\Account\Account;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
-class AccountFactory extends \Illuminate\Database\Eloquent\Factories\Factory
+class AccountFactory extends Factory
 {
     use SupportProjections;
 
@@ -17,9 +18,9 @@ class AccountFactory extends \Illuminate\Database\Eloquent\Factories\Factory
     public function definition(): array
     {
         return [
-            'uuid' => $this->faker->uuid(),
-            'name' => $this->faker->name(),
-            'balance' => $this->faker->randomFloat(2, 0, 1000000),
+            'uuid' => fake()->uuid(),
+            'name' => fake()->name(),
+            'balance' => fake()->randomFloat(2, 0, 1000000),
         ];
     }
 }
diff --git a/database/factories/Domain/User/UserFactory.php b/database/factories/Domain/User/UserFactory.php
@@ -16,7 +16,7 @@ class UserFactory extends Factory
     public function definition(): array
     {
         return [
-            'uuid' => $this->faker->uuid(),
+            'uuid' => fake()->uuid(),
             'name' => fake()->name(),
             'email' => fake()->unique()->safeEmail(),
             'email_verified_at' => now(),

diff --git a/phpunit.xml b/phpunit.xml
@@ -7,13 +7,9 @@
     <testsuites>
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
-            <directory suffix="Test.php">./app/Domain/**/Tests/Unit</directory>
-            <directory suffix="Test.php">./app/Domain/**/**/Tests/Unit</directory>
         </testsuite>
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>
-            <directory suffix="Test.php">./app/Domain/**/Tests/Feature</directory>
-            <directory suffix="Test.php">./app/Domain/**/**/Tests/Feature</directory>
         </testsuite>
     </testsuites>
     <source>

diff --git a/routes/auth.php b/routes/auth.php
@@ -2,15 +2,15 @@
 
 namespace App\Infrastructure\routes;
 
-use App\Domain\User\Authentication\Controllers\AuthenticatedSessionController;
-use App\Domain\User\Authentication\Controllers\ConfirmablePasswordController;
-use App\Domain\User\Authentication\Controllers\EmailVerificationNotificationController;
-use App\Domain\User\Authentication\Controllers\EmailVerificationPromptController;
-use App\Domain\User\Authentication\Controllers\NewPasswordController;
-use App\Domain\User\Authentication\Controllers\PasswordController;
-use App\Domain\User\Authentication\Controllers\PasswordResetLinkController;
-use App\Domain\User\Authentication\Controllers\RegisteredUserController;
-use App\Domain\User\Authentication\Controllers\VerifyEmailController;
+use App\Application\Http\Controllers\Backend\User\Authentication\AuthenticatedSessionController;
+use App\Application\Http\Controllers\Backend\User\Authentication\ConfirmablePasswordController;
+use App\Application\Http\Controllers\Backend\User\Authentication\EmailVerificationNotificationController;
+use App\Application\Http\Controllers\Backend\User\Authentication\EmailVerificationPromptController;
+use App\Application\Http\Controllers\Backend\User\Authentication\NewPasswordController;
+use App\Application\Http\Controllers\Backend\User\Authentication\PasswordController;
+use App\Application\Http\Controllers\Backend\User\Authentication\PasswordResetLinkController;
+use App\Application\Http\Controllers\Backend\User\Authentication\RegisteredUserController;
+use App\Application\Http\Controllers\Backend\User\Authentication\VerifyEmailController;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware('guest')->group(function () {

diff --git a/routes/web.php b/routes/web.php
@@ -2,10 +2,10 @@
 
 namespace App\Infrastructure\routes;
 
+use App\Application\Http\Controllers\Backend\Account\AccountController;
+use App\Application\Http\Controllers\Backend\User\Profile\ProfileController;
 use App\Application\Http\Controllers\DashboardController;
 use App\Application\Http\Controllers\HomeController;
-use App\Domain\Account\Controllers\AccountController;
-use App\Domain\User\Profile\Controllers\ProfileController;
 use Illuminate\Support\Facades\Route;
 
 /*

diff --git a/...tion/Tests/Feature/AuthenticationTest.php → ...ser/Authentication/AuthenticationTest.php b/...tion/Tests/Feature/AuthenticationTest.php → ...ser/Authentication/AuthenticationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Application\Providers\RouteServiceProvider;
 use App\Domain\User\User;

diff --git a/...n/Tests/Feature/EmailVerificationTest.php → .../Authentication/EmailVerificationTest.php b/...n/Tests/Feature/EmailVerificationTest.php → .../Authentication/EmailVerificationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Application\Providers\RouteServiceProvider;
 use App\Domain\User\User;

diff --git a/...ests/Feature/PasswordConfirmationTest.php → ...thentication/PasswordConfirmationTest.php b/...ests/Feature/PasswordConfirmationTest.php → ...thentication/PasswordConfirmationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Domain\User\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;

diff --git a/...ation/Tests/Feature/PasswordResetTest.php → ...User/Authentication/PasswordResetTest.php b/...ation/Tests/Feature/PasswordResetTest.php → ...User/Authentication/PasswordResetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Domain\User\User;
 use Illuminate\Auth\Notifications\ResetPassword;

diff --git a/...tion/Tests/Feature/PasswordUpdateTest.php → ...ser/Authentication/PasswordUpdateTest.php b/...tion/Tests/Feature/PasswordUpdateTest.php → ...ser/Authentication/PasswordUpdateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Domain\User\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;

diff --git a/...cation/Tests/Feature/RegistrationTest.php → .../User/Authentication/RegistrationTest.php b/...cation/Tests/Feature/RegistrationTest.php → .../User/Authentication/RegistrationTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Domain\User\Authentication\Tests\Feature;
+namespace Domain\User\Authentication;
 
 use App\Application\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Ramsey\Uuid\Uuid;
 use Tests\TestCase;
 
 class RegistrationTest extends TestCase

diff --git a/...ser/Profile/Tests/Feature/ProfileTest.php → ...ature/Domain/User/Profile/ProfileTest.php b/...ser/Profile/Tests/Feature/ProfileTest.php → ...ature/Domain/User/Profile/ProfileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Profile\Tests\Feature;
+namespace Domain\User\Profile;
 
 use App\Domain\User\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;