From 74f35b7a9222935bbed4d8b4842c839f248d83a9 Mon Sep 17 00:00:00 2001 From: businkv Date: Sat, 29 Aug 2026 20:03:27 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=20=D0=BD=D0=B0=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B8=D0=B9=20=D0=BB=D0=B8=D0=BC=D0=B8=D1=82=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=B5=D0=B2=20=D0=BE=D1=82=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8F=20=D0=B8=20=D1=82=D0=B5=D1=81=D1=82=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BB=D0=B8=D0=BC=D0=B8=D1=82=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B5=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BB?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_routes/test_comment.py | 109 ++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index ba563bb8..16a2e990 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -792,3 +792,112 @@ def test_post_like(client, dbsession, comment): dbsession.refresh(comment) assert comment.like_count == 0 assert comment.dislike_count == 0 + + +def test_comment_lecturer_limit( + client, + lecturers, + authlib_user, + mocker, +): + """ + Тест лимита на одного лектора + """ + new_user = authlib_user.copy() + new_user["id"] = 99999 + + achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" + achive_post_url = ( + settings.API_URL + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" + ) + mock_aiohttp_session = aiohttp_mock( + authlib_user_id=new_user.get("id"), + aiohttp_response_status=status.HTTP_200_OK, + achievement_id=settings.FIRST_COMMENT_ACHIEVEMENT_ID, + get_url=achive_get_url, + post_url=achive_post_url, + ) + mocker.patch("aiohttp.ClientSession", return_value=mock_aiohttp_session) + + lecturer_id = lecturers[0].id + body = { + "subject": "Subject", + "text": "Text", + "mark_kindness": 1, + "mark_freebie": 0, + "mark_clarity": 0, + } + + for _ in range(settings.COMMENT_TO_LECTURER_LIMIT - 1): + response = client.post(url, json=body, params={"lecturer_id": lecturer_id}) + assert response.status_code == status.HTTP_200_OK + + response_5 = client.post(url, json=body, params={"lecturer_id": lecturer_id}) + assert response_5.status_code == status.HTTP_200_OK + + response_6 = client.post(url, json=body, params={"lecturer_id": lecturer_id}) + assert response_6.status_code == status.HTTP_429_TOO_MANY_REQUESTS + + +def test_comment_total_limit( + client, + dbsession, + mocker, +): + """ + Тест общего лимита комментариев пользователя за период + """ + dbsession.query(LecturerUserComment).delete() + dbsession.query(Comment).delete() + dbsession.commit() + + from rating_api.models import Lecturer + + extra_lecturers = [] + for i in range(5): + lecturer = Lecturer( + id=200 + i, + first_name=f"total_fname{i}", + last_name=f"total_lname{i}", + middle_name=f"total_mname{i}", + timetable_id=5000 + i, + ) + dbsession.add(lecturer) + extra_lecturers.append(lecturer) + dbsession.commit() + + for lecturer in extra_lecturers: + dbsession.refresh(lecturer) + + new_user = {"id": 99999, "email": "test@example.com"} + + achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" + achive_post_url = ( + settings.API_URL + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" + ) + mock_aiohttp_session = aiohttp_mock( + authlib_user_id=new_user.get("id"), + aiohttp_response_status=status.HTTP_200_OK, + achievement_id=settings.FIRST_COMMENT_ACHIEVEMENT_ID, + get_url=achive_get_url, + post_url=achive_post_url, + ) + mocker.patch("aiohttp.ClientSession", return_value=mock_aiohttp_session) + + body = { + "subject": "TestSubject", + "text": "TestText", + "mark_kindness": 1, + "mark_freebie": 0, + "mark_clarity": 0, + } + + # По 4 коммента каждому из 5 лекторов = 20 + for lecturer in extra_lecturers: + for _ in range(4): + response = client.post(url, json=body, params={"lecturer_id": lecturer.id}) + assert response.status_code == status.HTTP_200_OK + + # 21й - превышение лимита + response_21 = client.post(url, json=body, params={"lecturer_id": extra_lecturers[0].id}) + assert response_21.status_code == status.HTTP_429_TOO_MANY_REQUESTS \ No newline at end of file From e16c59a54d948abd11f898dc46ab7de92b16af50 Mon Sep 17 00:00:00 2001 From: businkv Date: Sat, 29 Aug 2026 20:06:46 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_routes/test_comment.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index 16a2e990..6aa6be20 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -808,7 +808,8 @@ def test_comment_lecturer_limit( achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" achive_post_url = ( - settings.API_URL + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" + settings.API_URL + + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" ) mock_aiohttp_session = aiohttp_mock( authlib_user_id=new_user.get("id"), @@ -873,7 +874,8 @@ def test_comment_total_limit( achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" achive_post_url = ( - settings.API_URL + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" + settings.API_URL + + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" ) mock_aiohttp_session = aiohttp_mock( authlib_user_id=new_user.get("id"), @@ -900,4 +902,4 @@ def test_comment_total_limit( # 21й - превышение лимита response_21 = client.post(url, json=body, params={"lecturer_id": extra_lecturers[0].id}) - assert response_21.status_code == status.HTTP_429_TOO_MANY_REQUESTS \ No newline at end of file + assert response_21.status_code == status.HTTP_429_TOO_MANY_REQUESTS From 012e1bbdc057494d0f2ce50c800ccecbd3ae5598 Mon Sep 17 00:00:00 2001 From: businkv Date: Tue, 15 Sep 2026 00:46:49 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83=D1=80=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BB=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B8=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83=D1=80=D0=B0-?= =?UTF-8?q?=D1=84=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2.=20=D0=9E?= =?UTF-8?q?=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D0=BB=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D1=8B=20=D0=BD=D0=B0=20=D0=BB=D0=B8=D0=BC?= =?UTF-8?q?=D0=B8=D1=82=D1=8B=20=D1=81=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BD=D1=8B=D0=BC=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=BC=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_routes/test_comment.py | 268 +++++++++++++++++------------- 1 file changed, 154 insertions(+), 114 deletions(-) diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index 6aa6be20..4c69ef09 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -5,7 +5,7 @@ import pytest from starlette import status -from rating_api.models import Comment, CommentReaction, LecturerUserComment, Reaction, ReviewStatus +from rating_api.models import Comment, CommentReaction, Lecturer, LecturerUserComment, Reaction, ReviewStatus from rating_api.settings import get_settings logger = logging.getLogger(__name__) @@ -73,8 +73,79 @@ def post_side_effect(url, *args, **kwargs): return mock_aiohttp_session +@pytest.fixture +def extra_lecturers(dbsession): + """Создает лекторов для наполнения общего лимита комментариев""" + needed_lecturers = (settings.COMMENT_LIMIT // settings.COMMENT_TO_LECTURER_LIMIT) + 1 + + lecturers = [] + for i in range(needed_lecturers): + lecturer = Lecturer( + id=900 + i, + first_name=f"fname{i}", + last_name=f"lname{i}", + middle_name=f"mname{i}", + timetable_id=900 + i, + ) + lecturers.append(lecturer) + + dbsession.add_all(lecturers) + dbsession.commit() + + yield lecturers + + for lecturer in lecturers: + dbsession.delete(lecturer) + dbsession.commit() + + +@pytest.fixture +def comment_factory(dbsession, authlib_user): + """ + Создает комментарии + """ + user_id = authlib_user.get("id") + created_comment_uuids = [] + created_user_comment_ids = [] + + def create_comments(lecturer_id: int, count: int): + for _ in range(count): + comment = Comment( + user_id=user_id, + lecturer_id=lecturer_id, + subject="Subject", + text="Text", + mark_kindness=1, + mark_freebie=0, + mark_clarity=0, + review_status=ReviewStatus.PENDING, + ) + dbsession.add(comment) + dbsession.flush() + created_comment_uuids.append(comment.uuid) + + user_comment = LecturerUserComment(lecturer_id=lecturer_id, user_id=user_id) + dbsession.add(user_comment) + dbsession.flush() + created_user_comment_ids.append(user_comment.id) + + dbsession.commit() + + yield create_comments + + if created_user_comment_ids: + dbsession.query(LecturerUserComment).filter(LecturerUserComment.id.in_(created_user_comment_ids)).delete( + synchronize_session=False + ) + + if created_comment_uuids: + dbsession.query(Comment).filter(Comment.uuid.in_(created_comment_uuids)).delete(synchronize_session=False) + + dbsession.commit() + + @pytest.mark.parametrize( - 'body,lecturer_n,response_status,aiohttp_response_status,achievement_id', + 'body,lecturer_n,response_status,aiohttp_response_status,achievement_id,lecturer_comments_limit,total_comments_limit', [ ( # тест логики выдачи ачивки за первый комментарий { @@ -88,6 +159,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, 0, + 0, + 0, ), ( # тест логики блокирующей выдачу ачивки за первый комментарий, если она уже есть у юзера { @@ -101,6 +174,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # тест логики выдачи ачивки в случае неудачного get-запроса к серверу { @@ -114,6 +189,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_500_INTERNAL_SERVER_ERROR, 0, + 0, + 0, ), ( { @@ -127,6 +204,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( { @@ -140,6 +219,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # bad mark { @@ -153,6 +234,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_400_BAD_REQUEST, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # deleted lecturer { @@ -166,6 +249,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_404_NOT_FOUND, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # Anonymous comment { @@ -180,6 +265,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # NotAnonymous comment { @@ -194,6 +281,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # Not provided anonymity { @@ -207,6 +296,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # Bad anonymity { @@ -221,6 +312,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_422_UNPROCESSABLE_ENTITY, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # regex test { @@ -238,6 +331,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # forbidden symbols { @@ -254,6 +349,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_400_BAD_REQUEST, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # long comment { @@ -268,6 +365,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_400_BAD_REQUEST, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, ), ( # long comment but not that long { @@ -282,6 +381,38 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + 0, + ), + ( + # Превышен лимит комментов от одного пользователя на одного лектора + {"subject": "test_subject", "text": "test text", "mark_kindness": 1, "mark_freebie": 0, "mark_clarity": 0}, + 0, + status.HTTP_429_TOO_MANY_REQUESTS, + status.HTTP_200_OK, + settings.FIRST_COMMENT_ACHIEVEMENT_ID, + settings.COMMENT_TO_LECTURER_LIMIT, + 0, + ), + ( + # Превышен общий лимит комментов от пользователя + {"subject": "test_subject", "text": "test text", "mark_kindness": 1, "mark_freebie": 0, "mark_clarity": 0}, + 0, + status.HTTP_429_TOO_MANY_REQUESTS, + status.HTTP_200_OK, + settings.FIRST_COMMENT_ACHIEVEMENT_ID, + 0, + settings.COMMENT_LIMIT, + ), + ( + # Превышены оба лимита + {"subject": "test_subject", "text": "test text", "mark_kindness": 1, "mark_freebie": 0, "mark_clarity": 0}, + 0, + status.HTTP_429_TOO_MANY_REQUESTS, + status.HTTP_200_OK, + settings.FIRST_COMMENT_ACHIEVEMENT_ID, + settings.COMMENT_TO_LECTURER_LIMIT, + settings.COMMENT_LIMIT, ), ], ) @@ -289,6 +420,8 @@ def test_create_comment( client, dbsession, lecturers, + extra_lecturers, + comment_factory, authlib_user, mocker, body, @@ -296,7 +429,25 @@ def test_create_comment( response_status, aiohttp_response_status, achievement_id, + lecturer_comments_limit, + total_comments_limit, ): + target_lecturer_id = lecturers[lecturer_n].id + + # наполнение БД под лимит комментов лектору + if lecturer_comments_limit > 0: + comment_factory(target_lecturer_id, lecturer_comments_limit) + + # наполнение БД под общий лимит пользователя + if total_comments_limit > 0: + remaining = total_comments_limit - lecturer_comments_limit + for lecturer in extra_lecturers: + if remaining <= 0: + break + count = min(remaining, settings.COMMENT_TO_LECTURER_LIMIT - 1) + comment_factory(lecturer.id, count) + remaining -= count + # url для проверки логики выдачи ачивок achive_get_url = settings.API_URL + f"achievement/user/{authlib_user.get('id'):}" achive_post_url = ( @@ -435,7 +586,7 @@ def test_create_comment( { "comments": [ { - "subdject": "string", + "subject": "string", "text": "string", "mark_kindness": 0, "mark_freebie": 0, @@ -792,114 +943,3 @@ def test_post_like(client, dbsession, comment): dbsession.refresh(comment) assert comment.like_count == 0 assert comment.dislike_count == 0 - - -def test_comment_lecturer_limit( - client, - lecturers, - authlib_user, - mocker, -): - """ - Тест лимита на одного лектора - """ - new_user = authlib_user.copy() - new_user["id"] = 99999 - - achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" - achive_post_url = ( - settings.API_URL - + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" - ) - mock_aiohttp_session = aiohttp_mock( - authlib_user_id=new_user.get("id"), - aiohttp_response_status=status.HTTP_200_OK, - achievement_id=settings.FIRST_COMMENT_ACHIEVEMENT_ID, - get_url=achive_get_url, - post_url=achive_post_url, - ) - mocker.patch("aiohttp.ClientSession", return_value=mock_aiohttp_session) - - lecturer_id = lecturers[0].id - body = { - "subject": "Subject", - "text": "Text", - "mark_kindness": 1, - "mark_freebie": 0, - "mark_clarity": 0, - } - - for _ in range(settings.COMMENT_TO_LECTURER_LIMIT - 1): - response = client.post(url, json=body, params={"lecturer_id": lecturer_id}) - assert response.status_code == status.HTTP_200_OK - - response_5 = client.post(url, json=body, params={"lecturer_id": lecturer_id}) - assert response_5.status_code == status.HTTP_200_OK - - response_6 = client.post(url, json=body, params={"lecturer_id": lecturer_id}) - assert response_6.status_code == status.HTTP_429_TOO_MANY_REQUESTS - - -def test_comment_total_limit( - client, - dbsession, - mocker, -): - """ - Тест общего лимита комментариев пользователя за период - """ - dbsession.query(LecturerUserComment).delete() - dbsession.query(Comment).delete() - dbsession.commit() - - from rating_api.models import Lecturer - - extra_lecturers = [] - for i in range(5): - lecturer = Lecturer( - id=200 + i, - first_name=f"total_fname{i}", - last_name=f"total_lname{i}", - middle_name=f"total_mname{i}", - timetable_id=5000 + i, - ) - dbsession.add(lecturer) - extra_lecturers.append(lecturer) - dbsession.commit() - - for lecturer in extra_lecturers: - dbsession.refresh(lecturer) - - new_user = {"id": 99999, "email": "test@example.com"} - - achive_get_url = settings.API_URL + f"achievement/user/{new_user.get('id')}" - achive_post_url = ( - settings.API_URL - + f"achievement/achievement/{settings.FIRST_COMMENT_ACHIEVEMENT_ID}/reciever/{new_user.get('id')}" - ) - mock_aiohttp_session = aiohttp_mock( - authlib_user_id=new_user.get("id"), - aiohttp_response_status=status.HTTP_200_OK, - achievement_id=settings.FIRST_COMMENT_ACHIEVEMENT_ID, - get_url=achive_get_url, - post_url=achive_post_url, - ) - mocker.patch("aiohttp.ClientSession", return_value=mock_aiohttp_session) - - body = { - "subject": "TestSubject", - "text": "TestText", - "mark_kindness": 1, - "mark_freebie": 0, - "mark_clarity": 0, - } - - # По 4 коммента каждому из 5 лекторов = 20 - for lecturer in extra_lecturers: - for _ in range(4): - response = client.post(url, json=body, params={"lecturer_id": lecturer.id}) - assert response.status_code == status.HTTP_200_OK - - # 21й - превышение лимита - response_21 = client.post(url, json=body, params={"lecturer_id": extra_lecturers[0].id}) - assert response_21.status_code == status.HTTP_429_TOO_MANY_REQUESTS From a185714d4a1b752c7497f24adeed91e9628e7199 Mon Sep 17 00:00:00 2001 From: businkv Date: Mon, 28 Sep 2026 20:15:07 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83=D1=80=D1=83-=D1=84?= =?UTF-8?q?=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D1=83=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BB=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2,=20=D0=B2=D1=8B=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B0=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83?= =?UTF-8?q?=D1=80=D1=8B-=D1=84=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20conftest,=20=D0=B2=20lecturers=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D1=84=D0=B0=D0=B1=D1=80=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0,=20=D0=B0=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D1=88?= =?UTF-8?q?=D1=82=D1=83=D1=87=D0=BD=D0=BE=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/conftest.py | 131 +++++++++++++++++++++++------- tests/test_routes/test_comment.py | 76 +---------------- 2 files changed, 105 insertions(+), 102 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 678d91f3..bdd225bd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -216,41 +216,32 @@ def nonanonymous_comment(dbsession, lecturer): dbsession.commit() -@pytest.fixture(scope='function') -def lecturers(dbsession): +@pytest.fixture +def lecturers(dbsession, lecturer_factory): """ - Creates 4 lecturers(one with flag is_deleted=True) + Создает 4 лекторов через фабрику (один с флагом is_deleted=True) """ - lecturers_data = [ - (1, "test_fname1", "test_lname1", "test_mname1", 9900), - (2, "test_fname2", "test_lname2", "test_mname2", 9901), - (3, "Bibka", "Bobka", "Bobkovich", 9902), - ] + created_lecturers = lecturer_factory(4) - lecturers = [ - Lecturer(id=lecturer_id, first_name=fname, last_name=lname, middle_name=mname, timetable_id=timetable_id) - for lecturer_id, fname, lname, mname, timetable_id in lecturers_data - ] - lecturers.append( - Lecturer(id=4, first_name='test_fname3', last_name='test_lname3', middle_name='test_mname3', timetable_id=9903) - ) - lecturers[-1].is_deleted = True - for lecturer in lecturers: - dbsession.add(lecturer) - dbsession.commit() - yield lecturers - for lecturer in lecturers: - for row in lecturer.comments: - dbsession.delete(row) - lecturer_user_comments = dbsession.query(LecturerUserComment).filter( - LecturerUserComment.lecturer_id == lecturer.id - ) - for row in lecturer_user_comments: - dbsession.delete(row) - dbsession.flush() - dbsession.delete(lecturer) + deleted_lecturer = created_lecturers[3] + deleted_lecturer.is_deleted = True dbsession.commit() + yield created_lecturers + + lecturer_ids = [l.id for l in created_lecturers] + + dbsession.query(Comment).filter(Comment.lecturer_id.in_(lecturer_ids)).delete( + synchronize_session=False + ) + dbsession.query(LecturerUserComment).filter( + LecturerUserComment.lecturer_id.in_(lecturer_ids) + ).delete(synchronize_session=False) + + dbsession.query(Lecturer).filter(Lecturer.id.in_(lecturer_ids)).delete( + synchronize_session=False + ) + dbsession.commit() @pytest.fixture def lecturers_with_comments(dbsession, lecturers): @@ -308,3 +299,83 @@ def lecturers_with_comments(dbsession, lecturers): dbsession.refresh(comment) dbsession.delete(comment) dbsession.commit() + + +@pytest.fixture +def lecturer_factory(dbsession): + """ + Создает лекторов + """ + created = [] + + def create_lecturers(count: int=1) -> list[Lecturer]: + lecturers = [] + for i in range(count): + cur_id = len(created)+1 + lecturer = Lecturer( + first_name=f"fname_{cur_id}", + last_name=f"lname_{cur_id}", + middle_name=f"mname_{cur_id}", + timetable_id=i+1, + ) + lecturers.append(lecturer) + created.append(lecturer) + + dbsession.add_all(lecturers) + dbsession.commit() + return lecturers + + yield create_lecturers + + for l in created: + if dbsession.is_active and l in dbsession: + dbsession.delete(l) + try: + dbsession.commit() + except Exception: + dbsession.rollback() + + +@pytest.fixture +def comment_factory(dbsession, authlib_user): + """ + Создает комментарии + """ + user_id = authlib_user.get("id") + created_comment_uuids = [] + created_user_comment_ids = [] + + def create_comments(lecturer_id: int, count: int): + for _ in range(count): + comment = Comment( + user_id=user_id, + lecturer_id=lecturer_id, + subject="Subject", + text="Text", + mark_kindness=1, + mark_freebie=0, + mark_clarity=0, + review_status=ReviewStatus.PENDING, + ) + dbsession.add(comment) + dbsession.flush() + created_comment_uuids.append(comment.uuid) + + user_comment = LecturerUserComment(lecturer_id=lecturer_id, user_id=user_id) + dbsession.add(user_comment) + dbsession.flush() + created_user_comment_ids.append(user_comment.id) + + dbsession.commit() + + yield create_comments + + if created_user_comment_ids: + dbsession.query(LecturerUserComment).filter(LecturerUserComment.id.in_(created_user_comment_ids)).delete( + synchronize_session=False + ) + + if created_comment_uuids: + dbsession.query(Comment).filter(Comment.uuid.in_(created_comment_uuids)).delete(synchronize_session=False) + + dbsession.commit() \ No newline at end of file diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index 4c69ef09..57484fc1 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -73,77 +73,6 @@ def post_side_effect(url, *args, **kwargs): return mock_aiohttp_session -@pytest.fixture -def extra_lecturers(dbsession): - """Создает лекторов для наполнения общего лимита комментариев""" - needed_lecturers = (settings.COMMENT_LIMIT // settings.COMMENT_TO_LECTURER_LIMIT) + 1 - - lecturers = [] - for i in range(needed_lecturers): - lecturer = Lecturer( - id=900 + i, - first_name=f"fname{i}", - last_name=f"lname{i}", - middle_name=f"mname{i}", - timetable_id=900 + i, - ) - lecturers.append(lecturer) - - dbsession.add_all(lecturers) - dbsession.commit() - - yield lecturers - - for lecturer in lecturers: - dbsession.delete(lecturer) - dbsession.commit() - - -@pytest.fixture -def comment_factory(dbsession, authlib_user): - """ - Создает комментарии - """ - user_id = authlib_user.get("id") - created_comment_uuids = [] - created_user_comment_ids = [] - - def create_comments(lecturer_id: int, count: int): - for _ in range(count): - comment = Comment( - user_id=user_id, - lecturer_id=lecturer_id, - subject="Subject", - text="Text", - mark_kindness=1, - mark_freebie=0, - mark_clarity=0, - review_status=ReviewStatus.PENDING, - ) - dbsession.add(comment) - dbsession.flush() - created_comment_uuids.append(comment.uuid) - - user_comment = LecturerUserComment(lecturer_id=lecturer_id, user_id=user_id) - dbsession.add(user_comment) - dbsession.flush() - created_user_comment_ids.append(user_comment.id) - - dbsession.commit() - - yield create_comments - - if created_user_comment_ids: - dbsession.query(LecturerUserComment).filter(LecturerUserComment.id.in_(created_user_comment_ids)).delete( - synchronize_session=False - ) - - if created_comment_uuids: - dbsession.query(Comment).filter(Comment.uuid.in_(created_comment_uuids)).delete(synchronize_session=False) - - dbsession.commit() - - @pytest.mark.parametrize( 'body,lecturer_n,response_status,aiohttp_response_status,achievement_id,lecturer_comments_limit,total_comments_limit', [ @@ -420,7 +349,7 @@ def test_create_comment( client, dbsession, lecturers, - extra_lecturers, + lecturer_factory, comment_factory, authlib_user, mocker, @@ -441,6 +370,9 @@ def test_create_comment( # наполнение БД под общий лимит пользователя if total_comments_limit > 0: remaining = total_comments_limit - lecturer_comments_limit + needed_lecturers_count = (remaining + settings.COMMENT_TO_LECTURER_LIMIT - 1) // (settings.COMMENT_TO_LECTURER_LIMIT - 1) + extra_lecturers = lecturer_factory(needed_lecturers_count) + for lecturer in extra_lecturers: if remaining <= 0: break