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 ba563bb8..57484fc1 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__) @@ -74,7 +74,7 @@ def post_side_effect(url, *args, **kwargs): @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 +88,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_200_OK, 0, + 0, + 0, ), ( # тест логики блокирующей выдачу ачивки за первый комментарий, если она уже есть у юзера { @@ -101,6 +103,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 +118,8 @@ def post_side_effect(url, *args, **kwargs): status.HTTP_200_OK, status.HTTP_500_INTERNAL_SERVER_ERROR, 0, + 0, + 0, ), ( { @@ -127,6 +133,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 +148,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 +163,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 +178,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 +194,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 +210,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 +225,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 +241,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 +260,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 +278,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 +294,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 +310,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 +349,8 @@ def test_create_comment( client, dbsession, lecturers, + lecturer_factory, + comment_factory, authlib_user, mocker, body, @@ -296,7 +358,28 @@ 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 + 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 + 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 +518,7 @@ def test_create_comment( { "comments": [ { - "subdject": "string", + "subject": "string", "text": "string", "mark_kindness": 0, "mark_freebie": 0,