fix tests

Author: Zimovchik

rating_api/routes/comment.py

@@ -214,13 +214,12 @@ async def get_comments(
     )
 
     comments = comments_query.limit(limit).offset(offset).all()
-
     if not comments:
         raise ObjectNotFound(Comment, 'all')
-    if "rating.comment.review" in [scope['name'] for scope in user.get('session_scopes')]:
+    if user and "rating.comment.review" in [scope['name'] for scope in user.get('session_scopes')]:
         result = CommentGetAllWithAllInfo(limit=limit, offset=offset, total=len(comments))
         comment_validator = CommentGetWithAllInfo
-    elif user.get('id') == user_id:
+    elif user and user.get('id') == user_id:
         result = CommentGetAllWithStatus(limit=limit, offset=offset, total=len(comments))
         comment_validator = CommentGetWithStatus
     else:

tests/conftest.py

@@ -53,7 +53,6 @@ def comment(dbsession, lecturer):
         mark_kindness=1,
         mark_clarity=1,
         mark_freebie=1,
-        mark_general=1,
         lecturer_id=lecturer.id,
         review_status=ReviewStatus.APPROVED,
     )
@@ -169,8 +168,9 @@ def lecturers_with_comments(dbsession, lecturers):
         (lecturers[2].id, 9992, 'test_subject12', ReviewStatus.APPROVED, 0, 0, 0),
     ]
 
-    comments = [
-        Comment(
+    comments = []
+    for lecturer_id, user_id, subject, review_status, mark_kindness, mark_clarity, mark_freebie in comments_data:
+        comment = Comment(
             subject=subject,
             text="test_comment",
             mark_kindness=mark_kindness,
@@ -180,8 +180,12 @@ def lecturers_with_comments(dbsession, lecturers):
             user_id=user_id,
             review_status=review_status,
         )
-        for lecturer_id, user_id, subject, review_status, mark_kindness, mark_clarity, mark_freebie in comments_data
-    ]
+
+        # Set approved_by to -1 for approved or dismissed comments
+        if review_status in [ReviewStatus.APPROVED, ReviewStatus.DISMISSED]:
+            comment.approved_by = -1
+
+        comments.append(comment)
 
     dbsession.add_all(comments)
     dbsession.commit()

tests/test_routes/test_comment.py

@@ -206,7 +206,8 @@ def test_get_comment(client, comment):
 
 
 @pytest.mark.parametrize(
-    'lecturer_n,response_status', [(0, status.HTTP_200_OK), (1, status.HTTP_200_OK), (3, status.HTTP_200_OK)]
+    'lecturer_n,response_status',
+    [(0, status.HTTP_200_OK), (1, status.HTTP_200_OK), (2, status.HTTP_200_OK), (3, status.HTTP_404_NOT_FOUND)],
 )
 def test_comments_by_lecturer_id(client, lecturers_with_comments, lecturer_n, response_status):
     lecturers, comments = lecturers_with_comments
@@ -217,8 +218,10 @@ def test_comments_by_lecturer_id(client, lecturers_with_comments, lecturer_n, re
         assert len(json_response["comments"]) == len(
             [
                 comment
-                for comment in lecturers[lecturer_n].comments
-                if comment.review_status == ReviewStatus.APPROVED and not comment.is_deleted
+                for comment in comments
+                if comment.lecturer_id == lecturers[lecturer_n].id
+                and comment.review_status == ReviewStatus.APPROVED
+                and not comment.is_deleted
             ]
         )
 
@@ -228,15 +231,15 @@ def test_comments_by_lecturer_id(client, lecturers_with_comments, lecturer_n, re
 )
 def test_comments_by_user_id(client, lecturers_with_comments, user_id, response_status):
     _, comments = lecturers_with_comments
-    response = response = client.get(f'{url}', params={"user_id": user_id})
+    response = client.get(f'{url}', params={"user_id": 9990 + user_id})
     assert response.status_code == response_status
     if response.status_code == status.HTTP_200_OK:
         json_response = response.json()
         assert len(json_response["comments"]) == len(
             [
                 comment
                 for comment in comments
-                if comment.user_id == user_id
+                if comment.user_id == 9990 + user_id
                 and comment.review_status == ReviewStatus.APPROVED
                 and not comment.is_deleted
             ]