Vertical Slice Architecture refactoring

samuelgfeller · samuelgfeller · commit 7ccfbcbbcacc · 2025-01-27T17:38:51.000+01:00
diff --git a/config/routes.php b/config/routes.php
@@ -7,7 +7,7 @@
     $app->redirect('/', 'frontend/home.html', 301)->setName('home-page');
 
     // Fetch user list
-    $app->get('/users', \App\Application\Action\User\UserFetchListAction::class)->setName('user-list');
+    $app->get('/users', \App\Module\User\List\Action\UserFetchListAction::class)->setName('user-list');
     // Create user
-    $app->post('/users', \App\Application\Action\User\UserCreateAction::class)->setName('user-create');
+    $app->post('/users', \App\Module\User\Create\Action\UserCreateAction::class)->setName('user-create');
 };
diff --git a/phpunit.xml b/phpunit.xml
@@ -4,11 +4,8 @@
          backupStaticProperties="false">
     <coverage/>
     <testsuites>
-        <testsuite name="Integration">
-            <directory suffix="Test.php">tests/Integration</directory>
-        </testsuite>
         <testsuite name="Unit">
-            <directory suffix="Test.php">tests/Unit</directory>
+            <directory suffix="Test.php">tests/TestCase</directory>
         </testsuite>
     </testsuites>
     <php>
diff --git a/src/Application/Middleware/ValidationExceptionMiddleware.php b/src/Application/Middleware/ValidationExceptionMiddleware.php
@@ -3,7 +3,7 @@
 namespace App\Application\Middleware;
 
 use App\Application\Responder\JsonResponder;
-use App\Domain\Exception\ValidationException;
+use App\Module\Validation\Exception\ValidationException;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Domain/empty b/src/Domain/empty
diff --git a/src/Module/User/Create/Action/UserCreateAction.php b/src/Module/User/Create/Action/UserCreateAction.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Application\Action\User;
+namespace App\Module\User\Create\Action;
 
-use App\Domain\User\Service\UserCreator;
+use App\Module\User\Create\Service\UserCreator;
 use Fig\Http\Message\StatusCodeInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Module/User/Create/Repository/UserCreatorRepository.php b/src/Module/User/Create/Repository/UserCreatorRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Repository;
+namespace App\Module\User\Create\Repository;
 
 use Cake\Database\Connection;
 
diff --git a/src/Module/User/Create/Service/UserCreator.php b/src/Module/User/Create/Service/UserCreator.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Domain\User\Service;
+namespace App\Module\User\Create\Service;
 
