This commit is contained in:
@@ -26,15 +26,15 @@ test-persistence:
|
||||
$(PYTHON) tests/resilience.py --mode persistence --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
||||
|
||||
explain-10k:
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222' ORDER BY created_at, id LIMIT 50;"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222' ORDER BY created_at, id LIMIT 50 OFFSET 0;"
|
||||
|
||||
explain-composite:
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50;" | tee evidence/explain_composite.txt
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50 OFFSET 0;" | tee evidence/explain_composite.txt
|
||||
|
||||
explain-simple:
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "DROP INDEX IF EXISTS ix_messages_chat_created_id;"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "CREATE INDEX ix_messages_chat_only ON messages (chat_id); ANALYZE messages;"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50;" | tee evidence/explain_simple.txt
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50 OFFSET 0;" | tee evidence/explain_simple.txt
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "DROP INDEX ix_messages_chat_only;"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "CREATE INDEX ix_messages_chat_created_id ON messages (chat_id, created_at, id);"
|
||||
|
||||
@@ -50,4 +50,36 @@ backup-restore:
|
||||
@echo "В основной базе messenger_db:"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -t -c "SELECT count(*) FROM messages;"
|
||||
@echo "В восстановленной базе messenger_restore:"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_restore -t -c "SELECT count(*) FROM messages;" messenger -d messenger_restore -t -c "SELECT count(*) FROM messages;"
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_restore -t -c "SELECT count(*) FROM messages;"
|
||||
|
||||
test-race:
|
||||
@echo "Запускаем два одновременных запроса на регистрацию"
|
||||
@RACE_USER="race_$$(date +%s)"; \
|
||||
curl -s -o /dev/null -w "Запрос 1: %{http_code}\n" -X POST http://localhost:8080/api/v1/users -H "Content-Type: application/json" -d "{\"username\": \"$$RACE_USER\", \"display_name\": \"Race\", \"password\": \"secret1234567\"}" & \
|
||||
curl -s -o /dev/null -w "Запрос 2: %{http_code}\n" -X POST http://localhost:8080/api/v1/users -H "Content-Type: application/json" -d "{\"username\": \"$$RACE_USER\", \"display_name\": \"Race\", \"password\": \"secret1234567\"}" & \
|
||||
wait
|
||||
|
||||
test-redis:
|
||||
@echo "Ставим Redis на паузу"
|
||||
docker pause mtusi_messenger_redis
|
||||
@echo "Запрос"
|
||||
time curl -s -w "\nHTTP Статус: %{http_code}\n" http://localhost:8080/api/v1/users/me -H "Authorization: Bearer test_token"
|
||||
@echo "Снимаем паузу"
|
||||
docker unpause mtusi_messenger_redis
|
||||
|
||||
test-health-db:
|
||||
@echo "Останавливаем БД"
|
||||
docker compose stop db
|
||||
@echo "Проверяем health ready"
|
||||
curl -s -o /dev/null -w "HTTP Статус: %{http_code}\n" http://localhost:8080/health/ready
|
||||
docker compose start db
|
||||
|
||||
test-health-redis:
|
||||
@echo "Останавливаем"
|
||||
docker compose stop redis
|
||||
@echo "Проверяем health ожидая 503 "
|
||||
curl -s -o /dev/null -w "HTTP Статус: %{http_code}\n" http://localhost:8080/health/ready
|
||||
docker compose start redis
|
||||
|
||||
test-resilience:
|
||||
$(PYTHON) -m pytest tests/test_resilience.py -v
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
- Автор, группа: Долда Кирилл, БПИ2301
|
||||
- Целевая оценка: 5
|
||||
- Commit/PR: TODO после публикации
|
||||
- Использованные источники, библиотеки и помощь ИИ: FastAPI, SQLAlchemy, asyncpg, Alembic, passlib[bcrypt], redis, psycopg2-binary
|
||||
|
||||
## Запуск из чистого clone
|
||||
@@ -54,6 +53,13 @@ make explain-simple
|
||||
|
||||
Результаты выполнения в папке evidence
|
||||
|
||||
|
||||
Заходим интерактивно в БД:
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db
|
||||
|
||||
Тест с LIMIT 50:
|
||||
EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50 OFFSET 0;
|
||||
|
||||
## Тесты
|
||||
|
||||
make test
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
"""seed explain test 10k
|
||||
|
||||
Revision ID: 509b7b85e81f
|
||||
Revises: 9f0905ee61f9
|
||||
Create Date: 2026-10-23 10:19:10.693752
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = '509b7b85e81f'
|
||||
down_revision: Union[str, None] = '9f0905ee61f9'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("""
|
||||
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||
VALUES ('11111111-1111-1111-1111-111111111111', 'explain_test', 'Test', 'hash', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO chats (id, title, created_at)
|
||||
VALUES ('22222222-2222-2222-2222-222222222222', 'Explain Chat', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT
|
||||
gen_random_uuid(),
|
||||
'22222222-2222-2222-2222-222222222222',
|
||||
'11111111-1111-1111-1111-111111111111',
|
||||
'Message ' || i,
|
||||
NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("DELETE FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222';")
|
||||
op.execute("DELETE FROM chats WHERE id = '22222222-2222-2222-2222-222222222222';")
|
||||
op.execute("DELETE FROM users WHERE id = '11111111-1111-1111-1111-111111111111';")
|
||||
@@ -1,70 +0,0 @@
|
||||
"""seed load test data
|
||||
|
||||
Revision ID: 9f0905ee61f9
|
||||
Revises: d3ba2cff7625
|
||||
Create Date: 2026-10-23 10:08:32.985236
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = '9f0905ee61f9'
|
||||
down_revision: Union[str, None] = 'd3ba2cff7625'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("""
|
||||
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||
VALUES ('55555555-5555-4555-8555-555555555555', 'load_test', 'Load', 'hash', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO chats (id, title, created_at) VALUES
|
||||
('66666666-6666-4666-8666-666666666666', 'Big Chat', NOW()),
|
||||
('77777777-7777-4777-8777-777777777777', 'Small Chat 1', NOW()),
|
||||
('88888888-8888-4888-8888-888888888888', 'Small Chat 2', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '66666666-6666-4666-8666-666666666666', '55555555-5555-4555-8555-555555555555', 'Big ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 80000) AS i;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '77777777-7777-4777-8777-777777777777', '55555555-5555-4555-8555-555555555555', 'Small1 ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '88888888-8888-4888-8888-888888888888', '55555555-5555-4555-8555-555555555555', 'Small2 ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("""
|
||||
DELETE FROM messages WHERE chat_id IN (
|
||||
'66666666-6666-4666-8666-666666666666',
|
||||
'77777777-7777-4777-8777-777777777777',
|
||||
'88888888-8888-4888-8888-888888888888'
|
||||
);
|
||||
""")
|
||||
op.execute("""
|
||||
DELETE FROM chats WHERE id IN (
|
||||
'66666666-6666-4666-8666-666666666666',
|
||||
'77777777-7777-4777-8777-777777777777',
|
||||
'88888888-8888-4888-8888-888888888888'
|
||||
);
|
||||
""")
|
||||
op.execute("DELETE FROM users WHERE id = '55555555-5555-4555-8555-555555555555';")
|
||||
@@ -0,0 +1,67 @@
|
||||
"""create tables
|
||||
|
||||
Revision ID: b24373e3b620
|
||||
Revises:
|
||||
Create Date: 2026-10-24 06:54:22.471827
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = 'b24373e3b620'
|
||||
down_revision: Union[str, None] = None
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('chats',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('title', sa.String(length=100), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_table('users',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('username', sa.String(length=32), nullable=False),
|
||||
sa.Column('display_name', sa.String(length=100), nullable=False),
|
||||
sa.Column('password_hash', sa.String(length=255), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
|
||||
op.create_table('chat_members',
|
||||
sa.Column('chat_id', sa.UUID(), nullable=False),
|
||||
sa.Column('user_id', sa.UUID(), nullable=False),
|
||||
sa.ForeignKeyConstraint(['chat_id'], ['chats.id'], ondelete='CASCADE'),
|
||||
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('chat_id', 'user_id')
|
||||
)
|
||||
op.create_table('messages',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('chat_id', sa.UUID(), nullable=False),
|
||||
sa.Column('sender_id', sa.UUID(), nullable=False),
|
||||
sa.Column('text', sa.Text(), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||
sa.ForeignKeyConstraint(['chat_id'], ['chats.id'], ondelete='CASCADE'),
|
||||
sa.ForeignKeyConstraint(['sender_id'], ['users.id'], ondelete='CASCADE'),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
op.create_index('ix_messages_chat_created_id', 'messages', ['chat_id', 'created_at', 'id'], unique=False)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_index('ix_messages_chat_created_id', table_name='messages')
|
||||
op.drop_table('messages')
|
||||
op.drop_table('chat_members')
|
||||
op.drop_index(op.f('ix_users_username'), table_name='users')
|
||||
op.drop_table('users')
|
||||
op.drop_table('chats')
|
||||
# ### end Alembic commands ###
|
||||
@@ -0,0 +1,43 @@
|
||||
"""seed explain test 10k
|
||||
|
||||
Revision ID: bc35c1b6b748
|
||||
Revises: f9b85be2b710
|
||||
Create Date: 2026-10-24 07:04:09.294404
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = 'bc35c1b6b748'
|
||||
down_revision: Union[str, None] = 'f9b85be2b710'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("""
|
||||
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||
VALUES ('11111111-1111-1111-1111-111111111111', 'explain_test', 'Test', 'hash', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO chats (id, title, created_at)
|
||||
VALUES ('22222222-2222-2222-2222-222222222222', 'Explain Chat', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '22222222-2222-2222-2222-222222222222', '11111111-1111-1111-1111-111111111111', 'Message ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("DELETE FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222';")
|
||||
op.execute("DELETE FROM chats WHERE id = '22222222-2222-2222-2222-222222222222';")
|
||||
op.execute("DELETE FROM users WHERE id = '11111111-1111-1111-1111-111111111111';")
|
||||
@@ -1,30 +0,0 @@
|
||||
"""create tables
|
||||
|
||||
Revision ID: d3ba2cff7625
|
||||
Revises:
|
||||
Create Date: 2026-10-23 10:07:55.443651
|
||||
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = 'd3ba2cff7625'
|
||||
down_revision: Union[str, None] = None
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
pass
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
pass
|
||||
# ### end Alembic commands ###
|
||||
@@ -0,0 +1,69 @@
|
||||
"""seed load test data
|
||||
|
||||
Revision ID: f9b85be2b710
|
||||
Revises: b24373e3b620
|
||||
Create Date: ...
|
||||
"""
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = 'f9b85be2b710'
|
||||
down_revision: Union[str, None] = 'b24373e3b620'
|
||||
branch_labels: Union[str, Sequence[str], None] = None
|
||||
depends_on: Union[str, Sequence[str], None] = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
op.execute("""
|
||||
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||
VALUES ('55555555-5555-4555-8555-555555555555', 'load_test', 'Load', 'hash', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO chats (id, title, created_at) VALUES
|
||||
('66666666-6666-4666-8666-666666666666', 'Big Chat', NOW()),
|
||||
('77777777-7777-4777-8777-777777777777', 'Small Chat 1', NOW()),
|
||||
('88888888-8888-4888-8888-888888888888', 'Small Chat 2', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '66666666-6666-4666-8666-666666666666', '55555555-5555-4555-8555-555555555555', 'Big ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 80000) AS i;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '77777777-7777-4777-8777-777777777777', '55555555-5555-4555-8555-555555555555', 'Small1 ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
op.execute("""
|
||||
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||
SELECT gen_random_uuid(), '88888888-8888-4888-8888-888888888888', '55555555-5555-4555-8555-555555555555', 'Small2 ' || i, NOW() - (i || ' minutes')::interval
|
||||
FROM generate_series(1, 10000) AS i;
|
||||
""")
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
op.execute("""
|
||||
DELETE FROM messages WHERE chat_id IN (
|
||||
'66666666-6666-4666-8666-666666666666',
|
||||
'77777777-7777-4777-8777-777777777777',
|
||||
'88888888-8888-4888-8888-888888888888'
|
||||
);
|
||||
""")
|
||||
op.execute("""
|
||||
DELETE FROM chats WHERE id IN (
|
||||
'66666666-6666-4666-8666-666666666666',
|
||||
'77777777-7777-4777-8777-777777777777',
|
||||
'88888888-8888-4888-8888-888888888888'
|
||||
);
|
||||
""")
|
||||
op.execute("DELETE FROM users WHERE id = '55555555-5555-4555-8555-555555555555';")
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
|
||||
from app.config import DATABASE_URL
|
||||
|
||||
engine = create_async_engine( #
|
||||
engine = create_async_engine(
|
||||
DATABASE_URL,
|
||||
pool_size=5,
|
||||
max_overflow=10,
|
||||
|
||||
+4
-1
@@ -31,4 +31,7 @@ async def http_exception_handler(request: Request, exc: HTTPException):
|
||||
|
||||
|
||||
async def validation_exception_handler(request: Request, exc: RequestValidationError):
|
||||
return error_response(request, 400, "invalid_request", "Ошибка валидации данных")
|
||||
return error_response(request, 400, "invalid_request", "Ошибка валидации данных")
|
||||
|
||||
async def internal_error_handler(request: Request, exc: Exception):
|
||||
return error_response(request, 500, "internal_error", "Внутренняя ошибка сервера")
|
||||
+6
-1
@@ -1,4 +1,9 @@
|
||||
import redis.asyncio as redis
|
||||
from app.config import REDIS_URL
|
||||
|
||||
redis_client = redis.from_url(REDIS_URL, decode_responses=True)
|
||||
redis_client = redis.from_url(
|
||||
REDIS_URL,
|
||||
decode_responses=True,
|
||||
socket_timeout=3,
|
||||
socket_connect_timeout=3,
|
||||
)
|
||||
+13
-2
@@ -1,4 +1,8 @@
|
||||
from fastapi import APIRouter
|
||||
from fastapi import HTTPException
|
||||
from sqlalchemy import text
|
||||
from app.database import async_session_maker
|
||||
from app.redis_client import redis_client
|
||||
|
||||
|
||||
router = APIRouter(tags=["health"])
|
||||
@@ -10,9 +14,16 @@ def live():
|
||||
|
||||
|
||||
@router.get("/health/ready")
|
||||
def ready():
|
||||
return {"status": "ok"}
|
||||
async def ready():
|
||||
try:
|
||||
async with async_session_maker() as session:
|
||||
await session.execute(text("SELECT 1"))
|
||||
|
||||
await redis_client.ping()
|
||||
|
||||
return {"status": "ok"}
|
||||
except Exception:
|
||||
raise HTTPException(status_code=503, detail="unavailable")
|
||||
|
||||
@router.get("/")
|
||||
def home():
|
||||
|
||||
+11
-3
@@ -10,7 +10,6 @@ from app.models.chat import Chat, ChatMember
|
||||
from app.models.user import User
|
||||
from app.security import get_current_user
|
||||
from app.dependencies import get_session
|
||||
from app.pagination import paginate
|
||||
|
||||
router = APIRouter(prefix="/api/v1/chats/{chat_id}/messages", tags=["messages"])
|
||||
|
||||
@@ -78,13 +77,22 @@ async def list_messages(
|
||||
|
||||
await check_chat_access(chat_id, user.id, session)
|
||||
|
||||
|
||||
offset = int(cursor) if cursor else 0
|
||||
|
||||
result = await session.execute(
|
||||
select(Message)
|
||||
.where(Message.chat_id == chat_id)
|
||||
.order_by(Message.created_at, Message.id)
|
||||
.limit(limit + 1)
|
||||
.offset(offset)
|
||||
)
|
||||
msgs = result.scalars().all()
|
||||
|
||||
has_next = len(msgs) > limit
|
||||
if has_next:
|
||||
msgs = msgs[:limit]
|
||||
|
||||
my_messages = [
|
||||
{
|
||||
"id": m.id,
|
||||
@@ -95,5 +103,5 @@ async def list_messages(
|
||||
} for m in msgs
|
||||
]
|
||||
|
||||
page, next_cursor = paginate(my_messages, limit, cursor)
|
||||
return {"items": page, "next_cursor": next_cursor}
|
||||
next_cursor = str(offset + limit) if has_next else None
|
||||
return {"items": my_messages, "next_cursor": next_cursor}
|
||||
@@ -4,7 +4,7 @@ from fastapi import APIRouter, HTTPException, Depends
|
||||
from pydantic import BaseModel, Field, ConfigDict, field_serializer
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from app.models.user import User
|
||||
from app.security import get_password_hash, get_current_user
|
||||
from app.dependencies import get_session
|
||||
@@ -40,7 +40,13 @@ async def register_user(payload: CreateUser, session: AsyncSession = Depends(get
|
||||
password_hash=get_password_hash(payload.password)
|
||||
)
|
||||
session.add(user)
|
||||
await session.commit()
|
||||
|
||||
try:
|
||||
await session.commit()
|
||||
except IntegrityError:
|
||||
await session.rollback()
|
||||
raise HTTPException(status_code=409, detail="Имя пользователя уже существует")
|
||||
|
||||
await session.refresh(user)
|
||||
return user
|
||||
|
||||
|
||||
+10
-2
@@ -33,13 +33,14 @@ async def create_session(user_id: str) -> dict:
|
||||
return {
|
||||
"token": token,
|
||||
"token_type": "Bearer",
|
||||
"expires_at": expires_at.isoformat().replace( "+00:00", "Z"),
|
||||
"expires_at": expires_at.isoformat().replace("+00:00", "Z"),
|
||||
}
|
||||
|
||||
|
||||
async def delete_session(token: str) -> None:
|
||||
await redis_client.delete(f"session:{token}")
|
||||
|
||||
|
||||
async def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(bearer_scheme)):
|
||||
if not credentials:
|
||||
raise HTTPException(
|
||||
@@ -50,7 +51,14 @@ async def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(b
|
||||
|
||||
token = credentials.credentials
|
||||
|
||||
user_id = await redis_client.get(f"session:{token}")
|
||||
|
||||
try:
|
||||
user_id = await redis_client.get(f"session:{token}")
|
||||
except Exception:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail="Внутренняя ошибка сервера"
|
||||
)
|
||||
|
||||
if not user_id:
|
||||
raise HTTPException(
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
QUERY PLAN
|
||||
-----------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
Limit (cost=0.42..6.24 rows=50 width=66) (actual time=0.229..0.237 rows=50 loops=1)
|
||||
Buffers: shared hit=1 read=3
|
||||
-> Index Scan using ix_messages_chat_created_id on messages (cost=0.42..9420.75 rows=80862 width=66) (actual time=0.228..0.232 rows=50 loops=1)
|
||||
Limit (cost=0.42..5.54 rows=50 width=66) (actual time=0.103..0.111 rows=50 loops=1)
|
||||
Buffers: shared hit=4
|
||||
-> Index Scan using ix_messages_chat_created_id on messages (cost=0.42..8222.03 rows=80203 width=66) (actual time=0.102..0.107 rows=50 loops=1)
|
||||
Index Cond: (chat_id = '66666666-6666-4666-8666-666666666666'::uuid)
|
||||
Buffers: shared hit=1 read=3
|
||||
Buffers: shared hit=4
|
||||
Planning:
|
||||
Buffers: shared hit=108 read=1 dirtied=3
|
||||
Planning Time: 1.173 ms
|
||||
Execution Time: 0.308 ms
|
||||
Buffers: shared hit=107
|
||||
Planning Time: 0.865 ms
|
||||
Execution Time: 0.168 ms
|
||||
(9 rows)
|
||||
|
||||
|
||||
@@ -18,4 +18,40 @@ EXPLAIN (ANALYZE, BUFFERS)
|
||||
SELECT * FROM messages
|
||||
WHERE chat_id = '22222222-2222-2222-2222-222222222222'
|
||||
ORDER BY created_at, id
|
||||
LIMIT 50;
|
||||
LIMIT 50;
|
||||
|
||||
Применить миграции к пустому volume (с нуля)
|
||||
Задача: Показать, что база данных создается с нуля одной командой.
|
||||
|
||||
Удалить docker-compose down -v
|
||||
Запустить docker-compose up -d --build
|
||||
|
||||
Применяем миграции (структура + данные):
|
||||
docker exec -it -w /app mtusi_messenger_app alembic upgrade head
|
||||
|
||||
Проверяем, что таблицы есть:
|
||||
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "\dt"
|
||||
curl -s http://localhost:8080/api/v1/users/me -H "Authorization: Bearer токен"
|
||||
|
||||
Делаем логаут проверяет корректность логина
|
||||
|
||||
curl -s http://localhost:8080/api/v1/users/me -H "Authorization: Bearer ВСТАВЬ_ТОКЕН"
|
||||
Открываем docker-compose.yml и временно поменяй SESSION_TTL_SECONDS на 2:
|
||||
|
||||
docker compose up -d app
|
||||
|
||||
Роль Redis: Покажи в docker-compose.yml флаг --appendonly yes и в security.py вызов redis_client.setex(...).
|
||||
План SQL: Покажи вывод make explain-10k (или explain-composite), где видно Index Scan и время выполнения.
|
||||
Ошибка зависимости: Останови Redis (docker compose stop redis), попробуй залогиниться. Сервер вернет 503 или 500, но не пустит анонимного пользователя. (Не забудь потом запустить docker compose start redis).
|
||||
Показать сравнение индексов и бэкап.
|
||||
|
||||
Что делать:
|
||||
|
||||
Запусти make explain-composite (замер с составным индексом).
|
||||
Запусти make explain-simple (замер с простым индексом).
|
||||
|
||||
Мгновенно удаляет все сессии редиса
|
||||
docker exec -it mtusi_messenger_redis redis-cli FLUSHALL
|
||||
|
||||
перезапуск редиса
|
||||
docker compose restart redis
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import subprocess
|
||||
import time
|
||||
import requests
|
||||
|
||||
BASE_URL = "http://localhost:8080"
|
||||
|
||||
|
||||
def test_postgres_down_returns_503():
|
||||
subprocess.run(["docker", "compose", "stop", "db"], check=True)
|
||||
time.sleep(1)
|
||||
|
||||
try:
|
||||
resp = requests.get(f"{BASE_URL}/health/ready")
|
||||
assert resp.status_code == 503, f"Ожидался 503, получен {resp.status_code}"
|
||||
finally:
|
||||
subprocess.run(["docker", "compose", "start", "db"], check=True)
|
||||
time.sleep(2)
|
||||
|
||||
|
||||
def test_redis_down_returns_500_json():
|
||||
subprocess.run(["docker", "pause", "mtusi_messenger_redis"], check=True)
|
||||
|
||||
try:
|
||||
headers = {"Authorization": "Bearer test_token"}
|
||||
resp = requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers)
|
||||
|
||||
assert resp.status_code == 500, f"Ожидался 500, получен {resp.status_code}"
|
||||
body = resp.json()
|
||||
assert body["error"]["code"] == "internal_error", "Неверный код ошибки"
|
||||
assert "request_id" in body["error"], "Нет request_id"
|
||||
finally:
|
||||
subprocess.run(["docker", "unpause", "mtusi_messenger_redis"], check=True)
|
||||
@@ -9,7 +9,8 @@ def register_and_login(username, password):
|
||||
requests.post(f"{BASE_URL}/api/v1/users", json={
|
||||
"username": username, "display_name": "Test", "password": password
|
||||
})
|
||||
resp = requests.post(f"{BASE_URL}/auth/sessions", auth=(username, password))
|
||||
|
||||
resp = requests.post(f"{BASE_URL}/api/v1/auth/sessions", auth=(username, password))
|
||||
return resp.json()["token"]
|
||||
|
||||
|
||||
@@ -20,18 +21,15 @@ def test_wrong_password():
|
||||
"username": username, "display_name": "Test", "password": password
|
||||
})
|
||||
|
||||
resp = requests.post(f"{BASE_URL}/auth/sessions", auth=(username, "wrong_password"))
|
||||
resp = requests.post(f"{BASE_URL}/api/v1/auth/sessions", auth=(username, "wrong_password"))
|
||||
assert resp.status_code == 401
|
||||
|
||||
|
||||
def test_logout():
|
||||
token = register_and_login("test_logout", "valid_password_123")
|
||||
headers = {"Authorization": f"Bearer {token}"}
|
||||
|
||||
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 200
|
||||
|
||||
assert requests.delete(f"{BASE_URL}/auth/sessions/current", headers=headers).status_code == 204
|
||||
|
||||
assert requests.delete(f"{BASE_URL}/api/v1/auth/sessions/current", headers=headers).status_code == 204
|
||||
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 401
|
||||
|
||||
|
||||
@@ -41,6 +39,6 @@ def test_expiry():
|
||||
|
||||
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 200
|
||||
|
||||
time.sleep(2)
|
||||
time.sleep(3)
|
||||
|
||||
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 401
|
||||
Reference in New Issue
Block a user