step 4 done.

Author: gordienkoas

page_analyzer/app.py

@@ -49,12 +49,25 @@ def urls():
     cur = conn.cursor()
     cur.execute('SELECT * FROM urls ORDER BY created_at DESC')
     urls = cur.fetchall()
-    cur.execute('SELECT created_at FROM url_checks ORDER BY created_at DESC')
-    checks = cur.fetchall()
+
+    cur.execute('''
+            SELECT u.id, u.name, u.created_at, 
+                   uc.status_code, uc.created_at AS last_check
+            FROM urls u
+            LEFT JOIN url_checks uc ON u.id = uc.url_id
+            WHERE uc.created_at = (
+                SELECT MAX(created_at) 
+                FROM url_checks 
+                WHERE url_id = u.id
+            )
+            ORDER BY u.created_at DESC
+        ''')
+    urls = cur.fetchall()
+
     cur.close()
     conn.close()
 
-    return render_template('urls.html', urls=urls, checks=checks)
+    return render_template('urls.html', urls=urls)
 
 
 @app.route('/urls/<int:url_id>', methods=['GET'])