-use App\Domain\User\Data\UserData;
-use App\Domain\User\Repository\UserCreatorRepository;
+use App\Module\User\Create\Repository\UserCreatorRepository;
+use App\Module\User\Data\UserData;
+use App\Module\User\Validation\Service\UserValidator;
 
 final readonly class UserCreator
 {
diff --git a/src/Module/User/Data/UserData.php b/src/Module/User/Data/UserData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\User\Data;
+namespace App\Module\User\Data;
 
 class UserData implements \JsonSerializable
 {
diff --git a/src/Module/User/List/Action/UserFetchListAction.php b/src/Module/User/List/Action/UserFetchListAction.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Application\Action\User;
+namespace App\Module\User\List\Action;
 
 use App\Application\Responder\JsonResponder;
-use App\Domain\User\Service\UserFinder;
+use App\Module\User\List\Service\UserListFinder;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 final readonly class UserFetchListAction
 {
     public function __construct(
         private JsonResponder $jsonResponder,
-        private UserFinder $userFinder,
+        private UserListFinder $userFinder,
     ) {
     }
 
diff --git a/src/Module/User/List/Repository/UserFindListRepository.php b/src/Module/User/List/Repository/UserFindListRepository.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Domain\User\Repository;
+namespace App\Module\User\List\Repository;
 
-use App\Domain\User\Data\UserData;
 use App\Infrastructure\Utility\Hydrator;
+use App\Module\User\Data\UserData;
 use Cake\Database\Connection;
 
-final readonly class UserFinderRepository
+final readonly class UserFindListRepository
 {
     public function __construct(
         private Connection $connection,
diff --git a/src/Module/User/List/Service/UserListFinder.php b/src/Module/User/List/Service/UserListFinder.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domain\User\Service;
+namespace App\Module\User\List\Service;
 
-use App\Domain\User\Data\UserData;
-use App\Domain\User\Repository\UserFinderRepository;
+use App\Module\User\Data\UserData;
+use App\Module\User\List\Repository\UserFindListRepository;
 
-final readonly class UserFinder
+final readonly class UserListFinder
 {
     public function __construct(
-        private UserFinderRepository $userFinderRepository,
+        private UserFindListRepository $userFinderRepository,
     ) {
     }
 
diff --git a/src/Module/User/Validation/Service/UserValidator.php b/src/Module/User/Validation/Service/UserValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Domain\User\Service;
+namespace App\Module\User\Validation\Service;
 
-use App\Domain\Exception\ValidationException;
+use App\Module\Validation\Exception\ValidationException;
 use Cake\Validation\Validator;
 
 /**
diff --git a/src/Module/Validation/Exception/ValidationException.php b/src/Module/Validation/Exception/ValidationException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Domain\Exception;
+namespace App\Module\Validation\Exception;
 
 use RuntimeException;
 
diff --git a/src/Module/module-architecture.md b/src/Module/module-architecture.md
@@ -0,0 +1 @@
+Documentation: [How to organize modules](https://samuel-gfeller.ch/docs/Architecture#loosely-coupled-modules)
diff --git a/tests/TestCase/Api/CorsMiddlewareTest.php b/tests/TestCase/Api/CorsMiddlewareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Api;
+namespace App\Test\TestCase\Api;
 
 use App\Test\Trait\AppTestTrait;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/TestCase/User/Create/UserCreateActionTest.php b/tests/TestCase/User/Create/UserCreateActionTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Test\Integration\User;
+namespace App\Test\TestCase\User\Create;
 
+use App\Test\TestCase\User\Create;
 use App\Test\Trait\AppTestTrait;
 use Fig\Http\Message\StatusCodeInterface;
 use PHPUnit\Framework\Attributes\DataProviderExternal;
@@ -45,7 +46,7 @@ public function testUserCreateAction(): void
      * @param array<string, string> $requestBody data containing invalid user create request data
      * @param array<string, string|array<string|int, mixed>> $expectedJsonResponse expected json response
      */
-    #[DataProviderExternal(\App\Test\Provider\User\UserCreateProvider::class, 'invalidUserCreateCases')]
+    #[DataProviderExternal(Create\UserCreateProvider::class, 'invalidUserCreateCases')]
     public function testUserCreateActionInvalid(array $requestBody, array $expectedJsonResponse): void
     {
         // Make request
diff --git a/tests/TestCase/User/Create/UserCreateProvider.php b/tests/TestCase/User/Create/UserCreateProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Test\Provider\User;
+namespace App\Test\TestCase\User\Create;
 
 class UserCreateProvider
 {
diff --git a/tests/TestCase/User/List/UserFetchListActionTest.php b/tests/TestCase/User/List/UserFetchListActionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Test\Integration\User;
+namespace App\Test\TestCase\User\List;
 
 use App\Test\Fixture\UserFixture;
 use App\Test\Trait\AppTestTrait;
diff --git a/tests/Trait/AppTestTrait.php b/tests/Trait/AppTestTrait.php
@@ -10,7 +10,7 @@
 
 /**
  * Initialize slim app for testing.
- * Test setup documentation: https://samuel-gfeller.ch/docs/Writing-Tests#setup
+ * Test setup documentation: https://samuel-gfeller.ch/docs/Test-Setup
  * Traits "extend" the class that include them with their content (via "use TraitName;").
  */
 trait AppTestTrait
diff --git a/tests/Unit/doc.md b/tests/Unit/doc.md
diff --git a/tests/docs.md b/tests/docs.md
@@ -0,0 +1,5 @@
+# Documentation:   
+* [Unit vs Integration](https://samuel-gfeller.ch/docs/Unit-vs-Integration-Testing)
+* [Test setup](https://samuel-gfeller.ch/docs/Test-Setup)
+* [Writing Tests](https://samuel-gfeller.ch/docs/Writing-Tests)
+* [Test Examples](https://samuel-gfeller.ch/docs/Test-Examples)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace App\Domain\User\Data;`
	`3`	`+namespace App\Module\User\Data;`
`4`	`4`
`5`	`5`	`class UserData implements \JsonSerializable`
`6`	`6`	`{`