Merge pull request #20 from KAnanev/dev

#19 closed

page_analyzer/services/check_url.py

@@ -1,5 +1,9 @@
 import logging
 
+import requests
+
+from page_analyzer.services.url import URLService
+
 from page_analyzer.models import URLChecks
 from page_analyzer.services.db import PostgresDB
 
@@ -28,6 +32,10 @@ def check(self, url_id):
  return 'Страница успешно проверена', 'success'
  return 'Произошла ошибка при проверке', 'danger'
 
- @staticmethod
- def check_url(url_id):
- return URLChecks(url_id=url_id)
+ def check_url(self, url_id):
+ url_service = URLService(self.db)
+ url = url_service.get_json_by_id(url_id).name
+ if url:
+ request = requests.get(url)
+ if request:
+ return URLChecks(url_id=url_id, status_code=request.status_code)

page_analyzer/services/url.py

@@ -4,12 +4,29 @@
 from page_analyzer.services.db import PostgresDB
 
 GET_ITEMS = """SELECT
- json_build_object(
- 'id', id,
- 'name', name,
- 'created_at', created_at
-) AS result
-FROM urls;"""
+ json_build_object(
+ 'id', urls.id,
+ 'name', urls.name,
+ 'created_at', urls.created_at,
+ 'url_checks', COALESCE(json_agg(json_build_object(
+ 'id', latest_url_checks.id,
+ 'url_id', latest_url_checks.url_id,
+ 'status_code', latest_url_checks.status_code,
+ 'h1', latest_url_checks.h1,
+ 'title', latest_url_checks.title,
+ 'description', latest_url_checks.description,
+ 'created_at', latest_url_checks.created_at
+ )) FILTER (WHERE latest_url_checks.id IS NOT NULL), '[]'::json)
+ ) AS result
+FROM urls
+LEFT JOIN LATERAL (
+ SELECT *
+ FROM url_checks
+ WHERE url_checks.url_id = urls.id
+ ORDER BY url_checks.created_at DESC
+ LIMIT 1
+) AS latest_url_checks ON true
+GROUP BY urls.id;"""
 
 GET_JSON_BY_ID = """SELECT
  json_build_object(
@@ -63,10 +80,11 @@ def get_all_urls(self) -> List[URLModel] | None:
  items = self.db.execute_query(GET_ITEMS, many=True)
  if items:
  sorted_items = sorted(items, key=lambda item: -item['result']['id'])
- items = [URLModel(**item['result']) for item in sorted_items]
+ print(sorted_items)
+ items = [URLSModel(**item['result']) for item in sorted_items]
  return items
 
- def _get_url_id_by_url_name(self, item: URLModel) -> Optional[URLModel]:
+ def get_url_id_by_url_name(self, item: URLModel) -> Optional[URLModel]:
 
  exist_item = self.db.execute_query(GET_JSON_BY_URL, (item.name,), )
  if exist_item:
@@ -79,7 +97,7 @@ def insert_url(self, url: str) -> dict[str, tuple[str, str] | URLModel]:
 
  try:
  item = URLModel(name=url)
- item = self._get_url_id_by_url_name(item)
+ item = self.get_url_id_by_url_name(item)
 
  if item.id:
  message = ('Страница уже существует', 'info')

page_analyzer/templates/urls.html

@@ -23,8 +23,15 @@
  {{ item.name }}
  </a>
  </td>
+ {% if item.url_checks %}
+ {% for url_checks in item.url_checks %}
+ <td>{{ url_checks.created_at }}</td>
+ <td>{{ url_checks.status_code }}</td>
+ {% endfor %}
+ {% else %}
  <td></td>
  <td></td>
+ {% endif %}
  </tr>
  {% endfor %}
  {% endif %}

pyproject.toml

@@ -16,6 +16,7 @@ psycopg-binary = "^3.1.9"
 psycopg-c = "^3.1.9"
 psycopg = "^3.1.9"
 pydantic = "^2.0"
+requests = "^2.31.0"
 
 
 [tool.poetry.group.dev.dependencies]

tests/test_url_service.py

@@ -46,11 +46,11 @@ def test__get_url_id_by_url_name(app):
  db = get_db()
  url_service = URLService(db=db)
  item = URLModel(name='https://chatbot.theb.ai')
- data = url_service._get_url_id_by_url_name(item)
+ data = url_service.get_url_id_by_url_name(item)
  assert not data.id
 
  item = URLModel(name='http:https://www.ya.ru/')
- data = url_service._get_url_id_by_url_name(item)
+ data = url_service.get_url_id_by_url_name(item)
  assert data.id