Remove redundant abstractions

config/chat/services/chat.yml

@@ -1,8 +1,4 @@
 services:
-    chat.chat-controller:
-        class: Gaming\Chat\Presentation\Http\ChatController
-        arguments: ['@chat.command-bus', '@chat.query-bus']
-
     chat.chat-gateway:
         class: Gaming\Chat\Infrastructure\DoctrineChatGateway
         arguments: ['@chat.doctrine-dbal', 'chat', 'message']

config/connect-four/services/game.yml

@@ -1,8 +1,4 @@
 services:
-    connect-four.game-controller:
-        class: Gaming\ConnectFour\Port\Adapter\Http\GameController
-        arguments: ['@connect-four.command-bus', '@connect-four.query-bus']
-
     connect-four.game-repository:
         class: Gaming\ConnectFour\Port\Adapter\Persistence\Repository\DoctrineJsonGameRepository
         arguments:

config/identity/services/user.yml

@@ -1,8 +1,4 @@
 services:
-    identity.user-controller:
-        class: Gaming\Identity\Port\Adapter\Http\UserController
-        arguments: ['@identity.command-bus']
-
     identity.user-repository:
         class: Gaming\Identity\Port\Adapter\Persistence\Repository\DoctrineUserRepository
         arguments: ['@identity.doctrine-orm']

config/web-interface/services/console.yml

@@ -1,6 +1,6 @@
 services:
     Gaming\WebInterface\Presentation\Console\PublishRunningGamesCountToNchanCommand:
-        arguments: ['@web-interface.connect-four-service', '@web-interface.browser-notifier']
+        arguments: ['@connect-four.query-bus', '@web-interface.browser-notifier']
         tags:
             -   name: console.command
                 command: web-interface:publish-running-games-count-to-nchan

config/web-interface/services/controller.yml

@@ -1,15 +1,15 @@
 services:
     web-interface.page-controller:
         class: Gaming\WebInterface\Presentation\Http\PageController
-        arguments: ['@twig', '@web-interface.connect-four-service', '@web-interface.security']
+        arguments: ['@twig', '@connect-four.query-bus', '@web-interface.security']
         tags: ['controller.service_arguments']
 
     web-interface.signup-controller:
         class: Gaming\WebInterface\Presentation\Http\SignupController
         arguments:
             - '@uri_signer'
             - '@web-interface.security'
-            - '@web-interface.identity-service'
+            - '@identity.command-bus'
             - '@gaming.form-violation-mapper'
         calls: [[setContainer, ['@Psr\Container\ContainerInterface']]]
         tags: ['controller.service_arguments', 'container.service_subscriber']
@@ -28,10 +28,10 @@ services:
 
     web-interface.chat-controller:
         class: Gaming\WebInterface\Presentation\Http\ChatController
-        arguments: ['@web-interface.chat-service', '@web-interface.security']
+        arguments: ['@chat.command-bus', '@chat.query-bus', '@web-interface.security']
         tags: ['controller.service_arguments']
 
     web-interface.connect-four-controller:
         class: Gaming\WebInterface\Presentation\Http\ConnectFourController
-        arguments: ['@web-interface.connect-four-service', '@web-interface.security']
+        arguments: ['@connect-four.command-bus', '@web-interface.security']
         tags: ['controller.service_arguments']

config/web-interface/services/integration.yml

@@ -1,16 +1,4 @@
 services:
-    web-interface.chat-service:
-        class: Gaming\WebInterface\Infrastructure\Integration\DirectControllerInvocationChatService
-        arguments: ['@chat.chat-controller']
-
-    web-interface.connect-four-service:
-        class: Gaming\WebInterface\Infrastructure\Integration\DirectControllerInvocationConnectFourService
-        arguments: ['@connect-four.game-controller']
-
-    web-interface.identity-service:
-        class: Gaming\WebInterface\Infrastructure\Integration\DirectControllerInvocationIdentityService
-        arguments: ['@identity.user-controller']
-
     web-interface.nchan:
         class: Marein\Nchan\Nchan
         arguments:

config/web-interface/services/security.yml

@@ -9,4 +9,4 @@ services:
 
     web-interface.security.arrival_authenticator:
         class: Gaming\WebInterface\Infrastructure\Security\ArrivalAuthenticator
-        arguments: ['@web-interface.identity-service', '@security.token_storage']
+        arguments: ['@identity.command-bus', '@security.token_storage']

src/ConnectFour/Application/Game/Query/Model/Game/Game.php

@@ -56,6 +56,11 @@ public function id(): string
         return $this->gameId;
     }
 
+    public function chatId(): string
+    {
+        return $this->chatId;
+    }
+
     public function finished(): bool
     {
         return $this->finished;

src/ConnectFour/Application/Game/Query/Model/OpenGames/OpenGame.php

@@ -6,23 +6,9 @@
 
 final class OpenGame
 {
-    private string $gameId;
-
-    private string $playerId;
-
-    public function __construct(string $gameId, string $playerId)
-    {
-        $this->gameId = $gameId;
-        $this->playerId = $playerId;
-    }
-
-    public function gameId(): string
-    {
-        return $this->gameId;
-    }
-
-    public function playerId(): string
-    {
-        return $this->playerId;
+    public function __construct(
+        public readonly string $gameId,
+        public readonly string $playerId
+    ) {
     }
 }

src/ConnectFour/Port/Adapter/Persistence/Repository/PredisOpenGameStore.php

@@ -23,11 +23,11 @@ public function __construct(
     public function save(OpenGame $openGame): void
     {
         $this->predis->pipeline(function (ClientContextInterface $pipeline) use ($openGame): void {
-            $pipeline->set($this->storageKeyForGameInfo($openGame->gameId()), $openGame->playerId());
+            $pipeline->set($this->storageKeyForGameInfo($openGame->gameId), $openGame->playerId);
 
             $pipeline->zadd(
                 $this->storageKey,
-                [$openGame->gameId() => microtime(true)]
+                [$openGame->gameId => microtime(true)]
             );
         });
     }