ISSUE #367

* Remove `notifications` from `DatabaseClient`.

Author: Sergio García Prado

packages/core/minos-microservice-common/minos/common/database/clients/abc.py

@@ -6,9 +6,6 @@
     ABC,
     abstractmethod,
 )
-from asyncio import (
-    Queue,
-)
 from collections.abc import (
     AsyncIterator,
 )
@@ -90,19 +87,6 @@ def fetch_all(self, *args, **kwargs) -> AsyncIterator[Any]:
     def _fetch_all(self, *args, **kwargs) -> AsyncIterator[Any]:
         raise NotImplementedError
 
-    @property
-    def notifications(self) -> Queue:
-        """Get the notifications queue.
-
-        :return: A ``Queue`` instance.
-        """
-        return self._notifications
-
-    @property
-    @abstractmethod
-    def _notifications(self) -> Queue:
-        raise NotImplementedError
-
 
 class DatabaseClientBuilder(Builder[DatabaseClient]):
     """Database Client Builder class."""

packages/core/minos-microservice-common/minos/common/database/clients/aiopg.py

@@ -18,9 +18,6 @@
     Connection,
     Cursor,
 )
-from aiopg.utils import (
-    ClosableQueue,
-)
 from psycopg2 import (
     IntegrityError,
     OperationalError,
@@ -194,10 +191,6 @@ def cursor(self) -> Optional[Cursor]:
         """
         return self._cursor
 
-    @property
-    def _notifications(self) -> ClosableQueue:
-        return self._connection.notifies
-
     @property
     def connection(self) -> Optional[Connection]:
         """Get the connection.

packages/core/minos-microservice-common/tests/test_common/test_database/test_clients/test_abc.py

@@ -2,19 +2,14 @@
 from abc import (
     ABC,
 )
-from asyncio import (
-    Queue,
-)
 from typing import (
     Any,
     AsyncIterator,
 )
 from unittest.mock import (
     AsyncMock,
     MagicMock,
-    PropertyMock,
     call,
-    patch,
 )
 
 from minos.common import (
@@ -44,16 +39,11 @@ async def _execute(self, *args, **kwargs) -> None:
     def _fetch_all(self, *args, **kwargs) -> AsyncIterator[Any]:
         """For testing purposes."""
 
-    # noinspection PyPropertyDefinition
-    @property
-    def _notifications(self) -> Queue:
-        """For testing purposes."""
-
 
 class TestDatabaseClient(unittest.IsolatedAsyncioTestCase):
     def test_abstract(self):
         self.assertTrue(issubclass(DatabaseClient, (ABC, BuildableMixin)))
-        expected = {"_notifications", "_is_valid", "_execute", "_fetch_all", "_reset"}
+        expected = {"_is_valid", "_execute", "_fetch_all", "_reset"}
         # noinspection PyUnresolvedReferences
         self.assertEqual(expected, DatabaseClient.__abstractmethods__)
 
@@ -106,14 +96,6 @@ async def test_fetch_one(self):
 
         self.assertEqual([call()], mock.call_args_list)
 
-    async def test_notifications(self):
-        expected = Queue()
-        client = _DatabaseClient()
-        with patch.object(_DatabaseClient, "_notifications", new_callable=PropertyMock, return_value=expected) as mock:
-            self.assertEqual(expected, client.notifications)
-
-        self.assertEqual([call()], mock.call_args_list)
-
 
 class TestDatabaseClientBuilder(CommonTestCase):
     def test_with_name(self):

packages/core/minos-microservice-common/tests/test_common/test_database/test_clients/test_aiopg.py

@@ -83,10 +83,6 @@ async def test_connection_raises(self):
                 async with AiopgDatabaseClient.from_config(self.config):
                     pass
 
-    async def test_notifications(self):
-        async with AiopgDatabaseClient.from_config(self.config) as client:
-            self.assertEqual(client.connection.notifies, client.notifications)
-
     async def test_cursor(self):
         client = AiopgDatabaseClient.from_config(self.config)
         self.assertIsNone(client.cursor)

packages/core/minos-microservice-networks/minos/networks/brokers/collections/queues/pg.py

@@ -197,7 +197,7 @@ async def _wait_for_entries(self, client: DatabaseClient, max_wait: Optional[flo
                 return
 
             with suppress(TimeoutError):
-                return await wait_for(consume_queue(client.notifications, self._records), max_wait)
+                return await wait_for(consume_queue(client.connection.notifies, self._records), max_wait)
 
     async def _get_count(self, client: DatabaseClient) -> int:
         # noinspection PyTypeChecker