refactoring rabbitmq connection

danuiachimovschi · danuiachimovschi · commit dccfaa84ad84 · 2025-02-06T00:36:19.000+02:00
diff --git a/config/services.yaml b/config/services.yaml
@@ -24,6 +24,14 @@ services:
         shared: true
 
     App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface: '@App\Infrastructure\Rabbitmq\RabbitmqConnection'
+
     App\Infrastructure\Rabbitmq\RabbitmqConnection:
         public: true
         shared: true
+        arguments:
+            - '@rabbitmq.connection'
+
+    rabbitmq.connection:
+        class: PhpAmqpLib\Connection\AMQPStreamConnection
+        factory: [ 'App\Infrastructure\Rabbitmq\RabbitmqConnectionFactory', 'createConnection' ]
+        shared: true
diff --git a/src/Infrastructure/Rabbitmq/Consumer/DirectConsumerCommand.php b/src/Infrastructure/Rabbitmq/Consumer/DirectConsumerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Consumer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,7 +21,7 @@ class DirectConsumerCommand extends Command
     private const EXCHANGE_NAME = 'e.direct';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         ?string $name = null)
     {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Consumer/FanoutConsumerCommand.php b/src/Infrastructure/Rabbitmq/Consumer/FanoutConsumerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Consumer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,7 +21,7 @@ class FanoutConsumerCommand extends Command
     private const QUEUE_NAME = 'q.events-fanout.1';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         ?string $name = null)
     {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Consumer/HeaderConsumerCommand.php b/src/Infrastructure/Rabbitmq/Consumer/HeaderConsumerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Consumer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use PhpAmqpLib\Wire\AMQPTable;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -22,7 +22,7 @@ class HeaderConsumerCommand extends Command
     private const QUEUE_NAME = 'q.events-header';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         ?string $name = null)
     {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Consumer/SecondFanoutConsumerCommand.php b/src/Infrastructure/Rabbitmq/Consumer/SecondFanoutConsumerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Consumer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,7 +21,7 @@ class SecondFanoutConsumerCommand extends Command
     private const QUEUE_NAME = 'q.events-fanout.2';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         ?string $name = null)
     {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Consumer/TopicConsumerCommand.php b/src/Infrastructure/Rabbitmq/Consumer/TopicConsumerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Consumer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,7 +21,7 @@ class TopicConsumerCommand extends Command
     private const QUEUE_NAME = 'q.events-topic';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         ?string $name = null)
     {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Producer/DirectProducerCommand.php b/src/Infrastructure/Rabbitmq/Producer/DirectProducerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Producer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use PhpAmqpLib\Message\AMQPMessage;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -21,7 +21,7 @@ class DirectProducerCommand extends Command
     private const EXCHANGE_NAME = 'e.direct';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         string $name = null
     ) {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Producer/FanoutProducerCommand.php b/src/Infrastructure/Rabbitmq/Producer/FanoutProducerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Producer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use PhpAmqpLib\Message\AMQPMessage;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -21,7 +21,7 @@ class FanoutProducerCommand extends Command
     private const EXCHANGE_NAME = 'e.fanout';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         string $name = null
     ) {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Producer/HeaderProducerCommand.php b/src/Infrastructure/Rabbitmq/Producer/HeaderProducerCommand.php
@@ -5,6 +5,7 @@
 namespace App\Infrastructure\Rabbitmq\Producer;
 
 use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use PhpAmqpLib\Message\AMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -22,7 +23,7 @@ class HeaderProducerCommand extends Command
     private const EXCHANGE_NAME = 'e.header';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         string $name = null
     ) {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/Producer/TopicProducerCommand.php b/src/Infrastructure/Rabbitmq/Producer/TopicProducerCommand.php
@@ -4,7 +4,7 @@
 
 namespace App\Infrastructure\Rabbitmq\Producer;
 
-use App\Infrastructure\Rabbitmq\RabbitmqConnection;
+use App\Infrastructure\Rabbitmq\RabbitmqConnectionInterface;
 use PhpAmqpLib\Message\AMQPMessage;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -21,7 +21,7 @@ class TopicProducerCommand  extends Command
     private const EXCHANGE_NAME = 'e.topic';
 
     public function __construct(
-        protected readonly RabbitmqConnection $rabbitmqConnection,
+        protected readonly RabbitmqConnectionInterface $rabbitmqConnection,
         string $name = null
     ) {
         parent::__construct($name);
diff --git a/src/Infrastructure/Rabbitmq/RabbitmqConnection.php b/src/Infrastructure/Rabbitmq/RabbitmqConnection.php
@@ -10,25 +10,13 @@ class RabbitmqConnection implements RabbitmqConnectionInterface
 {
     private AMQPStreamConnection $connection;
 
-    public function __construct()
+    public function __construct(AMQPStreamConnection $connection)
     {
-        $this->connection = new AMQPStreamConnection('rabbitmq', 5672, 'guest', 'guest');
+        $this->connection = $connection;
     }
 
     public function getConnection(): AMQPStreamConnection
     {
         return $this->connection;
     }
-
-    private function __clone(): void
-    {
-    }
-
-    public function __wakeup(): void
-    {
-    }
-
-    public function __destruct()
-    {
-    }
 }
diff --git a/src/Infrastructure/Rabbitmq/RabbitmqConnectionFactory.php b/src/Infrastructure/Rabbitmq/RabbitmqConnectionFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Infrastructure\Rabbitmq;
+
+use PhpAmqpLib\Connection\AMQPStreamConnection;
+
+class RabbitmqConnectionFactory
+{
+    private static ?AMQPStreamConnection $connection = null;
+
+    public static function createConnection(): AMQPStreamConnection
+    {
+        if (self::$connection === null) {
+            self::$connection = new AMQPStreamConnection('rabbitmq', 5672, 'guest', 'guest');
+        }
+
+        return self::$connection;
+    }
+}
