Fixed Map<Long, UrlCheck> type to display checks

Author: irinakomarchenko

app/src/main/java/hexlet/code/controller/UrlChecksController.java

@@ -42,6 +42,7 @@ public static void check(Context ctx) throws SQLException {
                 var urlCheck = new UrlCheck(statusCode, h1, title, description, createdAt);
                 urlCheck.setUrlId(urlId);
                 UrlCheckRepository.save(urlCheck);
+                System.out.println("[DEBUG] Сохранили новую проверку для urlId=" + urlId);
             }
             ctx.redirect(NamedRoutes.urlPath(urlId));
         } catch (Exception e) {

app/src/main/java/hexlet/code/controller/UrlsController.java

@@ -71,11 +71,7 @@ public static void index(Context ctx) throws SQLException {
                     .map(Url::getId)
                     .collect(Collectors.toList());
             Map<Long, UrlCheck> latestChecks = UrlCheckRepository.findLatestChecksByUrlIds(urlIds);
-            Map<Url, UrlCheck> urlsWithLatestChecks = new HashMap<>();
-            for (Url item : urls) {
-                urlsWithLatestChecks.put(item, latestChecks.get(item.getId()));
-            }
-            page.setChecks(urlsWithLatestChecks);
+            page.setChecks(latestChecks);
             page.setPageNumber(pageNumber);
         }
         page.setUrls(urls);
@@ -97,6 +93,7 @@ public static void show(Context ctx) throws SQLException {
         var url = UrlRepository.findById(id)
                 .orElseThrow(() -> new NotFoundResponse("URL not found"));
         var checks = UrlCheckRepository.find(id);
+        System.out.println("[DEBUG] checks.size() = " + checks.size());
 
         var page = new UrlPage(url, checks);
         String message = ctx.consumeSessionAttribute("message");

app/src/main/java/hexlet/code/dto/urls/UrlsPage.java

@@ -15,7 +15,7 @@
 @Setter
 public class UrlsPage extends BasePage {
     private List<Url> urls;
-    private Map<Url, UrlCheck> checks;
+    private Map<Long, UrlCheck> checks;
     private int pageNumber;
     private List<Integer> pages;
 }

app/src/main/java/hexlet/code/repository/UrlCheckRepository.java

@@ -18,6 +18,11 @@
 public class UrlCheckRepository extends BaseRepository {
 
     public static void save(UrlCheck urlCheck) throws SQLException {
+        System.out.println("[DEBUG] Сохраняем UrlCheck: urlId=" + urlCheck.getUrlId()
+                + ", status=" + urlCheck.getStatusCode()
+                + ", title=" + urlCheck.getTitle()
+                + ", h1=" + urlCheck.getH1());
+
         var sql = "INSERT INTO url_checks (url_id, status_code, h1, title, description, created_at) "
                 + "VALUES (?, ?, ?, ?, ?, ?)";
         try (var conn = dataSource.getConnection();
@@ -30,19 +35,27 @@ public static void save(UrlCheck urlCheck) throws SQLException {
             preparedStatement.setString(3, urlCheck.getH1());
             preparedStatement.setString(4, urlCheck.getTitle());
             preparedStatement.setString(5, urlCheck.getDescription());
-            preparedStatement.setTimestamp(6, Timestamp.valueOf(LocalDateTime.now()));
+            preparedStatement.setTimestamp(6, Timestamp.valueOf(urlCheck.getCreatedAt()));
             preparedStatement.executeUpdate();
 
+            int updated = preparedStatement.executeUpdate();
+            System.out.println("[DEBUG] executeUpdate вернул: " + updated);
+
             var generatedKeys = preparedStatement.getGeneratedKeys();
             if (generatedKeys.next()) {
                 urlCheck.setId(generatedKeys.getLong(1));
+                System.out.println("[DEBUG] Сохранено с id=" + urlCheck.getId());
             } else {
                 throw new SQLException("Не сформирован ID");
             }
+        } catch (SQLException ex) {
+            System.out.println("[DEBUG][ERROR] При сохранении проверки: " + ex.getMessage());
+            throw ex;
         }
     }
 
     public static List<UrlCheck> find(Long urlId) throws SQLException {
+        System.out.println("[DEBUG] Запрашиваем проверки для urlId=" + urlId);
         var sql = "SELECT * FROM url_checks WHERE url_id = ?";
         try (var conn = dataSource.getConnection();
              var stmt = conn.prepareStatement(sql)) {
@@ -55,6 +68,7 @@ public static List<UrlCheck> find(Long urlId) throws SQLException {
                 var urlCheck = mapRowToUrlCheck(resultSet);
                 results.add(urlCheck);
             }
+            System.out.println("[DEBUG] Найдено " + results.size() + " проверок");
             return results;
         }
     }

app/src/main/resources/templates/urls/index.jte

@@ -60,7 +60,7 @@ content = @`
                                     <td>${item.getId()}</td>
                                     <td><a href="${NamedRoutes.urlPath(item.getId())}">${item.getName()}</a></td>
 
-                                    !{var latestCheck = page.getChecks().get(item);}
+                                    !{var latestCheck = page.getChecks().get(item.getId());}
                                     @if(latestCheck != null)
                                         <td>${latestCheck.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yy HH:mm"))}</td>
                                         <td>${latestCheck.getStatusCode()}</td>