fix app

Author: sgmdlt

Makefile

@@ -17,7 +17,7 @@ run:
 prod:
 	poetry run gunicorn --workers=4 --bind 0.0.0.0:$(PORT) example:app --log-file -
 
-compose-production-run-app:
+compose-production-run:
 	docker compose -p python_page_analyzer_ru-production down
 	docker compose -p python_page_analyzer_ru-production build
 	docker compose -p python_page_analyzer_ru-production up

README.md

@@ -16,8 +16,8 @@ make install
 # run linter
 make lint
 
-# run localy
-make run
+# run in docker
+make compose-production-run
 ```
 
 

example.py

@@ -1,4 +1,5 @@
 import os
+import psycopg2
 from flask import (
     get_flashed_messages,
     flash,
@@ -14,7 +15,9 @@
 app.config['SECRET_KEY'] = os.getenv('SECRET_KEY')
 app.config['DATABASE_URL'] = os.getenv('DATABASE_URL')
 
-repo = UserRepository(app.config['DATABASE_URL'])
+
+conn = psycopg2.connect(app.config['DATABASE_URL'])
+repo = UserRepository(conn)
 
 
 @app.route('/')
@@ -26,11 +29,13 @@ def index():
 def users_get():
     messages = get_flashed_messages(with_categories=True)
     term = request.args.get('term', '')
-    users = repo.get_content()
-    filtered_users = [user for user in users if term in user['name']]
+    if term:
+        users = repo.get_by_term(term)
+    else:
+        users = repo.get_content()
     return render_template(
         'users/index.html',
-        users=filtered_users,
+        users=users,
         search=term,
         messages=messages
     )

user_repository.py

@@ -1,47 +1,55 @@
-import psycopg2
 from psycopg2.extras import RealDictCursor
 
 
 class UserRepository:
-    def __init__(self, db_url):
-        self.db_url = db_url
-
-    def get_connection(self):
-        return psycopg2.connect(self.db_url)
+    def __init__(self, conn):
+        self.conn = conn
 
     def get_content(self):
-        with self.get_connection() as conn:
-            with conn.cursor(cursor_factory=RealDictCursor) as cur:
-                cur.execute("SELECT * FROM users")
-                return cur.fetchall()
+        with self.conn.cursor(cursor_factory=RealDictCursor) as cur:
+            cur.execute("SELECT * FROM users")
+            return cur.fetchall()
+
+    def get_by_term(self, search_term=''):
+        with self.conn.cursor(cursor_factory=RealDictCursor) as cur:
+            cur.execute("SELECT * FROM users WHERE name ILIKE %s", (f'%{search_term}%',))
+            return cur.fetchall()
 
     def find(self, id):
-        with self.get_connection() as conn:
-            with conn.cursor(cursor_factory=RealDictCursor) as cur:
-                cur.execute("SELECT * FROM users WHERE id = %s", (id,))
-                return cur.fetchone()
+        with self.conn.cursor(cursor_factory=RealDictCursor) as cur:
+            cur.execute("SELECT * FROM users WHERE id = %s", (id,))
+            return cur.fetchone()
 
     def save(self, user_data):
-        with self.get_connection() as conn:
-            with conn.cursor() as cur:
-                if 'id' not in user_data:
-                    # New user
-                    cur.execute(
-                        "INSERT INTO users (name, email) VALUES (%s, %s) RETURNING id",
-                        (user_data['name'], user_data['email'])
-                    )
-                    user_data['id'] = cur.fetchone()[0]
-                else:
-                    # Existing user
-                    cur.execute(
-                        "UPDATE users SET name = %s, email = %s WHERE id = %s",
-                        (user_data['name'], user_data['email'], user_data['id'])
-                    )
-            conn.commit()
+        if 'id' not in user_data:
+            id = self._create(user_data)
+        else:
+            id = self._update(user_data)
+        return id
+
+
+    def _update(self, user_data):
+        with self.conn.cursor() as cur:
+            cur.execute(
+                    "UPDATE users SET name = %s, email = %s WHERE id = %s",
+                    (user_data['name'], user_data['email'], user_data['id'])
+                )
+        self.conn.commit()
         return user_data['id']
 
+
+    def _create(self, user_data):
+        with self.conn.cursor() as cur:
+            cur.execute(
+                "INSERT INTO users (name, email) VALUES (%s, %s) RETURNING id",
+                (user_data['name'], user_data['email'])
+            )
+            user_data['id'] = cur.fetchone()[0]
+        self.conn.commit()
+        return user_data['id']
+
+
     def destroy(self, id):
-        with self.get_connection() as conn:
-            with conn.cursor() as cur:
-                cur.execute("DELETE FROM users WHERE id = %s", (id,))
-            conn.commit()
+        with self.conn.cursor() as cur:
+            cur.execute("DELETE FROM users WHERE id = %s", (id,))
+        self.conn.commit()