add tests

Author: sgmdlt

Dockerfile

@@ -1,12 +1,15 @@
-FROM python:slim
+FROM python:3.12-slim
 
-RUN apt-get update && apt-get install -yqq make
-RUN pip install poetry
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+RUN apt-get update && \
+    apt-get install -y make && \
+    pip install uv
 
+ENV UV_LINK_MODE=copy
+ENV UV_COMPILE_BYTECODE=1
+RUN --mount=type=cache,target=/root/.cache/uv
 
 WORKDIR /app
 COPY . .
-RUN poetry install
+RUN make install
 
 CMD ["make", "run"]

Makefile

@@ -1,13 +1,13 @@
 PORT ?= 4000
 
 install:
-	poetry install
+	uv sync
 
 dev:
-	poetry run flask  --app app.server run --debug -h 0.0.0.0 -p $(PORT)
+	uv run flask --app app.server run --debug -h 0.0.0.0 -p $(PORT)
 
 run:
-	poetry run gunicorn -w 4 -b 0.0.0.0:$(PORT) app.server:app
+	uv run gunicorn -w 4 -b 0.0.0.0:$(PORT) app.server:app
 
 start:
 	make stop rm || true
@@ -24,3 +24,19 @@ rm:
 
 bash:
 	docker run --rm -it data-charts-api bash
+
+PID_FILE = server.pid
+
+test:
+	env PORT=$(PORT) DATABASE_URL=postgres://student:[email protected]:5432/chartsdb \
+	make dev & echo $$! > $(PID_FILE) && \
+	sleep 2 && \
+	uv run pytest; \
+	status=$$?; \
+	if [ -f $(PID_FILE) ]; then kill `cat $(PID_FILE)` && rm $(PID_FILE); fi; \
+	exit $$status
+
+lint:
+	uv run ruff check .
+
+check: test lint

app/__init__.py

@@ -1,12 +1,12 @@
-from flask import Flask, request
-from datetime import datetime
 import logging
-import traceback
 import os
-import psycopg
-from psycopg.rows import dict_row
+import traceback
+from datetime import datetime
 
+import psycopg
 from dotenv import load_dotenv
+from flask import Flask, request
+from psycopg.rows import dict_row
 
 load_dotenv()
 

app/server.py

@@ -1,17 +1,26 @@
-[tool.poetry]
-name = "app"
+[project]
+name = "data-charts-api"
 version = "0.1.0"
-description = ""
-authors = ["Your Name <[email protected]>"]
+description = "api for data charts project"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "flask>=3.0.3",
+    "gunicorn>=23.0.0",
+    "psycopg>=3.2.3",
+    "python-dotenv>=1.0.1",
+]
 
-[tool.poetry.dependencies]
-python = "^3.10"
-flask = "^3.0.0"
-gunicorn = "^21.2.0"
-python-dotenv = "^1.0.0"
-psycopg = {extras = ["binary"], version = "^3.1.13"}
+[tool.uv]
+dev-dependencies = [
+    "pytest>=8.3.3",
+    "requests>=2.32.3",
+    "ruff>=0.7.2",
+]
 
+[tool.hatch.build.targets.wheel]
+packages = ["app"]
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"

docker-compose.yml

@@ -0,0 +1 @@
+170353

poetry.lock

@@ -0,0 +1,63 @@
+import sqlite3
+from datetime import datetime, timedelta
+
+import pytest
+
+from app.server import app
+
+
+def dict_factory(cursor, row):
+    """Преобразует результаты SQLite в словарь"""
+    d = {}
+    for idx, col in enumerate(cursor.description):
+        d[col[0]] = row[idx]
+    return d
+
+@pytest.fixture
+def client():
+    """Фикстура для тестового клиента с SQLite в памяти"""
+    # Создаем in-memory SQLite базу
+    db = sqlite3.connect(':memory:', detect_types=sqlite3.PARSE_DECLTYPES)
+    db.row_factory = dict_factory
+
+    # Создаем схему
+    with db.cursor() as cur:
+        cur.execute("""
+            CREATE TABLE visits (
+                id INTEGER PRIMARY KEY,
+                datetime TIMESTAMP NOT NULL
+                -- добавьте остальные поля
+            )
+        """)
+
+        cur.execute("""
+            CREATE TABLE registrations (
+                id INTEGER PRIMARY KEY,
+                datetime TIMESTAMP NOT NULL
+                -- добавьте остальные поля
+            )
+        """)
+
+        # Добавляем тестовые данные
+        cur.execute("""
+            INSERT INTO visits (datetime) VALUES
+            (?), (?)
+        """, (datetime.now(), datetime.now() - timedelta(days=1)))
+
+        cur.execute("""
+            INSERT INTO registrations (datetime) VALUES
+            (?)
+        """, (datetime.now(),))
+
+        db.commit()
+
+    # Подменяем подключение к БД в приложении
+    def get_test_db():
+        return db
+
+    app.get_db = get_test_db
+
+    with app.test_client() as client:
+        yield client
+
+    db.close()

pyproject.toml

@@ -0,0 +1,19 @@
+import os
+
+import requests
+
+PORT = os.getenv('PORT')
+
+def test_server():
+    response = requests.get('http://localhost:4000/')
+    assert response.status_code == 200
+    assert response.text == 'It Works'
+
+    response = requests.get('http://localhost:4000/visits?begin=2023-03-01&end=2023-03-02')
+    assert response.status_code == 200
+    assert response.json()[0] == {
+        "datetime": "Wed, 01 Mar 2023 10:36:22 GMT",
+        "platform": "web",
+        "user_agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.6",
+        "visit_id": "1de9ea66-70d3-4a1f-8735-df5ef7697fb9"
+    }