From 3fddcaa52ff1537e4c3056aa04e822899d40befa Mon Sep 17 00:00:00 2001
From: msantisteban <m.santisteban@gammasoftware.fr>
Date: Mon, 1 Sep 2025 11:40:37 +0200
Subject: [PATCH] feat: elastic bridge - interfaces

add ElasticsearchClientInterface & ElasticsearchServiceInterface
---
 .../Elasticsearch/ElasticsearchClient.php      |  2 +-
 .../ElasticsearchClientInterface.php           | 10 ++++++++++
 .../Elasticsearch/ElasticsearchService.php     |  9 ++++++---
 .../ElasticsearchServiceInterface.php          | 18 ++++++++++++++++++
 .../Index/ElasticsearchIndexFactory.php        |  9 ++++++---
 src/DataProcessor/ActivityLogProcessor.php     |  4 ++--
 src/DataProvider/ActivityLogProvider.php       |  4 ++--
 .../CurrentDataTrackerProvider.php             |  8 +++++---
 .../PopulateCurrentDataTrackersHandler.php     | 11 ++++++++---
 src/Resources/config/elastic.yaml              |  8 +++++++-
 src/Resources/config/logger.yaml               |  2 +-
 src/Resources/config/message_handlers.yaml     |  2 +-
 12 files changed, 67 insertions(+), 20 deletions(-)
 create mode 100644 src/Bridge/Elasticsearch/ElasticsearchClientInterface.php
 create mode 100644 src/Bridge/Elasticsearch/ElasticsearchServiceInterface.php

diff --git a/src/Bridge/Elasticsearch/ElasticsearchClient.php b/src/Bridge/Elasticsearch/ElasticsearchClient.php
index 05a9ed8..eda9adb 100644
--- a/src/Bridge/Elasticsearch/ElasticsearchClient.php
+++ b/src/Bridge/Elasticsearch/ElasticsearchClient.php
@@ -5,7 +5,7 @@
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
 
