Fix: After the first review

VictorGotsenko · VictorGotsenko · commit 25e0a0056fa7 · 2025-07-16T14:47:39.000+05:00
diff --git a/Makefile b/Makefile
@@ -1,4 +1,3 @@
-.PHONY: build
 .DEFAULT_GOAL := build-run
 
 clean:
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 ### Hexlet tests and linter status:
 [![Actions Status](https://github.com/VictorGotsenko/java-project-72/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/VictorGotsenko/java-project-72/actions)
 [![Page Validator](https://github.com/VictorGotsenko/java-project-72/actions/workflows/JavaCI.yml/badge.svg)](https://github.com/VictorGotsenko/java-project-72/actions/workflows/JavaCI.yml)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=VictorGotsenko_java-project-72&metric=coverage)](https://sonarcloud.io/summary/new_code?id=VictorGotsenko_java-project-72)
 ## Description
 #### Application for analyzing links for SEO suitability, is enable on <a href="https://pagesanalyzer.onrender.com" target="_blank">Link Page Analyzer</a>
 Приложение – сайт, который анализирует указанные страницы на SEO пригодность.
diff --git a/app/Makefile b/app/Makefile
@@ -1,4 +1,3 @@
-.PHONY: build
 .DEFAULT_GOAL := build-run
 
 clean:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,7 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("java")
     application
     checkstyle
     jacoco
diff --git a/app/src/main/java/hexlet/code/controller/UrlCheckController.java b/app/src/main/java/hexlet/code/controller/UrlCheckController.java
@@ -48,9 +48,9 @@ public static void check(Context ctx) throws SQLException {
             String title = document.title();
             String h1 = document.select("h1").text();
             String description = document.select("meta[name=description]").attr("content");
-            LocalDateTime createdAt = LocalDateTime.now();
 
-            UrlCheck urlCheck = new UrlCheck(statusCode, title, h1, description, urlId, createdAt);
+            UrlCheck urlCheck = new UrlCheck(statusCode, title, h1, description, urlId);
+            urlCheck.setCreatedAt(LocalDateTime.now());
             log.info("urlCheck created");
             UrlCheckRepository.save(urlCheck);
             log.info("check saved");
diff --git a/app/src/main/java/hexlet/code/controller/UrlController.java b/app/src/main/java/hexlet/code/controller/UrlController.java
@@ -76,7 +76,8 @@ public static void create(Context ctx) throws SQLException, URISyntaxException,
         URL url = new URIBuilder().setScheme(protocol).setHost(host).setPort(port).build().toURL();
 
         if (UrlRepository.findByName(String.valueOf(url)).isEmpty()) {
-            Url newUrl = new Url(String.valueOf(url), LocalDateTime.now());
+            Url newUrl = new Url(String.valueOf(url));
+            newUrl.setCreatedAt(LocalDateTime.now());
             UrlRepository.save(newUrl);
         } else {
             ctx.sessionAttribute(FLASH, PAGE_EXIST);
@@ -92,7 +93,7 @@ public static void create(Context ctx) throws SQLException, URISyntaxException,
 
     public static void index(Context ctx) throws SQLException {
         List<Url> urls = UrlRepository.getEntities();
-        Map<Long, UrlCheck> latestChecks = UrlCheckRepository.getLastestChecks();
+        Map<Long, UrlCheck> latestChecks = UrlCheckRepository.getLatestChecks();
 
         UrlsPage page = new UrlsPage(urls, latestChecks);
         page.setFlash(ctx.consumeSessionAttribute(FLASH));
diff --git a/app/src/main/java/hexlet/code/model/Url.java b/app/src/main/java/hexlet/code/model/Url.java
@@ -17,9 +17,8 @@ public class Url {
     private LocalDateTime createdAt;
     private List<UrlCheck> urlCheckList;
 
-    public Url(String name, LocalDateTime createdAt) {
+    public Url(String name) {
         this.name = name;
-        this.createdAt = createdAt;
         this.urlCheckList = new ArrayList<>();
     }
 }
diff --git a/app/src/main/java/hexlet/code/model/UrlCheck.java b/app/src/main/java/hexlet/code/model/UrlCheck.java
@@ -16,12 +16,11 @@ public class UrlCheck {
     private Long urlId;
     private LocalDateTime createdAt;
 
-    public UrlCheck(int statusCode, String title, String h1, String description, Long urlId, LocalDateTime createdAt) {
+    public UrlCheck(int statusCode, String title, String h1, String description, Long urlId) {
         this.urlId = urlId;
         this.title = title;
         this.h1 = h1;
         this.description = description;
         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
@@ -60,8 +60,8 @@ public static List<UrlCheck> findById(Long urlId) throws SQLException {
                         resultSet.getString("title"),
                         resultSet.getString("h1"),
                         resultSet.getString("description"),
-                        urlId,
-                        resultSet.getTimestamp("created_at").toLocalDateTime());
+                        urlId);
+                urlCheck.setCreatedAt(resultSet.getTimestamp("created_at").toLocalDateTime());
                 urlCheck.setId(resultSet.getLong("id"));
                 result.add(urlCheck);
             }
@@ -72,7 +72,7 @@ public static List<UrlCheck> findById(Long urlId) throws SQLException {
         return result;
     }
 
-    public static Map<Long, UrlCheck> getLastestChecks() throws SQLException {
+    public static Map<Long, UrlCheck> getLatestChecks() throws SQLException {
         Map<Long, UrlCheck> result = new HashMap<>();
         String sql = "SELECT DISTINCT ON (url_id) * from url_checks order by url_id DESC, id DESC";
         try (Connection conn = BaseRepository.getDataSource().getConnection();
@@ -84,13 +84,13 @@ public static Map<Long, UrlCheck> getLastestChecks() throws SQLException {
                         resultSet.getString("title"),
                         resultSet.getString("h1"),
                         resultSet.getString("description"),
-                        resultSet.getLong("url_id"),
-                        resultSet.getTimestamp("created_at").toLocalDateTime());
+                        resultSet.getLong("url_id"));
+                urlCheck.setCreatedAt(resultSet.getTimestamp("created_at").toLocalDateTime());
                 urlCheck.setId(resultSet.getLong("id"));
                 result.put(resultSet.getLong("url_id"), urlCheck);
             }
         } catch (SQLException e) {
-            log.info("Error in UrlCheckRepository.getLastestChecks ", e);
+            log.info("Error in UrlCheckRepository.getLatestChecks ", e);
             e.printStackTrace();
         }
         return result;
diff --git a/app/src/main/java/hexlet/code/repository/UrlRepository.java b/app/src/main/java/hexlet/code/repository/UrlRepository.java
@@ -43,9 +43,8 @@ public static Optional<Url> find(Long id) throws SQLException {
             preparedStatement.setLong(1, id);
             ResultSet resultSet = preparedStatement.executeQuery();
             if (resultSet.next()) {
-                Url url = new Url(
-                        resultSet.getString("name"),
-                        resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
+                Url url = new Url(resultSet.getString("name"));
+                url.setCreatedAt(resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
                 url.setId(id);
                 return Optional.of(url);
             }
@@ -60,9 +59,8 @@ public static Optional<Url> findByName(String name) throws SQLException {
             preparedStatement.setString(1, name);
             ResultSet resultSet = preparedStatement.executeQuery();
             if (resultSet.next()) {
-                Url url = new Url(
-                        name,
-                        resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
+                Url url = new Url(resultSet.getString("name"));
+                url.setCreatedAt(resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
                 url.setId(resultSet.getLong("id"));
                 return Optional.of(url);
             }
@@ -78,9 +76,8 @@ public static List<Url> getEntities() throws SQLException {
             ResultSet resultSet = preparedStatement.executeQuery();
             List<Url> result = new ArrayList<>();
             while (resultSet.next()) {
-                Url url = new Url(
-                        resultSet.getString("name"),
-                        resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
+                Url url = new Url(resultSet.getString("name"));
+                url.setCreatedAt(resultSet.getTimestamp(FIELD_CREATED_AT).toLocalDateTime());
                 url.setId(resultSet.getLong("id"));
                 result.add(url);
             }
diff --git a/app/src/test/java/hexlet/code/AppTest.java b/app/src/test/java/hexlet/code/AppTest.java
@@ -1,6 +1,8 @@
 package hexlet.code;
 
 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;
@@ -20,6 +22,7 @@
 import java.nio.file.Paths;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -67,7 +70,8 @@ void testMainPage() {
     //save URL in BD
     @Test
     void testUrlSave() throws SQLException {
-        Url url = new Url("https://mail.ru/", LocalDateTime.now());
+        Url url = new Url("https://mail.ru/");
+        url.setCreatedAt(LocalDateTime.now());
         UrlRepository.save(url);
         JavalinTest.test(app, (server, client) -> {
             Response response = client.get("/urls/" + url.getId());
@@ -108,14 +112,22 @@ void testAllUrls() {
     @Test
     void testCheck() throws SQLException {
         String mockUrl = mockServer.url("/").toString();
-        Url url = new Url(mockUrl, LocalDateTime.now());
+        Url url = new Url(mockUrl);
+        url.setCreatedAt(LocalDateTime.now());
         UrlRepository.save(url);
 
         JavalinTest.test(app, (server, client) -> {
             Url savedUrl = UrlRepository.findByName(mockServer.url("/").toString()).orElseThrow();
             Response response = client.post(NamedRoutes.urlPathForChecks(savedUrl.getId()));
             assertThat(response.code()).isEqualTo(200);
+            List<UrlCheck> urlCheckList = UrlCheckRepository.findById(savedUrl.getId());
+            assertThat(!urlCheckList.isEmpty());
         });
     }
 
+    @Test
+    void testNoExistEntry() throws SQLException {
+        Optional<Url> url = UrlRepository.find(999L);
+        assertThat(url.isEmpty());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-.PHONY: build`
`2`	`1`	`.DEFAULT_GOAL := build-run`
`3`	`2`
`4`	`3`	`clean:`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ public class Url {`
`17`	`17`	`private LocalDateTime createdAt;`
`18`	`18`	`private List<UrlCheck> urlCheckList;`
`19`	`19`
`20`		`- public Url(String name, LocalDateTime createdAt) {`
	`20`	`+ public Url(String name) {`
`21`	`21`	`this.name = name;`
`22`		`- this.createdAt = createdAt;`
`23`	`22`	`this.urlCheckList = new ArrayList<>();`
`24`	`23`	`}`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,11 @@ public class UrlCheck {`
`16`	`16`	`private Long urlId;`
`17`	`17`	`private LocalDateTime createdAt;`
`18`	`18`
`19`		`- public UrlCheck(int statusCode, String title, String h1, String description, Long urlId, LocalDateTime createdAt) {`
	`19`	`+ public UrlCheck(int statusCode, String title, String h1, String description, Long urlId) {`
`20`	`20`	`this.urlId = urlId;`
`21`	`21`	`this.title = title;`
`22`	`22`	`this.h1 = h1;`
`23`	`23`	`this.description = description;`
`24`	`24`	`this.statusCode = statusCode;`
`25`		`- this.createdAt = createdAt;`
`26`	`25`	`}`
`27`	`26`	`}`