ISSUE #367

* Remove accessors from `DatabaseMixin`.

Author: Sergio García Prado

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_events/test_repositories/test_pg.py

@@ -35,11 +35,7 @@ def test_constructor(self):
     def test_from_config(self):
         repository = PostgreSqlEventRepository.from_config(self.config)
         repository_config = self.config.get_database_by_name("event")
-        self.assertEqual(repository_config["database"], repository.database)
-        self.assertEqual(repository_config["user"], repository.user)
-        self.assertEqual(repository_config["password"], repository.password)
-        self.assertEqual(repository_config["host"], repository.host)
-        self.assertEqual(repository_config["port"], repository.port)
+        self.assertEqual(repository_config["database"], repository.pool.database)
 
     async def test_setup(self):
         async with aiopg.connect(**self.config.get_default_database()) as connection:

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_snapshots/test_pg/test_readers.py

@@ -95,11 +95,7 @@ def test_type(self):
     def test_from_config(self):
         reader = PostgreSqlSnapshotReader.from_config(self.config)
         snapshot_config = self.config.get_database_by_name("snapshot")
-        self.assertEqual(snapshot_config["host"], reader.host)
-        self.assertEqual(snapshot_config["port"], reader.port)
-        self.assertEqual(snapshot_config["database"], reader.database)
-        self.assertEqual(snapshot_config["user"], reader.user)
-        self.assertEqual(snapshot_config["password"], reader.password)
+        self.assertEqual(snapshot_config["database"], reader.pool.database)
 
     async def test_find_by_uuid(self):
         condition = Condition.IN("uuid", [self.uuid_2, self.uuid_3])

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_snapshots/test_pg/test_writers.py

@@ -102,11 +102,7 @@ def test_type(self):
 
     def test_from_config(self):
         snapshot_config = self.config.get_database_by_name("snapshot")
-        self.assertEqual(snapshot_config["host"], self.writer.host)
-        self.assertEqual(snapshot_config["port"], self.writer.port)
-        self.assertEqual(snapshot_config["database"], self.writer.database)
-        self.assertEqual(snapshot_config["user"], self.writer.user)
-        self.assertEqual(snapshot_config["password"], self.writer.password)
+        self.assertEqual(snapshot_config["database"], self.writer.pool.database)
 
     def test_from_config_raises(self):
         with self.assertRaises(NotProvidedException):

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_transactions/test_repositories/test_pg.py

@@ -51,11 +51,7 @@ def test_constructor(self):
     def test_from_config(self):
         repository = PostgreSqlTransactionRepository.from_config(self.config)
         repository_config = self.config.get_database_by_name("event")
-        self.assertEqual(repository_config["host"], repository.host)
-        self.assertEqual(repository_config["port"], repository.port)
-        self.assertEqual(repository_config["database"], repository.database)
-        self.assertEqual(repository_config["user"], repository.user)
-        self.assertEqual(repository_config["password"], repository.password)
+        self.assertEqual(repository_config["database"], repository.pool.database)
 
     async def test_setup(self):
         async with aiopg.connect(**self.config.get_default_database()) as connection:

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

@@ -62,51 +62,6 @@ def __init__(
 
         self._pool = database_pool
 
-    @property
-    def database(self) -> str:
-        """Get the database's database.
-
-        :return: A ``str`` value.
-        """
-        warnings.warn("'database' has been deprecated. Use 'pool.database' instead.", DeprecationWarning)
-        return self.pool.database
-
-    @property
-    def host(self) -> str:
-        """Get the database's host.
-
-        :return: A ``str`` value.
-        """
-        warnings.warn("'host' has been deprecated. Use 'pool.host' instead.", DeprecationWarning)
-        return self.pool.host
-
-    @property
-    def port(self) -> int:
-        """Get the database's port.
-
-        :return: An ``int`` value.
-        """
-        warnings.warn("'port' has been deprecated. Use 'pool.port' instead.", DeprecationWarning)
-        return self.pool.port
-
-    @property
-    def user(self) -> str:
-        """Get the database's user.
-
-        :return: A ``str`` value.
-        """
-        warnings.warn("'user' has been deprecated. Use 'pool.user' instead.", DeprecationWarning)
-        return self.pool.user
-
-    @property
-    def password(self) -> str:
-        """Get the database's password.
-
-        :return: A ``str`` value.
-        """
-        warnings.warn("'password' has been deprecated. Use 'pool.password' instead.", DeprecationWarning)
-        return self.pool.password
-
     async def submit_query_and_fetchone(self, *args, **kwargs) -> tuple:
         """Submit a SQL query and gets the first response.
 

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

@@ -47,46 +47,6 @@ async def test_constructor_with_postgresql_pool(self):
 
         self.assertEqual(pool, database.pool)
 
-    def test_database(self):
-        pool = DatabaseClientPool.from_config(self.config)
-        database = DatabaseMixin(pool)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # noinspection PyDeprecation
-            self.assertEqual(pool.database, database.database)
-
-    def test_user(self):
-        pool = DatabaseClientPool.from_config(self.config)
-        database = DatabaseMixin(pool)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # noinspection PyDeprecation
-            self.assertEqual(pool.user, database.user)
-
-    def test_password(self):
-        pool = DatabaseClientPool.from_config(self.config)
-        database = DatabaseMixin(pool)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # noinspection PyDeprecation
-            self.assertEqual(pool.password, database.password)
-
-    def test_host(self):
-        pool = DatabaseClientPool.from_config(self.config)
-        database = DatabaseMixin(pool)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # noinspection PyDeprecation
-            self.assertEqual(pool.host, database.host)
-
-    def test_port(self):
-        pool = DatabaseClientPool.from_config(self.config)
-        database = DatabaseMixin(pool)
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            # noinspection PyDeprecation
-            self.assertEqual(pool.port, database.port)
-
     async def test_pool(self):
         async with DatabaseMixin() as database:
             self.assertIsInstance(database.pool, DatabaseClientPool)