fix

Author: sgmdlt

Dockerfile

@@ -4,10 +4,6 @@ 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 make install

Makefile

@@ -9,35 +9,27 @@ dev:
 run:
 	uv run uvicorn --workers 4 --host 0.0.0.0 --port $(PORT) app.server:app
 
-start:
-	make stop rm || true
-	docker run -p $(PORT):$(PORT) data-charts-api make run
-
 build:
 	docker build . --tag=data-charts-api
 
+start:
+	-docker stop data-charts-api || true
+	-docker rm data-charts-api || true
+	docker run -d --name data-charts-api -p $(PORT):$(PORT) data-charts-api
+
 stop:
-	docker stop data-charts-api
+	-docker stop data-charts-api || true
 
 rm:
-	docker rm data-charts-api
+	-docker rm data-charts-api || true
 
 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; \
-	sleep 1; \
-	exit $$status
+	uv run pytest
 
 lint:
 	uv run ruff check .
 
-check: test lint
+check: lint

app/server.py

@@ -2,51 +2,50 @@
 import os
 from contextlib import asynccontextmanager
 from datetime import datetime
-from typing import List
 
 import asyncpg
 from dotenv import load_dotenv
 from fastapi import Depends, FastAPI, HTTPException, Query
 
 load_dotenv()
 
-DATABASE_URL = "postgres://student:[email protected]:5432/chartsdb"
+DATABASE_URL = os.getenv('DATABASE_URL')
 
-# Менеджер контекста для подключения к БД
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    # Создаем пул соединений при старте
     app.state.pool = await asyncpg.create_pool(
         DATABASE_URL,
         min_size=5,
         max_size=20
     )
     yield
-    # Закрываем пул при выключении
     await app.state.pool.close()
 
 app = FastAPI(lifespan=lifespan)
 
-# Зависимость для получения соединения с БД
 async def get_db():
     async with app.state.pool.acquire() as conn:
         yield conn
 
+
 @app.get("/")
 async def index():
     return {"status": "It Works"}
 
+
 @app.get("/visits")
 async def get_visits(
-    begin: datetime = Query(..., description="Start date in ISO format"),
-    end: datetime = Query(..., description="End date in ISO format"),
+    begin: str = Query(..., description="Start date in ISO format"),
+    end: str = Query(..., description="End date in ISO format"),
     db = Depends(get_db)
 ):
+    begin = datetime.fromisoformat(begin)
+    end = datetime.fromisoformat(end)
     try:
         query = """
             SELECT *
             FROM visits
-            WHERE visits.datetime BETWEEN $1 AND $2;
+            WHERE visits.datetime BETWEEN $1 AND $2
         """
         records = await db.fetch(query, begin, end)
         return records
@@ -59,15 +58,17 @@ async def get_visits(
 
 @app.get("/registrations")
 async def get_registrations(
-    begin: datetime = Query(..., description="Start date in ISO format"),
-    end: datetime = Query(..., description="End date in ISO format"),
+    begin: str = Query(..., description="Start date in ISO format"),
+    end: str = Query(..., description="End date in ISO format"),
     db = Depends(get_db)
 ):
+    begin = datetime.fromisoformat(begin)
+    end = datetime.fromisoformat(end)
     try:
         query = """
             SELECT *
             FROM registrations
-            WHERE registrations.datetime BETWEEN $1 AND $2;
+            WHERE registrations.datetime BETWEEN $1 AND $2
         """
         records = await db.fetch(query, begin, end)
         return records

pyproject.toml

@@ -19,10 +19,3 @@ dev-dependencies = [
     "requests>=2.32.3",
     "ruff>=0.7.2",
 ]
-
-[tool.hatch.build.targets.wheel]
-packages = ["app"]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"