Added corrections based on comments_2

Author: irinakomarchenko

app/src/main/java/hexlet/code/model/Url.java

@@ -17,12 +17,5 @@ public class Url {
     public Url(String name) {
         this.name = name;
     }
-
-    public Url(Long id, String name, LocalDateTime createdAt) {
-        this.id = id;
-        this.name = name;
-        this.createdAt = createdAt;
-    }
-
 }
 

app/src/main/java/hexlet/code/model/UrlCheck.java

@@ -23,9 +23,4 @@ public UrlCheck(int statusCode, String h1, String title, String description, Loc
         this.description = description;
         this.createdAt = createdAt;
     }
-
-    public UrlCheck(int statusCode, LocalDateTime createdAt) {
-        this.statusCode = statusCode;
-        this.createdAt = createdAt;
-    }
 }

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

@@ -2,6 +2,7 @@
 
 import hexlet.code.model.UrlCheck;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
@@ -29,7 +30,7 @@ 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(urlCheck.getCreatedAt()));
+            preparedStatement.setTimestamp(6, Timestamp.valueOf(LocalDateTime.now()));
             preparedStatement.executeUpdate();
 
             var generatedKeys = preparedStatement.getGeneratedKeys();
@@ -50,18 +51,8 @@ public static List<UrlCheck> find(Long urlId) throws SQLException {
             var resultSet = stmt.executeQuery();
 
             var results = new ArrayList<UrlCheck>();
-            var currentListId = 1L;
-
             while (resultSet.next()) {
-                var statusCode = resultSet.getInt("status_code");
-                var h1 = resultSet.getString("h1");
-                var title = resultSet.getString("title");
-                var description = resultSet.getString("description");
-                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
-                var urlCheck = new UrlCheck(statusCode, h1, title, description, createdAt);
-                urlCheck.setId(currentListId);
-
-                currentListId++;
+                var urlCheck = mapRowToUrlCheck(resultSet);
                 results.add(urlCheck);
             }
             return results;
@@ -77,9 +68,7 @@ public static Optional<UrlCheck> findLatestCheck(Long urlId) throws SQLException
             var resultSet = stmt.executeQuery();
 
             if (resultSet.next()) {
-                var statusCode = resultSet.getInt("status_code");
-                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
-                var check = new UrlCheck(statusCode, createdAt);
+                var check = mapRowToUrlCheck(resultSet);
                 return Optional.of(check);
             }
             return Optional.empty();
@@ -102,20 +91,24 @@ public static Map<Long, UrlCheck> findLatestChecksByUrlIds(List<Long> urlIds) th
             var resultSet = stmt.executeQuery();
             var result = new HashMap<Long, UrlCheck>();
             while (resultSet.next()) {
-                var id = resultSet.getLong("id");
-                var urlId = resultSet.getLong("url_id");
-                var statusCode = resultSet.getInt("status_code");
-                var h1 = resultSet.getString("h1");
-                var title = resultSet.getString("title");
-                var description = resultSet.getString("description");
-                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
-                var check = new UrlCheck(statusCode, h1, title, description, createdAt);
-                check.setId(id);
-                check.setUrlId(urlId);
-                check.setCreatedAt(createdAt);
-                result.put(urlId, check);
+                var check = mapRowToUrlCheck(resultSet);
+                Long urlIdFromDb = check.getUrlId();
+                result.put(check.getUrlId(), check);
             }
             return result;
         }
     }
+
+    private static UrlCheck mapRowToUrlCheck(ResultSet rs) throws SQLException {
+        var check = new UrlCheck(
+                rs.getInt("status_code"),
+                rs.getString("h1"),
+                rs.getString("title"),
+                rs.getString("description"),
+                rs.getTimestamp("created_at").toLocalDateTime()
+        );
+        check.setId(rs.getLong("id"));
+        check.setUrlId(rs.getLong("url_id"));
+        return check;
+    }
 }

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

@@ -122,7 +122,11 @@ private static Url getUrl(ResultSet resultSet) throws SQLException {
         var id = resultSet.getLong("id");
         var name = resultSet.getString("name");
         var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
-        return new Url(id, name, createdAt);
+
+        Url url = new Url(name);
+        url.setId(id);
+        url.setCreatedAt(createdAt);
+        return url;
     }
 
 }

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

@@ -64,8 +64,7 @@ content = @`
                     </tr>
                     </thead>
                     <tbody>
-                    @for(int i = checks.size() - 1; i >= 0; i--)
-                        !{var check = page.getChecks().get(i);}
+                    @for(var check : page.getChecks())
                         <tr>
                             <td>${check.getId()}</td>
                             <td>${check.getStatusCode()}</td>