change the way of finding checks by url id

Author: walpurr

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

@@ -3,7 +3,6 @@
 import hexlet.code.dto.urls.UrlPage;
 import hexlet.code.dto.urls.UrlsPage;
 import hexlet.code.model.Url;
-import hexlet.code.model.UrlCheck;
 import hexlet.code.repository.UrlCheckRepository;
 import hexlet.code.repository.UrlRepository;
 import hexlet.code.util.NamedRoutes;
@@ -33,9 +32,7 @@ public static void index(Context ctx) throws SQLException {
     public static void show(Context ctx) throws SQLException {
         var id = ctx.pathParamAsClass("id", Long.class).get();
         var url = UrlRepository.find(id).orElseThrow(NotFoundResponse::new);
-        var checks = UrlCheckRepository.getEntities().stream()
-            .filter(check -> check.getUrlId().equals(id))
-            .toList();
+        var checks = UrlCheckRepository.findByUrlId(id);
 
         var page = new UrlPage(url, checks);
 
@@ -44,7 +41,7 @@ public static void show(Context ctx) throws SQLException {
         ctx.render("urls/show.jte", model("page", page));
     }
 
-    public static void create(Context ctx) throws SQLException, URISyntaxException {
+    public static void create(Context ctx) throws SQLException {
 
         try {
             var urlName = normalizeUrlName(ctx.formParam("url"));

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

@@ -62,19 +62,16 @@ public static void save(UrlCheck check) throws SQLException {
 //        }
 //    }
 
-    public static Map<Long, UrlCheck> getLatestChecks() throws SQLException {
-        var sql = """
-            SELECT DISTINCT ON (url_id) *
-            FROM url_checks ORDER BY url_id DESC, id DESC
-            """;
+    public static List<UrlCheck> findByUrlId(Long urlId) throws SQLException {
+        var sql = "SELECT * FROM url_checks WHERE url_id = ? ORDER BY id";
         try (
             var conn = dataSource.getConnection();
             var stmt = conn.prepareStatement(sql)
         ) {
+            stmt.setLong(1, urlId);
             var rs = stmt.executeQuery();
-            var result = new HashMap<Long, UrlCheck>();
+            var result = new ArrayList<UrlCheck>();
             while (rs.next()) {
-                var urlId = rs.getLong("url_id");
                 var check = UrlCheck.builder()
                     .id(rs.getLong("id"))
                     .statusCode(rs.getInt("status_code"))
@@ -84,35 +81,64 @@ SELECT DISTINCT ON (url_id) *
                     .urlId(urlId)
                     .createdAt(rs.getTimestamp("created_at").toLocalDateTime())
                     .build();
-                result.put(urlId, check);
+                result.add(check);
             }
 
             return result;
         }
     }
 
-    public static List<UrlCheck> getEntities() throws SQLException {
-        var sql = "SELECT * FROM url_checks";
+    public static Map<Long, UrlCheck> getLatestChecks() throws SQLException {
+        var sql = """
+            SELECT DISTINCT ON (url_id) *
+            FROM url_checks ORDER BY url_id DESC, id DESC
+            """;
         try (
             var conn = dataSource.getConnection();
             var stmt = conn.prepareStatement(sql)
         ) {
             var rs = stmt.executeQuery();
-            var result = new ArrayList<UrlCheck>();
+            var result = new HashMap<Long, UrlCheck>();
             while (rs.next()) {
+                var urlId = rs.getLong("url_id");
                 var check = UrlCheck.builder()
                     .id(rs.getLong("id"))
                     .statusCode(rs.getInt("status_code"))
                     .title(rs.getString("title"))
                     .h1(rs.getString("h1"))
                     .description(rs.getString("description"))
-                    .urlId(rs.getLong("url_id"))
+                    .urlId(urlId)
                     .createdAt(rs.getTimestamp("created_at").toLocalDateTime())
                     .build();
-                result.add(check);
+                result.put(urlId, check);
             }
 
             return result;
         }
     }
+
+//    public static List<UrlCheck> getEntities() throws SQLException {
+//        var sql = "SELECT * FROM url_checks";
+//        try (
+//            var conn = dataSource.getConnection();
+//            var stmt = conn.prepareStatement(sql)
+//        ) {
+//            var rs = stmt.executeQuery();
+//            var result = new ArrayList<UrlCheck>();
+//            while (rs.next()) {
+//                var check = UrlCheck.builder()
+//                    .id(rs.getLong("id"))
+//                    .statusCode(rs.getInt("status_code"))
+//                    .title(rs.getString("title"))
+//                    .h1(rs.getString("h1"))
+//                    .description(rs.getString("description"))
+//                    .urlId(rs.getLong("url_id"))
+//                    .createdAt(rs.getTimestamp("created_at").toLocalDateTime())
+//                    .build();
+//                result.add(check);
+//            }
+//
+//            return result;
+//        }
+//    }
 }