Save checks for all status codes, including incomplete responses_4

Author: irinakomarchenko

app/readme-resources/img_1.png

@@ -8,10 +8,9 @@
 import io.javalin.http.NotFoundResponse;
 import kong.unirest.Unirest;
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 
 import java.sql.SQLException;
-import java.time.LocalDateTime;
+
 
 public class UrlChecksController {
     public static void check(Context ctx) throws SQLException {
@@ -23,33 +22,43 @@ public static void check(Context ctx) throws SQLException {
 
 
         try {
-            var response = Unirest.get(name).asString();
+            var response = Unirest.get(name)
+                    .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)")
+                    .asString();
+
             int statusCode = response.getStatus();
+            String h1 = "";
+            String title = "";
+            String description = "";
 
             if (statusCode == 200) {
-                Document responseBody = Jsoup.parse(response.getBody());
-
-                String h1 = responseBody.selectFirst("h1") != null
-                        ? responseBody.selectFirst("h1").text() : "";
+                var doc = Jsoup.parse(response.getBody());
+                var h1El = doc.selectFirst("h1");
+                var descEl = doc.selectFirst("meta[name~=(?i)description]");
 
-                String title = responseBody.title();
-
-                String description = !responseBody.select("meta[name=description]").isEmpty()
-                        ? responseBody.select("meta[name=description]").get(0).attr("content") : "";
+                h1 = h1El != null ? h1El.text() : "";
+                title = doc.title();
+                description = descEl != null ? descEl.attr("content") : "";
+            }
 
-                var createdAt = LocalDateTime.now();
+            var check = new UrlCheck(statusCode, h1, title, description);
+            check.setUrlId(urlId);
+            UrlCheckRepository.save(check);
 
-                var urlCheck = new UrlCheck(statusCode, h1, title, description);
-                urlCheck.setUrlId(urlId);
-                UrlCheckRepository.save(urlCheck);
-                System.out.println("[DEBUG] Сохранили новую проверку для urlId=" + urlId);
+            boolean incomplete = statusCode != 200 || title.isEmpty() || h1.isEmpty() || description.isEmpty();
+            if (incomplete) {
+                ctx.sessionAttribute("message", "Проверка выполнена, но не удалось получить все данные "
+                        + "(код " + statusCode + ")");
+            } else {
+                ctx.sessionAttribute("message", "Проверка выполнена успешно (код " + statusCode + ")");
             }
-            ctx.redirect(NamedRoutes.urlPath(urlId));
+
         } catch (Exception e) {
-            ctx.sessionAttribute("message", "Проверка не пройдена");
-            ctx.redirect(NamedRoutes.urlPath(urlId));
+            System.out.println("[ERROR] Проверка не выполнена: " + e.getMessage());
+            ctx.sessionAttribute("message", "Проверка не пройдена: " + e.getMessage());
         }
 
+        ctx.redirect(NamedRoutes.urlPath(urlId));
     }
 }
 

app/readme-resources/img_2.png

@@ -38,9 +38,6 @@ public static void save(UrlCheck urlCheck) throws SQLException {
             preparedStatement.setTimestamp(6, Timestamp.valueOf(urlCheck.getCreatedAt()));
             preparedStatement.executeUpdate();
 
-            int updated = preparedStatement.executeUpdate();
-            System.out.println("[DEBUG] executeUpdate вернул: " + updated);
-
             var generatedKeys = preparedStatement.getGeneratedKeys();
             if (generatedKeys.next()) {
                 urlCheck.setId(generatedKeys.getLong(1));

app/readme-resources/img_3.png

@@ -11,14 +11,32 @@ content = @`
             <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
         </symbol>
     </svg>
-    @if(page.getMessage() != null && page.getMessage().contains("Проверка не пройдена"))
-        <div class="alert alert-danger d-flex align-items-center alert-dismissible fade show m-0" role="alert">
-            <svg class="bi flex-shrink-0 me-2" role="img" aria-label="Danger:"><use xlink:href="#exclamation-triangle-fill"/></svg>
-            <div>
-                ${page.getMessage()}
+    @if(page.getMessage() != null)
+        @if(page.getMessage().contains("не удалось получить все данные"))
+            <div class="alert alert-warning d-flex align-items-center alert-dismissible fade show m-0" role="alert">
+                <svg class="bi flex-shrink-0 me-2" role="img" aria-label="Warning:">
+                    <use xlink:href="#exclamation-triangle-fill" />
+                </svg>
+                <div>${page.getMessage()}</div>
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
+        @elseif(page.getMessage().contains("успешно"))
+            <div class="alert alert-success d-flex align-items-center alert-dismissible fade show m-0" role="alert">
+                <svg class="bi flex-shrink-0 me-2" role="img" aria-label="Success:">
+                    <use xlink:href="#exclamation-triangle-fill" />
+                </svg>
+                <div>${page.getMessage()}</div>
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+            </div>
+        @else
+            <div class="alert alert-danger d-flex align-items-center alert-dismissible fade show m-0" role="alert">
+                <svg class="bi flex-shrink-0 me-2" role="img" aria-label="Danger:">
+                    <use xlink:href="#exclamation-triangle-fill" />
+                </svg>
+                <div>${page.getMessage()}</div>
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+            </div>
+        @endif
     @endif
         <div class="mx-4 mt-4 mb-0">
         <div class="flex-row fs-6">