ISSUE #?

* Improve integration between `ConfigV1` and `PoolFactory`.
* Minor improvements.

Author: Sergio García Prado

packages/core/minos-microservice-aggregate/minos/aggregate/snapshots/repositories/abc.py

@@ -190,7 +190,8 @@ async def find_entries(
             performed to the global snapshot.
         :param exclude_deleted: If ``True``, deleted ``RootEntity`` entries are included, otherwise deleted
             ``RootEntity`` entries are filtered.
-        :param synchronize: TODO
+        :param synchronize: If ``True`` a synchronization is performed before processing the query, otherwise the query
+            is performed without any synchronization step.
         :param kwargs: Additional named arguments.
         :return: An asynchronous iterator that containing the ``RootEntity`` instances.
         """

packages/core/minos-microservice-common/minos/common/config/v1.py

@@ -121,6 +121,27 @@ def _get_saga(self) -> dict[str, Any]:
         return saga
 
     def _get_injections(self) -> list[type[InjectableMixin]]:
+        from ..pools import (
+            Pool,
+            PoolFactory,
+        )
+
+        injections = self._get_raw_injections()
+        injections = [
+            injection
+            for injection in injections
+            if not (issubclass(injection, Pool) or issubclass(injection, PoolFactory))
+        ]
+        with suppress(MinosConfigException):
+            pool_factory = self._get_pools().get("factory")
+            if pool_factory is not None:
+                # noinspection PyTypeChecker
+                injections.insert(0, pool_factory)
+
+        # noinspection PyTypeChecker
+        return injections
+
+    def _get_raw_injections(self) -> list[type[InjectableMixin]]:
         try:
             injections = self.get_by_key("service.injections")
             if isinstance(injections, dict):
@@ -217,7 +238,31 @@ def _get_services(self) -> list[type]:
         return services
 
     def _get_pools(self) -> dict[str, type]:
-        return dict()
+        from ..pools import (
+            Pool,
+            PoolFactory,
+        )
+
+        factory = next(
+            (injection for injection in self._get_raw_injections() if issubclass(injection, PoolFactory)), PoolFactory
+        )
+        injections = [injection for injection in self._get_raw_injections() if issubclass(injection, Pool)]
+        if not len(injections):
+            return dict()
+
+        types = dict()
+        for injection in injections:
+            if "lock" in injection.__name__.lower():
+                types["lock"] = injection
+            elif "database" in injection.__name__.lower():
+                types["database"] = injection
+            elif "broker" in injection.__name__.lower():
+                types["broker"] = injection
+
+        return {
+            "factory": factory,
+            "types": types,
+        }
 
     def _get_routers(self) -> list[type]:
         try:
@@ -266,7 +311,7 @@ def _get_database_broker(self):
         return self._get_database_by_name("broker.queue")
 
     def _get_database_saga(self) -> dict[str, Any]:
-        raw = self.get_by_key("saga.storage")
+        raw = self._get_database_by_name("saga.storage")
         return raw
 
     def _get_database_event(self) -> dict[str, Any]:

packages/core/minos-microservice-common/minos/common/database/pools.py

@@ -16,9 +16,6 @@
 from ..config import (
     Config,
 )
-from ..injections import (
-    Injectable,
-)
 from ..locks import (
     LockPool,
 )
@@ -37,7 +34,6 @@
 logger = logging.getLogger(__name__)
 
 
-@Injectable("database_pool")
 class DatabaseClientPool(Pool[DatabaseClient]):
     """Database Client Pool class."""
 
@@ -49,7 +45,6 @@ def __init__(self, client_builder: DatabaseClientBuilder, *args, **kwargs):
     @classmethod
     def _from_config(cls, config: Config, identifier: Optional[str] = None, **kwargs):
         base_builder = config.get_database_by_name(identifier).get("client")
-
         if base_builder is None:
             raise ValueError(f"{base_builder!r} is not a {DatabaseClientBuilder!r} instance.")
         elif issubclass(base_builder, DatabaseClient):

packages/core/minos-microservice-common/minos/common/locks.py

@@ -14,9 +14,6 @@
     cached_property,
 )
 
-from .injections import (
-    Injectable,
-)
 from .pools import (
     Pool,
 )
@@ -65,6 +62,5 @@ def hashed_key(self) -> int:
         return self.key
 
 
-@Injectable("lock_pool")
 class LockPool(Pool[Lock], ABC):
     """Lock Pool class."""

packages/core/minos-microservice-common/tests/test_common/test_config/test_v1/test_base.py

@@ -7,6 +7,7 @@
     Config,
     ConfigV1,
     MinosConfigException,
+    PoolFactory,
 )
 from tests.utils import (
     BASE_PATH,
@@ -51,9 +52,7 @@ def test_name(self):
 
     def test_injections(self):
         expected = [
-            FakeLockPool,
-            FakeDatabasePool,
-            FakeBrokerClientPool,
+            PoolFactory,
             FakeHttpConnector,
             FakeBrokerPublisher,
             FakeBrokerSubscriberBuilder,
@@ -185,7 +184,15 @@ def test_interface_unknown(self):
             config.get_interface_by_name("unknown")
 
     def test_pools(self):
-        self.assertEqual(dict(), self.config.get_pools())
+        expected = {
+            "factory": PoolFactory,
+            "types": {
+                "lock": FakeLockPool,
+                "database": FakeDatabasePool,
+                "broker": FakeBrokerClientPool,
+            },
+        }
+        self.assertEqual(expected, self.config.get_pools())
 
     def test_services(self):
         self.assertEqual([float, int], self.config.get_services())

packages/core/minos-microservice-common/tests/utils.py

@@ -12,6 +12,7 @@
     Injectable,
     Lock,
     LockPool,
+    Pool,
     Port,
     testing,
 )
@@ -163,13 +164,11 @@ class FakeBrokerSubscriberBuilder(Builder[FakeBrokerSubscriber]):
 FakeBrokerSubscriber.set_builder(FakeBrokerSubscriberBuilder)
 
 
-@Injectable("database_pool")
-class FakeDatabasePool:
+class FakeDatabasePool(Pool):
     """For testing purposes."""
 
 
-@Injectable("broker_pool")
-class FakeBrokerClientPool:
+class FakeBrokerClientPool(Pool):
     """For testing purposes."""
 
 

packages/core/minos-microservice-networks/minos/networks/brokers/pools.py

@@ -14,7 +14,6 @@
 
 from minos.common import (
     Config,
-    Injectable,
     Pool,
 )
 
@@ -28,7 +27,6 @@
 logger = logging.getLogger(__name__)
 
 
-@Injectable("broker_pool")
 class BrokerClientPool(Pool):
     """Broker Client Pool class."""