step 4 done.

Author: gordienkoas

page_analyzer/app.py

@@ -47,8 +47,22 @@ def index():
 def urls():
     conn = get_db_connection()
     cur = conn.cursor()
-    cur.execute('SELECT * FROM urls ORDER BY created_at DESC')
+
+    # Получение всех URL и последней проверки для каждого URL
+    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()
 
@@ -61,12 +75,14 @@ def url_detail(url_id):
     cursor = conn.cursor()
     cursor.execute('SELECT * FROM urls WHERE id = %s', (url_id,))
     url = cursor.fetchone()
+    cursor.execute('SELECT * FROM url_checks WHERE url_id = %s', (url_id,))
+    checks = cursor.fetchall()
     cursor.close()
     conn.close()
     if url is None:
         flash('Сайт не найден.', 'error')
         return redirect(url_for('urls'))
-    return render_template('result.html', url=url)
+    return render_template('result.html', url=url, checks=checks)
 
 
 @app.route('/urls/<int:url_id>/checks', methods=['POST'])

page_analyzer/templates/urls.html

@@ -7,9 +7,10 @@ <h1 class="mb-4">Сайты</h1>
         <thead class="table-light">
             <tr>
                 <th>ID</th>
-                <th>Имя</th>
-                <th>Последняя проверка</th>
-                <th>Код ответа</th>
+                <th>URL</th>
+                <th>Дата создания</th>
+                <th>Код статуса последней проверки</th>
+                <th>Дата последней проверки</th>
             </tr>
         </thead>
         <tbody>
@@ -18,7 +19,8 @@ <h1 class="mb-4">Сайты</h1>
                     <td>{{ url[0] }}</td>
                     <td><a href="{{ url_for('url_detail', url_id=url[0]) }}">{{ url[1] }}</a></td>
                     <td>{{ url[2] }}</td>
-                    <td>{{ url_id }}</td>
+                    <td>{{ url[3] if url[3] is not none else 'Нет проверок' }}</td>
+                    <td>{{ url[4] if url[4] is not none else 'Нет проверок' }}</td>
                 </tr>
             {% endfor %}
         </tbody>