ISSUE #367

* Minor improvements related with exceptions.

Author: Sergio García Prado

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

@@ -10,9 +10,6 @@
     UUID,
 )
 
-from psycopg2 import (
-    IntegrityError,
-)
 from psycopg2.sql import (
     SQL,
     Composable,
@@ -24,6 +21,7 @@
     NULL_UUID,
     Config,
     DatabaseMixin,
+    IntegrityException,
 )
 
 from ...exceptions import (
@@ -65,7 +63,7 @@ async def _submit(self, entry: EventEntry, **kwargs) -> EventEntry:
 
         try:
             response = await self.submit_query_and_fetchone(query, params, lock=lock)
-        except IntegrityError:
+        except IntegrityException:
             raise EventRepositoryConflictException(
                 f"{entry!r} could not be submitted due to a key (uuid, version, transaction) collision",
                 await self.offset,

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

@@ -17,10 +17,12 @@
     AiopgDatabaseClient,
     DatabaseClient,
     DatabaseClientBuilder,
+    DatabaseClientException,
     DatabaseClientPool,
     DatabaseLock,
     DatabaseLockPool,
     DatabaseMixin,
+    IntegrityException,
     PostgreSqlLock,
     PostgreSqlLockPool,
     PostgreSqlMinosDatabase,

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

@@ -6,6 +6,8 @@
     AiopgDatabaseClient,
     DatabaseClient,
     DatabaseClientBuilder,
+    DatabaseClientException,
+    IntegrityException,
     UnableToConnectException,
 )
 from .locks import (

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

@@ -1,6 +1,8 @@
 from .abc import (
     DatabaseClient,
     DatabaseClientBuilder,
+    DatabaseClientException,
+    IntegrityException,
     UnableToConnectException,
 )
 from .aiopg import (

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

@@ -24,6 +24,9 @@
 from ...config import (
     Config,
 )
+from ...exceptions import (
+    MinosException,
+)
 
 
 class DatabaseClient(ABC, BuildableMixin):
@@ -50,6 +53,7 @@ async def execute(self, *args, **kwargs) -> None:
         """TODO"""
 
     async def fetch_one(self, *args, **kwargs) -> Any:
+        """TODO"""
         return await self.fetch_all(*args, **kwargs).__anext__()
 
     @abstractmethod
@@ -75,5 +79,13 @@ def with_config(self, config: Config) -> DatabaseClientBuilder:
 DatabaseClient.set_builder(DatabaseClientBuilder)
 
 
-class UnableToConnectException(Exception):
+class DatabaseClientException(MinosException):
+    """TODO"""
+
+
+class UnableToConnectException(DatabaseClientException):
+    """TODO"""
+
+
+class IntegrityException(DatabaseClientException):
     """TODO"""

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

@@ -22,11 +22,13 @@
     ClosableQueue,
 )
 from psycopg2 import (
+    IntegrityError,
     OperationalError,
 )
 
 from .abc import (
     DatabaseClient,
+    IntegrityException,
     UnableToConnectException,
 )
 
@@ -92,8 +94,9 @@ async def _create_connection(self):
                 host=self.host, port=self.port, dbname=self.database, user=self.user, password=self.password
             )
         except OperationalError as exc:
-            logger.warning(f"There was an {exc!r} while trying to get a database connection.")
-            raise UnableToConnectException
+            msg = f"There was an {exc!r} while trying to get a database connection."
+            logger.warning(msg)
+            raise UnableToConnectException(msg)
 
         logger.debug(f"Created {self.database!r} database connection identified by {id(self._connection)}!")
 
@@ -171,7 +174,10 @@ async def execute(
         :return: This method does not return anything.
         """
         await self._create_cursor(lock=lock)
-        await self._cursor.execute(operation=operation, parameters=parameters, timeout=timeout)
+        try:
+            await self._cursor.execute(operation=operation, parameters=parameters, timeout=timeout)
+        except IntegrityError as exc:
+            raise IntegrityException(f"The requested operation raised a integrity error: {exc!r}")
 
     async def _create_cursor(self, *args, lock: Optional[Hashable] = None, **kwargs):
         if self._cursor is None:

packages/core/minos-microservice-networks/minos/networks/brokers/subscribers/filtered/validators/duplicates/pg.py

@@ -9,9 +9,6 @@
     UUID,
 )
 
-from psycopg2 import (
-    IntegrityError,
-)
 from psycopg2.sql import (
     SQL,
 )
@@ -20,6 +17,7 @@
     Builder,
     Config,
     DatabaseMixin,
+    IntegrityException,
 )
 
 from .abc import (
@@ -64,7 +62,7 @@ async def _is_unique(self, topic: str, uuid: UUID) -> bool:
         try:
             await self.submit_query(self._query_factory.build_insert_row(), {"topic": topic, "uuid": uuid})
             return True
-        except IntegrityError:
+        except IntegrityException:
             return False
 
 
@@ -84,6 +82,7 @@ def with_config(self, config: Config):
 PostgreSqlBrokerSubscriberDuplicateValidator.set_builder(PostgreSqlBrokerSubscriberDuplicateValidatorBuilder)
 
 
+# noinspection SqlNoDataSourceInspection
 class PostgreSqlBrokerSubscriberDuplicateValidatorQueryFactory:
     """PostgreSql Broker Subscriber Duplicate Detector Query Factory class."""