Added corrections based on comments

irinakomarchenko · irinakomarchenko · commit d2a2b7b44628 · 2025-07-22T15:22:14.000+02:00
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/src/main/java/hexlet/code/controller/UrlChecksController.java b/app/src/main/java/hexlet/code/controller/UrlChecksController.java
@@ -12,13 +12,14 @@
 
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 public class UrlChecksController {
     public static void check(Context ctx) throws SQLException {
         var urlId = ctx.pathParamAsClass("id", Long.class).get();
 
         var url = UrlRepository.findById(urlId)
-                .orElseThrow(() -> new NotFoundResponse("URL not found"));
+                .orElseThrow(() -> new NotFoundResponse("Некорректный адрес"));
         var name  = url.getName();
 
 
@@ -37,15 +38,15 @@ public static void check(Context ctx) throws SQLException {
                 String description = !responseBody.select("meta[name=description]").isEmpty()
                         ? responseBody.select("meta[name=description]").get(0).attr("content") : "";
 
-                var createdAt = new Timestamp(System.currentTimeMillis());
+                var createdAt = LocalDateTime.now();
 
                 var urlCheck = new UrlCheck(statusCode, h1, title, description, createdAt);
                 urlCheck.setUrlId(urlId);
                 UrlCheckRepository.save(urlCheck);
             }
             ctx.redirect(NamedRoutes.urlPath(urlId));
         } catch (Exception e) {
-            ctx.sessionAttribute("message", "The test failed");
+            ctx.sessionAttribute("message", "Проверка не пройдена");
             ctx.redirect(NamedRoutes.urlPath(urlId));
         }
 
diff --git a/app/src/main/java/hexlet/code/controller/UrlsController.java b/app/src/main/java/hexlet/code/controller/UrlsController.java
@@ -16,9 +16,13 @@
 import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class UrlsController {
 
@@ -30,23 +34,26 @@ public  static void build(Context ctx) {
     }
 
     public static void create(Context ctx) throws SQLException {
+        String rawUrl = ctx.formParam("url");
+        String name;
         try {
-            var url = new  Url();
-            var name  = normalizeUrl(ctx.formParamAsClass("url", String.class).get());
-
-            if (UrlRepository.existsByName(name)) {
-                ctx.sessionAttribute("message", "URL already exists");
-            } else {
-                url.setName(name);
-                url.setCreatedAt(new Timestamp(System.currentTimeMillis()));
-                UrlRepository.save(url);
-                ctx.sessionAttribute("message", "URL successfully created");
-            }
-            ctx.redirect(NamedRoutes.urlsPath());
+            name = normalizeUrl(rawUrl);
         } catch (IllegalArgumentException | URISyntaxException | MalformedURLException e) {
             ctx.sessionAttribute("message", "Incorrect URL");
             ctx.redirect(NamedRoutes.rootPath());
+            return;
+        }
+
+        var url = new Url();
+        if (UrlRepository.existsByName(name)) {
+            ctx.sessionAttribute("message", "URL already exists");
+        } else {
+            url.setName(name);
+            url.setCreatedAt(LocalDateTime.now());
+            UrlRepository.save(url);
+            ctx.sessionAttribute("message", "URL successfully created");
         }
+        ctx.redirect(NamedRoutes.urlsPath());
     }
 
     public static void index(Context ctx) throws SQLException {
@@ -61,11 +68,13 @@ public static void index(Context ctx) throws SQLException {
         } else if (!urls.isEmpty()) {
             urls = UrlRepository.getEntitiesPerPage(itemsPerPage, pageNumber);
 
+            List<Long> urlIds = urls.stream()
+                    .map(Url::getId)
+                    .collect(Collectors.toList());
+            Map<Long, UrlCheck> latestChecks = UrlCheckRepository.findLatestChecksByUrlIds(urlIds);
             Map<Url, UrlCheck> urlsWithLatestChecks = new HashMap<>();
             for (Url item : urls) {
-                var latestCheck = UrlCheckRepository.findLatestCheck(item.getId())
-                        .orElse(null);
-                urlsWithLatestChecks.put(item, latestCheck);
+                urlsWithLatestChecks.put(item, latestChecks.get(item.getId()));
             }
             page.setChecks(urlsWithLatestChecks);
             page.setPageNumber(pageNumber);
@@ -74,6 +83,13 @@ public static void index(Context ctx) throws SQLException {
 
         String message = ctx.consumeSessionAttribute("message");
         page.setMessage(message);
+        if (pageCount > 0) {
+            List<Integer> pages = IntStream.rangeClosed(1, pageCount)
+                    .boxed()
+                    .collect(Collectors.toList());
+            page.setPages(pages);
+        }
+
         ctx.render("urls/index.jte", Collections.singletonMap("page", page));
     }
 
diff --git a/app/src/main/java/hexlet/code/dto/urls/UrlsPage.java b/app/src/main/java/hexlet/code/dto/urls/UrlsPage.java
@@ -17,4 +17,5 @@ public class UrlsPage extends BasePage {
     private List<Url> urls;
     private Map<Url, UrlCheck> checks;
     private int pageNumber;
+    private List<Integer> pages;
 }
diff --git a/app/src/main/java/hexlet/code/model/Url.java b/app/src/main/java/hexlet/code/model/Url.java
@@ -5,16 +5,25 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
-@AllArgsConstructor
 @NoArgsConstructor
 @Getter
 @Setter
 public class Url {
     private Long id;
     private String name;
-    private Timestamp createdAt;
+    private LocalDateTime createdAt;
+
+    public Url(String name) {
+        this.name = name;
+    }
+
+    public Url(Long id, String name, LocalDateTime createdAt) {
+        this.id = id;
+        this.name = name;
+        this.createdAt = createdAt;
+    }
 
 }
 
diff --git a/app/src/main/java/hexlet/code/model/UrlCheck.java b/app/src/main/java/hexlet/code/model/UrlCheck.java
@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 @Getter
 @Setter
@@ -14,17 +14,17 @@ public class UrlCheck {
     private String h1;
     private String title;
     private String description;
-    private Timestamp createdAt;
+    private LocalDateTime createdAt;
 
-    public UrlCheck(int statusCode, String h1, String title, String description, Timestamp createdAt) {
+    public UrlCheck(int statusCode, String h1, String title, String description, LocalDateTime createdAt) {
         this.statusCode = statusCode;
         this.h1 = h1;
         this.title = title;
         this.description = description;
         this.createdAt = createdAt;
     }
 
-    public UrlCheck(int statusCode, Timestamp createdAt) {
+    public UrlCheck(int statusCode, LocalDateTime createdAt) {
         this.statusCode = statusCode;
         this.createdAt = createdAt;
     }
diff --git a/app/src/main/java/hexlet/code/repository/UrlCheckRepository.java b/app/src/main/java/hexlet/code/repository/UrlCheckRepository.java
@@ -4,9 +4,15 @@
 
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.time.LocalDateTime;
+
 
 public class UrlCheckRepository extends BaseRepository {
 
@@ -15,12 +21,15 @@ public static void save(UrlCheck urlCheck) throws SQLException {
                 + "VALUES (?, ?, ?, ?, ?, ?)";
         try (var conn = dataSource.getConnection();
              var preparedStatement = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+            if (urlCheck.getCreatedAt() == null) {
+                urlCheck.setCreatedAt(LocalDateTime.now());
+            }
             preparedStatement.setLong(1, urlCheck.getUrlId());
             preparedStatement.setInt(2, urlCheck.getStatusCode());
             preparedStatement.setString(3, urlCheck.getH1());
             preparedStatement.setString(4, urlCheck.getTitle());
             preparedStatement.setString(5, urlCheck.getDescription());
-            preparedStatement.setTimestamp(6, urlCheck.getCreatedAt());
+            preparedStatement.setTimestamp(6, Timestamp.valueOf(urlCheck.getCreatedAt()));
             preparedStatement.executeUpdate();
 
             var generatedKeys = preparedStatement.getGeneratedKeys();
@@ -48,7 +57,7 @@ public static List<UrlCheck> find(Long urlId) throws SQLException {
                 var h1 = resultSet.getString("h1");
                 var title = resultSet.getString("title");
                 var description = resultSet.getString("description");
-                var createdAt = resultSet.getTimestamp("created_at");
+                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
                 var urlCheck = new UrlCheck(statusCode, h1, title, description, createdAt);
                 urlCheck.setId(currentListId);
 
@@ -69,11 +78,43 @@ public static Optional<UrlCheck> findLatestCheck(Long urlId) throws SQLException
 
             if (resultSet.next()) {
                 var statusCode = resultSet.getInt("status_code");
-                var createdAt = resultSet.getTimestamp("created_at");
+                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
                 var check = new UrlCheck(statusCode, createdAt);
                 return Optional.of(check);
             }
             return Optional.empty();
         }
     }
+
+    public static Map<Long, UrlCheck> findLatestChecksByUrlIds(List<Long> urlIds) throws SQLException {
+        if (urlIds.isEmpty()) {
+            return new HashMap<>();
+        }
+        String inClause = urlIds.stream().map(id -> "?").collect(Collectors.joining(", "));
+        String sql = "SELECT DISTINCT ON (url_id) * FROM url_checks WHERE url_id IN (" + inClause + ") ORDER BY url_id, id DESC";
+        try (var conn = dataSource.getConnection();
+             var stmt = conn.prepareStatement(sql)) {
+            int idx = 1;
+            for (Long id : urlIds) {
+                stmt.setLong(idx++, id);
+            }
+            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);
+            }
+            return result;
+        }
+    }
 }
diff --git a/app/src/main/java/hexlet/code/repository/UrlRepository.java b/app/src/main/java/hexlet/code/repository/UrlRepository.java
@@ -8,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.time.LocalDateTime;
+import java.sql.Timestamp;
 
 import static hexlet.code.repository.BaseRepository.dataSource;
 
@@ -19,8 +21,11 @@ public static void  save(Url url) throws SQLException {
         try (var conn = dataSource.getConnection();
              var stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
 
+            if (url.getCreatedAt() == null) {
+                url.setCreatedAt(java.time.LocalDateTime.now());
+            }
             stmt.setString(1, url.getName());
-            stmt.setTimestamp(2, url.getCreatedAt());
+            stmt.setTimestamp(2, Timestamp.valueOf(url.getCreatedAt()));
             stmt.executeUpdate();
 
             var generatedKeys = stmt.getGeneratedKeys();
@@ -117,7 +122,7 @@ public static List<Url> getEntitiesPerPage(int itemsPerPage, int pageNumber) thr
     private static Url getUrl(ResultSet resultSet) throws SQLException {
         var id = resultSet.getLong("id");
         var name = resultSet.getString("name");
-        var createdAt = resultSet.getTimestamp("created_at");
+        var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
         return new Url(id, name, createdAt);
     }
 
diff --git a/app/src/main/resources/templates/urls/index.jte b/app/src/main/resources/templates/urls/index.jte
@@ -2,7 +2,7 @@
 @import hexlet.code.util.NamedRoutes
 @import hexlet.code.dto.urls.UrlsPage
 @import org.apache.commons.lang3.StringUtils
-@import java.text.SimpleDateFormat
+@import java.time.format.DateTimeFormatter
 @param UrlsPage page
 
 @template.layout.page(
@@ -62,7 +62,7 @@ content = @`
 
                                     !{var latestCheck = page.getChecks().get(item);}
                                     @if(latestCheck != null)
-                                        <td>${new SimpleDateFormat("dd/MM/yy HH:mm").format(latestCheck.getCreatedAt())}</td>
+                                        <td>${latestCheck.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yy HH:mm"))}</td>
                                         <td>${latestCheck.getStatusCode()}</td>
                                     @else
                                         <td></td>
@@ -76,7 +76,7 @@ content = @`
 
                     <div class="btn-toolbar position-relative text-light py-6 d-flex justify-content-center" role="toolbar" aria-label="Toolbar with button groups">
                         <div class="btn-group me-2" role="group" aria-label="First group">
-                            @for(int i = 1; i <= page.getPageNumber(); i++)
+                            @for(Integer i : page.getPages())
                                 <a class="btn btn-success opacity-75" href="${NamedRoutes.urlsPath(i)}" role="button">${i}</a>
                             @endfor
                         </div>
diff --git a/app/src/main/resources/templates/urls/show.jte b/app/src/main/resources/templates/urls/show.jte
@@ -1,7 +1,7 @@
 @import hexlet.code.dto.urls.UrlPage
 @import hexlet.code.util.NamedRoutes
 @import org.apache.commons.lang3.StringUtils
-@import java.text.SimpleDateFormat
+@import java.time.format.DateTimeFormatter
 @param UrlPage page
 
 @template.layout.page(
@@ -36,7 +36,7 @@ content = @`
                 </tr>
                 <tr>
                     <th scope="row">Дата добавления</th>
-                    <td>${new SimpleDateFormat("dd/MM/yy HH:mm").format(page.getUrl().getCreatedAt())}</td>
+                    <td>${page.getUrl().getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yy HH:mm"))}</td>
                 </tr>
                 </tbody>
             </table>
@@ -72,7 +72,7 @@ content = @`
                             <td>${check.getH1()}</td>
                             <td>${check.getTitle()}</td>
                             <td>${check.getDescription()}</td>
-                            <td>${new SimpleDateFormat("dd/MM/yy HH:mm").format(check.getCreatedAt())}</td>
+                            <td>${check.getCreatedAt().format(DateTimeFormatter.ofPattern("dd/MM/yy HH:mm"))}</td>
                         </tr>
                     @endfor
                     </tbody>
diff --git a/app/src/test/java/hexlet/code/AppTest.java b/app/src/test/java/hexlet/code/AppTest.java
@@ -16,6 +16,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -122,12 +123,12 @@ void testUrlCheckSuccess() { // camelCase!
             assertThat(check.getH1()).isEqualTo("Hello, world!");
             assertThat(check.getTitle()).isEqualTo("Checking connection");
             assertThat(check.getDescription()).isEqualTo("Test page");
-            assertThat(check.getCreatedAt()).isBeforeOrEqualTo(new Date(System.currentTimeMillis()));
+            assertThat(check.getCreatedAt()).isBeforeOrEqualTo(LocalDateTime.now());
         });
     }
 
     @Test
-    void testUrlCheckFail() { // camelCase!
+    void testUrlCheckFail() {
         JavalinTest.test(app, (server, client) -> {
             var fakeWebsite = "http://localhost:9999";
             client.post("/urls", "url=" + fakeWebsite);

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ public class UrlsPage extends BasePage {`
`17`	`17`	`private List<Url> urls;`
`18`	`18`	`private Map<Url, UrlCheck> checks;`
`19`	`19`	`private int pageNumber;`
	`20`	`+ private List<Integer> pages;`
`20`	`21`	`}`