Merge pull request #357 from minos-framework/issue-346-add-pool-factory

#346 - Add `PoolFactory` class

Author: Sergio García Prado

.github/workflows/minos-microservice-common-tests.yml

@@ -29,9 +29,8 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
+      MINOS_DATABASES_DEFAULT_HOST: postgres
+      MINOS_DATABASES_QUERY_HOST: postgres
 
     steps:
       - name: Check out repository code

packages/core/minos-microservice-aggregate/minos/aggregate/entities/refs/resolvers.py

@@ -10,6 +10,7 @@
 )
 from typing import (
     Any,
+    Optional,
     Union,
 )
 from uuid import (
@@ -19,6 +20,8 @@
 from minos.common import (
     Inject,
     Model,
+    NotProvidedException,
+    PoolFactory,
 )
 from minos.networks import (
     BrokerClient,
@@ -45,7 +48,18 @@ class RefResolver:
 
     # noinspection PyUnusedLocal
     @Inject()
-    def __init__(self, broker_pool: BrokerClientPool, **kwargs):
+    def __init__(
+        self,
+        broker_pool: Optional[BrokerClientPool] = None,
+        pool_factory: Optional[PoolFactory] = None,
+        **kwargs,
+    ):
+        if broker_pool is None and pool_factory is not None:
+            broker_pool = pool_factory.get_pool("broker")
+
+        if not isinstance(broker_pool, BrokerClientPool):
+            raise NotProvidedException(f"A {BrokerClientPool!r} instance is required. Obtained: {broker_pool}")
+
         self.broker_pool = broker_pool
 
     # noinspection PyUnusedLocal

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

@@ -29,6 +29,7 @@
     Lock,
     LockPool,
     NotProvidedException,
+    PoolFactory,
     SetupMixin,
 )
 from minos.networks import (
@@ -74,12 +75,16 @@ def __init__(
         self,
         broker_publisher: BrokerPublisher,
         transaction_repository: TransactionRepository,
-        lock_pool: LockPool,
+        lock_pool: Optional[LockPool] = None,
+        pool_factory: Optional[PoolFactory] = None,
         *args,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
 
+        if lock_pool is None and pool_factory is not None:
+            lock_pool = pool_factory.get_pool("lock")
+
         if broker_publisher is None:
             raise NotProvidedException("A broker instance is required.")
 

packages/core/minos-microservice-aggregate/minos/aggregate/events/repositories/pg.py

@@ -23,7 +23,7 @@
 from minos.common import (
     NULL_UUID,
     Config,
-    PostgreSqlMinosDatabase,
+    DatabaseMixin,
 )
 
 from ...exceptions import (
@@ -37,12 +37,12 @@
 )
 
 
-class PostgreSqlEventRepository(PostgreSqlMinosDatabase, EventRepository):
+class PostgreSqlEventRepository(DatabaseMixin, EventRepository):
     """PostgreSQL-based implementation of the event repository class in ``Minos``."""
 
     @classmethod
-    def _from_config(cls, *args, config: Config, **kwargs) -> Optional[EventRepository]:
-        return cls(*args, **config.get_database_by_name("event"), **kwargs)
+    def _from_config(cls, config: Config, **kwargs) -> Optional[EventRepository]:
+        return super()._from_config(config, **config.get_database_by_name("event"), **kwargs)
 
     async def _setup(self):
         """Setup miscellaneous repository thing.

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

@@ -9,11 +9,11 @@
 
 from minos.common import (
     Config,
-    PostgreSqlMinosDatabase,
+    DatabaseMixin,
 )
 
 
-class PostgreSqlSnapshotSetup(PostgreSqlMinosDatabase):
+class PostgreSqlSnapshotSetup(DatabaseMixin):
     """Minos Snapshot Setup Class"""
 
     @classmethod

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

@@ -1,3 +1,7 @@
+from __future__ import (
+    annotations,
+)
+
 from abc import (
     ABC,
     abstractmethod,
@@ -19,6 +23,7 @@
     Lock,
     LockPool,
     NotProvidedException,
+    PoolFactory,
     SetupMixin,
 )
 
@@ -36,9 +41,14 @@ class TransactionRepository(ABC, SetupMixin):
     """Transaction Repository base class."""
 
     @Inject()
-    def __init__(self, lock_pool: LockPool, *args, **kwargs):
+    def __init__(
+        self, lock_pool: Optional[LockPool] = None, pool_factory: Optional[PoolFactory] = None, *args, **kwargs
+    ):
         super().__init__(*args, **kwargs)
 
+        if lock_pool is None and pool_factory is not None:
+            lock_pool = pool_factory.get_pool("lock")
+
         if lock_pool is None:
             raise NotProvidedException("A lock pool instance is required.")
 

packages/core/minos-microservice-aggregate/minos/aggregate/transactions/repositories/pg.py

@@ -15,7 +15,7 @@
 
 from minos.common import (
     Config,
-    PostgreSqlMinosDatabase,
+    DatabaseMixin,
 )
 
 from ...exceptions import (
@@ -29,12 +29,12 @@
 )
 
 
-class PostgreSqlTransactionRepository(PostgreSqlMinosDatabase, TransactionRepository):
+class PostgreSqlTransactionRepository(DatabaseMixin, TransactionRepository):
     """PostgreSql Transaction Repository class."""
 
     @classmethod
-    def _from_config(cls, *args, config: Config, **kwargs) -> Optional[PostgreSqlTransactionRepository]:
-        return cls(*args, **config.get_database_by_name("transaction"), **kwargs)
+    def _from_config(cls, config: Config, **kwargs) -> Optional[PostgreSqlTransactionRepository]:
+        return super()._from_config(config, **config.get_database_by_name("transaction"), **kwargs)
 
     async def _setup(self):
         await self.submit_query('CREATE EXTENSION IF NOT EXISTS "uuid-ossp";', lock="uuid-ossp")

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_aggregate.py

@@ -11,13 +11,13 @@
 )
 from tests.utils import (
     CONFIG_FILE_PATH,
-    MinosTestCase,
+    AggregateTestCase,
     Order,
     OrderAggregate,
 )
 
 
-class TestAggregate(MinosTestCase):
+class TestAggregate(AggregateTestCase):
     async def test_root(self):
         async with OrderAggregate.from_config(CONFIG_FILE_PATH) as aggregate:
             self.assertEqual(Order, aggregate.root)

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_entities/test_models/test_root/test_base.py

@@ -18,12 +18,12 @@
     current_datetime,
 )
 from tests.utils import (
+    AggregateTestCase,
     Car,
-    MinosTestCase,
 )
 
 
-class TestRootEntity(MinosTestCase):
+class TestRootEntity(AggregateTestCase):
     async def test_create(self):
         observed = await Car.create(doors=3, color="blue")
         expected = Car(

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_entities/test_models/test_root/test_broker.py

@@ -14,13 +14,13 @@
     BrokerMessageV1,
 )
 from tests.utils import (
+    AggregateTestCase,
     Car,
-    MinosTestCase,
     Owner,
 )
 
 
-class TestRootEntityBroker(MinosTestCase):
+class TestRootEntityBroker(AggregateTestCase):
     async def test_create(self):
         car = await Car.create(doors=3, color="blue")