SIENTIAPDE-1316

Update .gitignore and refactor metrics.py, activities.py, and gates.py for improved clarity and consistency. Added coverage.xml and cache directories to .gitignore. Standardized string formatting and parameter handling in metrics and activities classes, enhancing code readability. Removed the deprecated faker.py file and adjusted related tests accordingly.

tests/activities/test_activities.py

@@ -1,10 +1,11 @@
-from unittest.mock import patch, MagicMock, ANY
-from pytest import mark
+from unittest.mock import ANY, MagicMock, patch
+
 from sientia_do.temporal.activities.postgres import Postgres
+
 from scouter.activities.activities import Activities
+from scouter.activities.gates import Gates
 from scouter.activities.mongodb import MongoDB
 from scouter.activities.redis import Redis
-from scouter.activities.gates import Gates
 
 
 @patch('scouter.activities.activities.MongoDB.__init__')
@@ -12,7 +13,6 @@ from scouter.activities.gates import Gates
 @patch('scouter.activities.activities.Redis.__init__')
 @patch('scouter.activities.activities.Gates.__init__')
 def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mongodb_init):
-
     postgres_config = {
         'host': 'localhost',
         'port': 5432,
@@ -20,19 +20,14 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
         'password': 'postgres',
         'dbname': 'postgres',
         'min_connections': 1,
-        'max_connections': 10
+        'max_connections': 10,
     }
 
-    redis_config = {
-        'host': 'localhost',
-        'port': 6379,
-        'username': 'redis',
-        'password': 'redis'
-    }
+    redis_config = {'host': 'localhost', 'port': 6379, 'username': 'redis', 'password': 'redis'}
 
     mongodb_config = {
         'connection_string': 'mongodb://localhost:27017',
-        'database_name': 'test_database'
+        'database_name': 'test_database',
     }
 
     logger = MagicMock()
@@ -43,7 +38,7 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
         redis_config=redis_config,
         mongodb_config=mongodb_config,
         logger=logger,
-        notification_handler=notification_handler
+        notification_handler=notification_handler,
     )
 
     assert isinstance(activities, Activities)
@@ -62,7 +57,7 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
         min_connections=postgres_config['min_connections'],
         max_connections=postgres_config['max_connections'],
         logger=logger,
-        notification_handler=notification_handler
+        notification_handler=notification_handler,
     )
 
     mock_redis_init.assert_called_once_with(
@@ -72,7 +67,7 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
         username=redis_config['username'],
         password=redis_config['password'],
         logger=logger,
-        notification_handler=notification_handler
+        notification_handler=notification_handler,
     )
 
     mock_mongodb_init.assert_called_once_with(
@@ -80,13 +75,11 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
         connection_string=mongodb_config['connection_string'],
         database_name=mongodb_config['database_name'],
         logger=logger,
-        notification_handler=notification_handler
+        notification_handler=notification_handler,
     )
 
     mock_gates_init.assert_called_once_with(
-        ANY,
-        logger=logger,
-        notification_handler=notification_handler
+        ANY, logger=logger, notification_handler=notification_handler
     )
 
 
@@ -96,8 +89,14 @@ def test___init__(mock_gates_init, mock_redis_init, mock_postgres_init, mock_mon
 @patch('scouter.activities.activities.MongoDB.__init__')
 @patch('scouter.activities.activities.Postgres.close')
 @patch('scouter.activities.activities.MongoDB.shutdown')
-def test_shutdown(mock_mongodb_close, mock_postgres_close, _mock_mongodb_init,
-                  _mock_gates_init, _mock_redis_init, _mock_postgres_init):
+def test_shutdown(
+    mock_mongodb_close,
+    mock_postgres_close,
+    _mock_mongodb_init,
+    _mock_gates_init,
+    _mock_redis_init,
+    _mock_postgres_init,
+):
     postgres_config = {
         'host': 'localhost',
         'port': 5432,
@@ -105,19 +104,14 @@ def test_shutdown(mock_mongodb_close, mock_postgres_close, _mock_mongodb_init,
         'password': 'postgres',
         'dbname': 'postgres',
         'min_connections': 1,
-        'max_connections': 10
+        'max_connections': 10,
     }
 
-    redis_config = {
-        'host': 'localhost',
-        'port': 6379,
-        'username': 'redis',
-        'password': 'redis'
-    }
+    redis_config = {'host': 'localhost', 'port': 6379, 'username': 'redis', 'password': 'redis'}
 
     mongodb_config = {
         'connection_string': 'mongodb://localhost:27017',
-        'database_name': 'test_database'
+        'database_name': 'test_database',
     }
 
     logger = MagicMock()
@@ -128,7 +122,7 @@ def test_shutdown(mock_mongodb_close, mock_postgres_close, _mock_mongodb_init,
         redis_config=redis_config,
         mongodb_config=mongodb_config,
         logger=logger,
-        notification_handler=notification_handler
+        notification_handler=notification_handler,
     )
 
     activities.shutdown()