Изменения в get_comment и get_comments

Author: tishanovartem

rating_api/routes/comment.py

@@ -22,10 +22,8 @@
     CommentGet,
     CommentGetAll,
     CommentGetAllWithAllInfo,
-    CommentGetAllWithLike,
     CommentGetAllWithStatus,
     CommentGetWithAllInfo,
-    CommentGetWithLike,
     CommentGetWithStatus,
     CommentImportAll,
     CommentPost,
@@ -164,25 +162,22 @@ async def import_comments(
     return result
 
 
-@comment.get("/{uuid}", response_model=CommentGetWithLike)
-async def get_comment(uuid: UUID, user=Depends(UnionAuth())) -> CommentGetWithLike:
+@comment.get("/{uuid}", response_model=CommentGet)
+async def get_comment(uuid: UUID, user=Depends(UnionAuth(auto_error=False, allow_none=False))) -> CommentGet:
     """
     Возвращает комментарий по его UUID в базе данных RatingAPI
     """
     comment: Comment = Comment.query(session=db.session).filter(Comment.uuid == uuid).one_or_none()
     if comment is None:
         raise ObjectNotFound(Comment, uuid)
     base_data = CommentGet.model_validate(comment)
-    return CommentGetWithLike(
-        **base_data.model_dump(),
-        is_liked=comment.has_reaction(user.get("id"), Reaction.LIKE),
-        is_disliked=comment.has_reaction(user.get("id"), Reaction.DISLIKE),
-    )
+    if user:
+        base_data.is_liked=comment.has_reaction(user.get("id"), Reaction.LIKE)
+        base_data.is_disliked=comment.has_reaction(user.get("id"), Reaction.DISLIKE)
+    return base_data
 
 
-@comment.get(
-    "", response_model=Union[CommentGetAll, CommentGetAllWithLike, CommentGetAllWithAllInfo, CommentGetAllWithStatus]
-)
+@comment.get("", response_model=Union[CommentGetAll, CommentGetAllWithAllInfo, CommentGetAllWithStatus])
 async def get_comments(
     limit: int = 10,
     offset: int = 0,
@@ -196,7 +191,7 @@ async def get_comments(
     unreviewed: bool = False,
     asc_order: bool = False,
     user=Depends(UnionAuth(scopes=["rating.comment.review"], auto_error=False, allow_none=False)),
-) -> Union[CommentGetAll, CommentGetAllWithLike, CommentGetAllWithAllInfo, CommentGetAllWithStatus]:
+) -> Union[CommentGetAll, CommentGetAllWithAllInfo, CommentGetAllWithStatus]:
     """
      Scopes: `["rating.comment.review"]`
 
@@ -219,7 +214,6 @@ async def get_comments(
 
      `asc_order` -Если передано true, сортировать в порядке возрастания. Иначе - в порядке убывания
     """
-    user = {"id": 101, "session_scopes": []}  # тестовый user_id  # пустые скоупы = обычный пользователь
     comments_query = (
         Comment.query(session=db.session)
         .filter(Comment.search_by_lectorer_id(lecturer_id))
@@ -245,11 +239,7 @@ async def get_comments(
         result = CommentGetAllWithStatus(limit=limit, offset=offset, total=len(comments))
         comment_validator = CommentGetWithStatus
     else:
-        result = (
-            CommentGetAllWithLike(limit=limit, offset=offset, total=len(comments))
-            if user
-            else CommentGetAll(limit=limit, offset=offset, total=len(comments))
-        )
+        result = CommentGetAll(limit=limit, offset=offset, total=len(comments))
         comment_validator = CommentGet
 
     result.comments = comments
@@ -267,22 +257,19 @@ async def get_comments(
     result.total = len(result.comments)
     comments_with_like = []
     current_user_id = user.get("id") if user else None
+
     if current_user_id and result.comments:
         user_reactions = Comment.reactions_for_comments(current_user_id, db.session, result.comments)
     else:
         user_reactions = {}
 
     for comment in result.comments:
         base_data = comment_validator.model_validate(comment)
-
         if current_user_id:
             reaction = user_reactions.get(comment.uuid)
-            comment_with_reactions = CommentGetWithLike(
-                **base_data.model_dump(), is_liked=reaction == Reaction.LIKE, is_disliked=reaction == Reaction.DISLIKE
-            )
-            comments_with_like.append(comment_with_reactions)
-        else:
-            comments_with_like.append(base_data)
+            base_data.is_liked = (reaction == Reaction.LIKE)
+            base_data.is_disliked = (reaction == Reaction.DISLIKE) 
+        comments_with_like.append(base_data)
 
     result.comments = comments_with_like
     return result

rating_api/schemas/models.py

@@ -26,35 +26,19 @@ class CommentGet(Base):
     like_count: int
     dislike_count: int
     user_fullname: str | None = None
-
-
-class CommentGetWithLike(CommentGet):
-    is_liked: bool
-    is_disliked: bool
+    is_liked: bool = False
+    is_disliked: bool = False
 
 
 class CommentGetWithStatus(CommentGet):
     review_status: ReviewStatus
 
 
-"""
-class CommentGetWithLikeAndStatus(CommentGetWithLike):
-    review_status: ReviewStatus
-"""
-
-
 class CommentGetWithAllInfo(CommentGet):
     review_status: ReviewStatus
     approved_by: int | None = None
 
 
-"""
-class CommentGetWithAllInfoAndLike(CommentGetWithLike):
-    review_status: ReviewStatus
-    approved_by: int | None = None
-"""
-
-
 class CommentUpdate(Base):
     subject: str = None
     text: str = None
@@ -93,45 +77,20 @@ class CommentGetAll(Base):
     total: int
 
 
-class CommentGetAllWithLike(Base):
-    comments: list[CommentGetWithLike] = []
-    limit: int
-    offset: int
-    total: int
-
-
 class CommentGetAllWithStatus(Base):
     comments: list[CommentGetWithStatus] = []
     limit: int
     offset: int
     total: int
 
 
-"""
-class CommentGetAllWithStatusAndLike(Base):
-    comments: list[CommentGetWithLikeAndStatus] = []
-    limit: int
-    offset: int
-    total: int
-"""
-
-
 class CommentGetAllWithAllInfo(Base):
     comments: list[CommentGetWithAllInfo] = []
     limit: int
     offset: int
     total: int
 
 
-"""
-class CommentGetAllWithAllInfoAndLike(Base):
-    comments: list[CommentGetWithAllInfoAndLike] = []
-    limit: int
-    offset: int
-    total: int
-"""
-
-
 class LecturerUserCommentPost(Base):
     lecturer_id: int
     user_id: int

tests/conftest.py

@@ -139,6 +139,23 @@ def comment(dbsession, lecturer):
     dbsession.commit()
 
 
+@pytest.fixture
+def comment_reaction(dbsession, comment):
+    created_reactions = []
+
+    def _create_reaction(user_id: int, react: Reaction):
+        reaction = CommentReaction(user_id=user_id, comment_uuid=comment.uuid, reaction=react)
+        dbsession.add(reaction)
+        dbsession.commit()
+        created_reactions.append(reaction)
+    
+    yield _create_reaction
+
+    for reaction in created_reactions:
+        dbsession.delete(reaction)
+    dbsession.commit()
+
+
 @pytest.fixture
 def unreviewed_comment(dbsession, lecturer):
     _comment = Comment(

tests/test_routes/test_comment.py

@@ -210,15 +210,12 @@ def test_create_comment(client, dbsession, lecturers, body, lecturer_n, response
         (None, None, None),  # anonymous
     ],
 )
-def test_get_comment_with_reaction(client, dbsession, comment, reaction_data, expected_reaction, comment_user_id):
+def test_get_comment_with_reaction(client, comment, reaction_data, expected_reaction, comment_user_id, comment_reaction):
     comment.user_id = comment_user_id
 
     if reaction_data:
         user_id, reaction_type = reaction_data
-        reaction = CommentReaction(user_id=user_id, comment_uuid=comment.uuid, reaction=reaction_type)
-        dbsession.add(reaction)
-
-    dbsession.commit()
+        comment_reaction(user_id, reaction_type)
 
     response_comment = client.get(f'{url}/{comment.uuid}')