rework realization of connection between models

Author: walpurr

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

@@ -18,9 +18,7 @@ public static void create(Context ctx) throws SQLException {
         var status = Unirest.get(url.getName())
             .asString()
             .getStatus();
-
         var check = new UrlCheck(status, urlId);
-        url.addCheck(check);
 
         UrlCheckRepository.save(check);
         ctx.redirect(NamedRoutes.urlPath(urlId));

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

@@ -3,6 +3,8 @@
 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;
 import io.javalin.http.Context;
@@ -12,14 +14,21 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
+import java.util.HashMap;
 
 import static io.javalin.rendering.template.TemplateUtil.model;
 
 public class UrlsController {
 
     public static void index(Context ctx) throws SQLException {
         var urls = UrlRepository.getEntities();
-        var page = new UrlsPage(urls);
+        var latestChecks = new HashMap<Long, UrlCheck>();
+
+        for (var check : UrlCheckRepository.getEntities()) {
+            latestChecks.put(check.getUrlId(), check);
+        }
+
+        var page = new UrlsPage(urls, latestChecks);
         page.setFlash(ctx.consumeSessionAttribute("flash"));
         page.setFlashType(ctx.consumeSessionAttribute("flash-type"));
         ctx.render("urls/index.jte", model("page", page));
@@ -28,7 +37,11 @@ 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 page = new UrlPage(url);
+        var checks = UrlCheckRepository.getEntities().stream()
+            .filter(check -> check.getUrlId().equals(id))
+            .toList();
+
+        var page = new UrlPage(url, checks);
         ctx.render("urls/show.jte", model("page", page));
     }
 

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

@@ -2,11 +2,17 @@
 
 import hexlet.code.dto.BasePage;
 import hexlet.code.model.Url;
+import hexlet.code.model.UrlCheck;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
 
 @Getter
+@Setter
 @AllArgsConstructor
 public class UrlPage extends BasePage {
     private Url url;
+    private List<UrlCheck> checks;
 }

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

@@ -2,13 +2,16 @@
 
 import hexlet.code.dto.BasePage;
 import hexlet.code.model.Url;
+import hexlet.code.model.UrlCheck;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.List;
+import java.util.Map;
 
 @Getter
 @AllArgsConstructor
 public class UrlsPage extends BasePage {
     private List<Url> urls;
+    private Map<Long, UrlCheck> latestChecks;
 }

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

@@ -4,8 +4,6 @@
 import lombok.Setter;
 
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
 
 @Getter
 @Setter
@@ -14,8 +12,6 @@ public class Url {
     private String name;
     private Timestamp createdAt;
 
-    private List<UrlCheck> checks;
-
     public Url(String name) {
         this.name = name;
         this.createdAt = new Timestamp(System.currentTimeMillis());
@@ -26,14 +22,4 @@ public Url(Long id, String name, Timestamp createdAt) {
         this.name = name;
         this.createdAt = createdAt;
     }
-
-    public void addCheck(UrlCheck check) {
-
-        if (checks == null) {
-            checks = new ArrayList<>();
-        }
-
-        check.setUrl(this);
-        checks.add(check);
-    }
 }

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

@@ -52,21 +52,19 @@ public static Optional<UrlCheck> find(Long id) throws SQLException {
         }
     }
 
-    public static List<UrlCheck> getChecksByUrlId(Long urlId) throws SQLException {
-        var sql = "SELECT * FROM url_checks WHERE url_id = ?";
+    public static List<UrlCheck> getEntities() throws SQLException {
+        var sql = "SELECT * FROM url_checks";
         try (
             var conn = dataSource.getConnection();
             var stmt = conn.prepareStatement(sql)
         ) {
-            stmt.setLong(1, urlId);
-
             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"))
-                    .urlId(urlId)
+                    .urlId(rs.getLong("url_id"))
                     .createdAt(rs.getTimestamp("created_at"))
                     .build();
                 result.add(check);

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

@@ -24,9 +24,9 @@ content = @`
                 <tr>
                     <td>${url.getId()}</td>
                     <td><a href="${NamedRoutes.urlPath(url.getId())}">${url.getName()}</a></td>
-                    @if (url.getChecks() != null)
-                        <td>${String.valueOf(url.getChecks().getLast().getCreatedAt())}</td>
-                        <td>${url.getChecks().getLast().getStatusCode()}</td>
+                    @if (page.getLatestChecks() != null && page.getLatestChecks().containsKey(url.getId()))
+                        <td>${String.valueOf(page.getLatestChecks().get(url.getId()).getCreatedAt())}</td>
+                        <td>${page.getLatestChecks().get(url.getId()).getStatusCode()}</td>
                     @endif
                 </tr>
             @endfor

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

@@ -26,7 +26,7 @@ content = @`
         <form action="${NamedRoutes.urlChecksPath(page.getUrl().getId())}" method="post">
             <input type="submit" value="Запустить проверку">
         </form>
-        @if (page.getUrl().getChecks() != null)
+        @if (page.getChecks() != null)
             <table>
                 <thead>
                 <tr>
@@ -36,7 +36,7 @@ content = @`
                 </tr>
                 </thead>
                 <tbody>
-                @for (var check : page.getUrl().getChecks())
+                @for (var check : page.getChecks())
                     <tr>
                         <th>${check.getId()}</th>
                         <th>${check.getStatusCode()}</th>