-final class ElasticsearchClient
+final class ElasticsearchClient implements ElasticsearchClientInterface
 {
     public function __construct(private readonly string $activityLogElasticHost)
     {
diff --git a/src/Bridge/Elasticsearch/ElasticsearchClientInterface.php b/src/Bridge/Elasticsearch/ElasticsearchClientInterface.php
new file mode 100644
index 0000000..6ce6bc9
--- /dev/null
+++ b/src/Bridge/Elasticsearch/ElasticsearchClientInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Locastic\Loggastic\Bridge\Elasticsearch;
+
+use Elasticsearch\Client;
+
+interface ElasticsearchClientInterface
+{
+    public function getClient(): Client;
+}
diff --git a/src/Bridge/Elasticsearch/ElasticsearchService.php b/src/Bridge/Elasticsearch/ElasticsearchService.php
index 9bf6cab..7be223d 100644
--- a/src/Bridge/Elasticsearch/ElasticsearchService.php
+++ b/src/Bridge/Elasticsearch/ElasticsearchService.php
@@ -7,12 +7,15 @@
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
-final class ElasticsearchService
+final class ElasticsearchService implements ElasticsearchServiceInterface
 {
     use ElasticNormalizationContextTrait;
 
-    public function __construct(private readonly ElasticsearchClient $elasticsearchClient, private readonly NormalizerInterface $normalizer, private readonly DenormalizerInterface $denormalizer)
-    {
+    public function __construct(
+        private readonly ElasticsearchClientInterface $elasticsearchClient,
+        private readonly NormalizerInterface $normalizer,
+        private readonly DenormalizerInterface $denormalizer
+    ) {
     }
 
     public function createItem($item, string $index, array $groups = []): void
diff --git a/src/Bridge/Elasticsearch/ElasticsearchServiceInterface.php b/src/Bridge/Elasticsearch/ElasticsearchServiceInterface.php
new file mode 100644
index 0000000..a44c48b
--- /dev/null
+++ b/src/Bridge/Elasticsearch/ElasticsearchServiceInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Locastic\Loggastic\Bridge\Elasticsearch;
+
+interface ElasticsearchServiceInterface
+{
+    public function createItem($item, string $index, array $groups = []): void;
+
+    public function bulkCreate(array $items, string $index, array $groups = []): void;
+
+    public function getItemById($id, string $index, string $denormalizeToClass): mixed;
+
+    public function getItemByQuery(string $index, string $denormalizeToClass, array $body = []): mixed;
+
+    public function updateItem($id, $item, string $index, array $groups = []): void;
+
+    public function getCollection(string $index, string $denormalizeToClass, array $body = [], $limit = 20, $offset = 0): array;
+}
diff --git a/src/Bridge/Elasticsearch/Index/ElasticsearchIndexFactory.php b/src/Bridge/Elasticsearch/Index/ElasticsearchIndexFactory.php
index 550bdfe..210205c 100644
--- a/src/Bridge/Elasticsearch/Index/ElasticsearchIndexFactory.php
+++ b/src/Bridge/Elasticsearch/Index/ElasticsearchIndexFactory.php
@@ -3,12 +3,15 @@
 namespace Locastic\Loggastic\Bridge\Elasticsearch\Index;
 
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface;
-use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClient;
+use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClientInterface;
 
 final class ElasticsearchIndexFactory implements ElasticsearchIndexFactoryInterface
 {
-    public function __construct(private readonly ElasticsearchClient $elasticsearchClient, private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory, private readonly ElasticsearchIndexConfigurationInterface $elasticsearchIndexConfiguration)
-    {
+    public function __construct(
+        private readonly ElasticsearchClientInterface $elasticsearchClient,
+        private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory,
+        private readonly ElasticsearchIndexConfigurationInterface $elasticsearchIndexConfiguration
+    ) {
     }
 
     public function recreateActivityLogIndex(string $className): void
diff --git a/src/DataProcessor/ActivityLogProcessor.php b/src/DataProcessor/ActivityLogProcessor.php
index 64251fa..5cc775d 100644
--- a/src/DataProcessor/ActivityLogProcessor.php
+++ b/src/DataProcessor/ActivityLogProcessor.php
@@ -4,7 +4,7 @@
 
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface;
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\Traits\ElasticNormalizationContextTrait;
-use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService;
+use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface;
 use Locastic\Loggastic\Factory\ActivityLogInputFactoryInterface;
 use Locastic\Loggastic\Factory\CurrentDataTrackerInputFactoryInterface;
 use Locastic\Loggastic\Message\CreateActivityLogMessageInterface;
@@ -22,7 +22,7 @@ final class ActivityLogProcessor implements ActivityLogProcessorInterface
     public function __construct(
         private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory,
         private readonly NormalizerInterface $objectNormalizer,
-        private readonly ElasticsearchService $elasticService,
+        private readonly ElasticsearchServiceInterface $elasticService,
         private readonly ActivityLogInputFactoryInterface $activityLogInputFactory,
         private readonly CurrentDataTrackerInputFactoryInterface $currentDataTrackerInputFactory,
         private readonly LoggableContextFactoryInterface $loggableContextFactory
diff --git a/src/DataProvider/ActivityLogProvider.php b/src/DataProvider/ActivityLogProvider.php
index e792060..a1fed06 100644
--- a/src/DataProvider/ActivityLogProvider.php
+++ b/src/DataProvider/ActivityLogProvider.php
@@ -3,14 +3,14 @@
 namespace Locastic\Loggastic\DataProvider;
 
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface;
-use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService;
+use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface;
 use Locastic\Loggastic\Model\Output\ActivityLog;
 use Locastic\Loggastic\Model\Output\CurrentDataTracker;
 
 final class ActivityLogProvider implements ActivityLogProviderInterface
 {
     public function __construct(
-        private readonly ElasticsearchService $elasticsearchService,
+        private readonly ElasticsearchServiceInterface $elasticsearchService,
         private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory
     ) { }
 
diff --git a/src/DataProvider/CurrentDataTrackerProvider.php b/src/DataProvider/CurrentDataTrackerProvider.php
index df5c5a6..bd8319b 100644
--- a/src/DataProvider/CurrentDataTrackerProvider.php
+++ b/src/DataProvider/CurrentDataTrackerProvider.php
@@ -3,14 +3,16 @@
 namespace Locastic\Loggastic\DataProvider;
 
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface;
-use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService;
+use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface;
 use Locastic\Loggastic\Model\Output\CurrentDataTracker;
 use Locastic\Loggastic\Model\Output\CurrentDataTrackerInterface;
 
 final class CurrentDataTrackerProvider implements CurrentDataTrackerProviderInterface
 {
-    public function __construct(private readonly ElasticsearchService $elasticsearchService, private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory)
-    {
+    public function __construct(
+        private readonly ElasticsearchServiceInterface $elasticsearchService,
+        private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory
+    ) {
     }
 
     public function getCurrentDataTrackerByClassAndId(string $className, $objectId): ?CurrentDataTrackerInterface
diff --git a/src/MessageHandler/PopulateCurrentDataTrackersHandler.php b/src/MessageHandler/PopulateCurrentDataTrackersHandler.php
index 0206feb..956b5a6 100644
--- a/src/MessageHandler/PopulateCurrentDataTrackersHandler.php
+++ b/src/MessageHandler/PopulateCurrentDataTrackersHandler.php
@@ -5,7 +5,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface;
 use Locastic\Loggastic\Bridge\Elasticsearch\Context\Traits\ElasticNormalizationContextTrait;
-use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService;
+use Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface;
 use Locastic\Loggastic\Factory\CurrentDataTrackerInputFactoryInterface;
 use Locastic\Loggastic\Message\PopulateCurrentDataTrackersMessage;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -16,8 +16,13 @@ final class PopulateCurrentDataTrackersHandler
 {
     use ElasticNormalizationContextTrait;
 
-    public function __construct(private readonly ManagerRegistry $managerRegistry, private readonly CurrentDataTrackerInputFactoryInterface $currentDataTrackerInputFactory, private readonly NormalizerInterface $objectNormalizer, private readonly ElasticsearchService $elasticService, private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory)
-    {
+    public function __construct(
+        private readonly ManagerRegistry $managerRegistry,
+        private readonly CurrentDataTrackerInputFactoryInterface $currentDataTrackerInputFactory,
+        private readonly NormalizerInterface $objectNormalizer,
+        private readonly ElasticsearchServiceInterface $elasticService,
+        private readonly ElasticsearchContextFactoryInterface $elasticsearchContextFactory
+    ) {
     }
 
     public function __invoke(PopulateCurrentDataTrackersMessage $message): void
diff --git a/src/Resources/config/elastic.yaml b/src/Resources/config/elastic.yaml
index a9161b4..0d0ca3c 100644
--- a/src/Resources/config/elastic.yaml
+++ b/src/Resources/config/elastic.yaml
@@ -1,11 +1,17 @@
 services:
+    Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClientInterface:
+        alias: 'Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClient'
+
     Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClient:
         arguments:
             $activityLogElasticHost: '%locastic_activity_log.elasticsearch_host%'
 
+    Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface:
+        alias: 'Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService'
+
     Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService:
         arguments:
-            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClient'
+            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchClientInterface'
             - '@serializer.normalizer.object'
             - '@serializer'
 
diff --git a/src/Resources/config/logger.yaml b/src/Resources/config/logger.yaml
index ffc97d0..2d5bad6 100644
--- a/src/Resources/config/logger.yaml
+++ b/src/Resources/config/logger.yaml
@@ -26,7 +26,7 @@ services:
         arguments:
             - '@Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface'
             - '@serializer.normalizer.object'
-            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService'
+            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface'
             - '@Locastic\Loggastic\Factory\ActivityLogInputFactoryInterface'
             - '@Locastic\Loggastic\Factory\CurrentDataTrackerInputFactoryInterface'
             - '@Locastic\Loggastic\Metadata\LoggableContext\Factory\LoggableContextFactoryInterface'
diff --git a/src/Resources/config/message_handlers.yaml b/src/Resources/config/message_handlers.yaml
index a94e17d..cc1cc5a 100644
--- a/src/Resources/config/message_handlers.yaml
+++ b/src/Resources/config/message_handlers.yaml
@@ -19,7 +19,7 @@ services:
             - '@Doctrine\Persistence\ManagerRegistry'
             - '@Locastic\Loggastic\Factory\CurrentDataTrackerInputFactoryInterface'
             - '@serializer.normalizer.object'
-            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchService'
+            - '@Locastic\Loggastic\Bridge\Elasticsearch\ElasticsearchServiceInterface'
             - '@Locastic\Loggastic\Bridge\Elasticsearch\Context\ElasticsearchContextFactoryInterface'
         tags:
             - { name: messenger.message_handler }