Merge branch 'dev'v1.8.2

2 files changed, 4 insertions, 4 deletions

diff --git a/main.py b/main.py
index ee25182..1c65e56 100644
--- a/main.py
+++ b/main.py
@@ -71,9 +71,9 @@ def fetch_markets(user):
     cursor = dbs.psql.cursor()
 
     if user is None:
-        cursor.execute("SELECT id,config,user_id FROM market_configs")
+        cursor.execute("SELECT id,config,user_id FROM market_configs WHERE status='enabled'")
     else:
-        cursor.execute("SELECT id,config,user_id FROM market_configs WHERE user_id = %s", user)
+        cursor.execute("SELECT id,config,user_id FROM market_configs WHERE status='enabled' AND user_id = %s", user)
 
     for row in cursor:
         yield row
diff --git a/tests/test_main.py b/tests/test_main.py
index 1864c06..298e29e 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -325,7 +325,7 @@ class MainTest(WebMockTestCase):
         with self.subTest(user=None):
             rows = list(main.fetch_markets(None))
 
-            cursor_mock.execute.assert_called_once_with("SELECT id,config,user_id FROM market_configs")
+            cursor_mock.execute.assert_called_once_with("SELECT id,config,user_id FROM market_configs WHERE status='enabled'")
 
             self.assertEqual(["row_1", "row_2"], rows)
 
@@ -333,7 +333,7 @@ class MainTest(WebMockTestCase):
         with self.subTest(user=1):
             rows = list(main.fetch_markets(1))
 
-            cursor_mock.execute.assert_called_once_with("SELECT id,config,user_id FROM market_configs WHERE user_id = %s", 1)
+            cursor_mock.execute.assert_called_once_with("SELECT id,config,user_id FROM market_configs WHERE status='enabled' AND user_id = %s", 1)
 
             self.assertEqual(["row_1", "row_2"], rows)