From 0c64bde728660e1a6668c351e01d469233bcb163 Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Thu, 9 Dec 2021 01:00:07 +0300
Subject: [PATCH] remove context manager self.db for read request

---
 model/postgres_model.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/model/postgres_model.py b/model/postgres_model.py
index 98f593c..c389610 100644
--- a/model/postgres_model.py
+++ b/model/postgres_model.py
@@ -63,17 +63,16 @@ class PostgresModel(AbstractModel):
 
         logger.debug(f'Not cached result for {cache_key}')
 
-        with self.db:
-            with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
-                cursor.execute(postgres_sql_requests.select_activity_pretty_names, {
-                    'LB_type': utils.LeaderboardTypes(leaderboard_type.lower()).value,
-                    'platform': utils.Platform(platform.upper()).value,
-                    'limit': limit,
-                    'high_timestamp': high_timestamp,
-                    'low_timestamp': low_timestamp
-                })
+        with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
+            cursor.execute(postgres_sql_requests.select_activity_pretty_names, {
+                'LB_type': utils.LeaderboardTypes(leaderboard_type.lower()).value,
+                'platform': utils.Platform(platform.upper()).value,
+                'limit': limit,
+                'high_timestamp': high_timestamp,
+                'low_timestamp': low_timestamp
+            })
 
-                result: list = cursor.fetchall()
+            result: list = cursor.fetchall()
 
         if not cache.disabled:
             cache.set(cache_key, json.dumps(result))
@@ -136,10 +135,9 @@ class PostgresModel(AbstractModel):
 
         logger.debug(f'Not cached result for {cache_key}')
 
-        with self.db:
-            with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
-                cursor.execute(postgres_sql_requests.select_diff_by_action_id, {'action_id': action_id})
-                result: list = cursor.fetchall()
+        with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
+            cursor.execute(postgres_sql_requests.select_diff_by_action_id, {'action_id': action_id})
+            result: list = cursor.fetchall()
 
         if not cache.disabled:
             cache.set(cache_key, json.dumps(result))