Merge pull request #136 from leroy-merlin-br/chore/configOptions-refi…

…nement chore: config options refinement
leroy-merlin-br · Oct 18, 2023 · ff4b769 · ff4b769
2 parents c1a0490 + 5b7bb45
commit ff4b769
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 311 deletions.
diff --git a/src/AbstractConfigManager.php b/src/AbstractConfigManager.php
diff --git a/src/Connectors/Consumer/Config.php b/src/Connectors/Consumer/Config.php
@@ -91,19 +91,11 @@ private function getTopicConfig(string $configName, string $topicId): array
             throw new ConfigurationException("Topic '{$topicId}' not found");
         }
 
-        $topicConfig['middlewares'] = $this->getMiddlewares(
-            $configName,
-            $topicConfig
+        $topicConfig['middlewares'] = config(
+            'kafka.middlewares.consumer',
+            []
         );
 
         return $topicConfig;
     }
-
-    private function getMiddlewares(string $configName, array $topicConfig): array
-    {
-        return array_merge(
-            config($configName . '.middlewares.consumer', []),
-            $topicConfig['consumer']['middlewares'] ?? []
-        );
-    }
 }
diff --git a/src/Connectors/Producer/Config.php b/src/Connectors/Producer/Config.php
@@ -2,11 +2,7 @@
 
 namespace Metamorphosis\Connectors\Producer;
 
-use Metamorphosis\AbstractConfigManager;
 use Metamorphosis\Connectors\AbstractConfig;
-use Metamorphosis\Exceptions\ConfigurationException;
-use Metamorphosis\ProducerConfigManager;
-use Metamorphosis\TopicHandler\ConfigOptions\Producer as ProducerConfigOptions;
 
 class Config extends AbstractConfig
 {
@@ -38,43 +34,4 @@ class Config extends AbstractConfig
         'partition' => RD_KAFKA_PARTITION_UA,
         'ssl_verify' => false,
     ];
-
-    public function make(ProducerConfigOptions $configOptions): AbstractConfigManager
-    {
-        $configManager = app(ProducerConfigManager::class);
-        $configManager->set($configOptions->toArray());
-
-        return $configManager;
-    }
-
-    public function makeByTopic(string $topicId): AbstractConfigManager
-    {
-        $topicConfig = $this->getTopicConfig($topicId);
-        $topicConfig['middlewares'] = $topicConfig['producer']['middlewares'] ?? [];
-        $brokerConfig = $this->getBrokerConfig('service');
-        $schemaConfig = $this->getSchemaConfig('service');
-        $config = array_merge($topicConfig, $brokerConfig, $schemaConfig);
-
-        $this->validate($config);
-        $config = array_merge($this->default, $config);
-
-        $configManager = app(ProducerConfigManager::class);
-        $configManager->set($config);
-
-        return $configManager;
-    }
-
-    private function getTopicConfig(string $topicId): array
-    {
-        $topicConfig = array_merge(
-            config('kafka.topics.' . $topicId, []),
-            config('kafka.topics.' . $topicId . '.producer', [])
-        );
-        if (!$topicConfig) {
-            throw new ConfigurationException("Topic '{$topicId}' not found");
-        }
-        $topicConfig['topic'] = $topicId;
-
-        return $topicConfig;
-    }
 }
diff --git a/src/Producer.php b/src/Producer.php
@@ -8,7 +8,6 @@
 use Metamorphosis\Middlewares\Handler\Producer as ProducerMiddleware;
 use Metamorphosis\Producer\Poll;
 use Metamorphosis\TopicHandler\ConfigOptions\Producer as ProducerConfigOptions;
-use Metamorphosis\TopicHandler\Producer\AbstractProducer;
 use Metamorphosis\TopicHandler\Producer\HandlerInterface;
 
 class Producer
@@ -73,13 +72,4 @@ public function getProducerMiddleware(
             compact('topic', 'poll', 'partition')
         );
     }
-
-    private function getConfigManager(HandlerInterface $producerHandler): AbstractConfigManager
-    {
-        if ($producerHandler instanceof AbstractProducer) {
-            return $this->config->make($producerHandler->getConfigOptions());
-        }
-
-        return $this->config->makeByTopic($producerHandler->getTopic());
-    }
 }
diff --git a/src/ProducerConfigManager.php b/src/ProducerConfigManager.php
diff --git a/src/TopicHandler/ConfigOptions/Consumer.php b/src/TopicHandler/ConfigOptions/Consumer.php
@@ -138,7 +138,7 @@ public function toArray(): array
             'auto_commit' => $this->isAutoCommit(),
             'commit_async' => $this->isCommitASync(),
             'offset_reset' => $this->getOffsetReset(),
-            'max_poll_interval' => $this->getMaxPollInterval(),
+            'max_poll_interval_ms' => $this->getMaxPollInterval(),
         ];
 
         if ($avroSchema = $this->getAvroSchema()) {

diff --git a/tests/Unit/Connectors/Producer/ConfigTest.php b/tests/Unit/Connectors/Producer/ConfigTest.php
diff --git a/tests/Unit/ConsumerConfigManagerTest.php b/tests/Unit/ConsumerConfigManagerTest.php
diff --git a/tests/Unit/ManagerTest.php b/tests/Unit/ManagerTest.php
diff --git a/tests/Unit/ProducerConfigManagerTest.php b/tests/Unit/ProducerConfigManagerTest.php
diff --git a/tests/Unit/TopicHandler/ConfigOptions/ConsumerTest.php b/tests/Unit/TopicHandler/ConfigOptions/ConsumerTest.php
@@ -25,7 +25,7 @@ public function testShouldConvertConfigOptionsToArray(): void
             [],
             200,
             false,
-            true
+            true,
         );
 
         $expected = [
@@ -41,6 +41,7 @@ public function testShouldConvertConfigOptionsToArray(): void
             'auto_commit' => false,
             'commit_async' => true,
             'offset_reset' => 'smallest',
+            'max_poll_interval_ms' => 300000,
         ];
 
         // Actions

diff --git a/tests/Unit/TopicHandler/ConfigOptions/Factories/ConsumerFactoryTest.php b/tests/Unit/TopicHandler/ConfigOptions/Factories/ConsumerFactoryTest.php
@@ -72,6 +72,7 @@ public function testShouldMakeConfigOptionWithAvroSchema(): void
             'auto_commit' => true,
             'commit_async' => true,
             'offset_reset' => 'earliest',
+            'max_poll_interval_ms' => 300000,
         ];
         // Actions
         $result = ConsumerFactory::make(