Исправления

Author: MikhailPI1

migrations/versions/1c001709fc55_advanced_sort.py

@@ -5,28 +5,20 @@
 Create Date: 2025-04-26 17:01:57.140143
 
 """
-from alembic import op
+
 import sqlalchemy as sa
+from alembic import op
 
 
-# revision identifiers, used by Alembic.
 revision = '1c001709fc55'
 down_revision = 'dd44854aa12a'
 branch_labels = None
 depends_on = None
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('comment', 'approved_by',
-               existing_type=sa.INTEGER(),
-               nullable=True)
-    # ### end Alembic commands ###
+    op.alter_column('comment', 'approved_by', existing_type=sa.INTEGER(), nullable=True)
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('comment', 'approved_by',
-               existing_type=sa.INTEGER(),
-               nullable=False)
-    # ### end Alembic commands ###
+    op.alter_column('comment', 'approved_by', existing_type=sa.INTEGER(), nullable=False)

rating_api/models/db.py

@@ -126,28 +126,24 @@ def mark_general(self):
     @hybrid_method
     def order_by_create_ts(
         self, query: str, asc_order: bool
-    ) -> tuple[UnaryExpression[datetime.datetime] | InstrumentedAttribute, InstrumentedAttribute]:
-        return getattr(Comment, query) if asc_order else desc(getattr(Comment, query)), Comment.user_id
+    ) -> UnaryExpression[datetime.datetime] | InstrumentedAttribute:
+        return getattr(Comment, query) if asc_order else desc(getattr(Comment, query))
 
     @hybrid_method
-    def order_by_mark(
-        self, query: str, asc_order: bool
-    ) -> tuple[UnaryExpression[float] | InstrumentedAttribute, InstrumentedAttribute]:
-        return getattr(Comment, query) if asc_order else desc(getattr(Comment, query)), Comment.user_id
+    def order_by_mark(self, query: str, asc_order: bool) -> UnaryExpression[float] | InstrumentedAttribute:
+        return getattr(Comment, query) if asc_order else desc(getattr(Comment, query))
 
     @hybrid_method
     def search_by_lectorer_id(self, query: int) -> bool:
-        response = true
-        if query:
-            response = and_(Comment.review_status == ReviewStatus.APPROVED, Comment.lecturer_id == query)
-        return response
+        if not query:
+            return true()
+        return and_(Comment.review_status == ReviewStatus.APPROVED, Comment.lecturer_id == query)
 
     @hybrid_method
     def search_by_user_id(self, query: int) -> bool:
-        response = true
-        if query:
-            response = and_(Comment.user_id == query)
-        return response
+        if not query:
+            return true()
+        return Comment.user_id == query
 
 
 class LecturerUserComment(BaseDbModel):

rating_api/routes/comment.py

@@ -207,19 +207,18 @@ async def get_comments(
         .filter(Comment.search_by_lectorer_id(lecturer_id))
         .filter(Comment.search_by_user_id(user_id))
         .order_by(
-            *(
-                Comment.order_by_create_ts(order_by, asc_order)
-                if "mark" in order_by
-                else Comment.order_by_mark(order_by, asc_order)
-            )
+            Comment.order_by_create_ts(order_by, asc_order)
+            if "mark" in order_by
+            else Comment.order_by_mark(order_by, asc_order)
         )
     )
-    
+
+    print(comments_query.statement.compile())
     comments = comments_query.limit(limit).offset(offset).all()
-        
+
     if not comments:
         raise ObjectNotFound(Comment, 'all')
-    if user and "rating.comment.review" in [scope['name'] for scope in user.get('session_scopes')]:
+    if "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:
@@ -230,7 +229,7 @@ async def get_comments(
         comment_validator = CommentGet
 
     result.comments = comments
-    
+
     if unreviewed:
         if not user:
             raise ForbiddenAction(Comment)
@@ -244,7 +243,6 @@ async def get_comments(
             raise ForbiddenAction(Comment)
     else:
         result.comments = [comment for comment in result.comments if comment.review_status is ReviewStatus.APPROVED]
-    result.comments = result.comments[offset : limit + offset]
 
     result.total = len(result.comments)
     result.comments = [comment_validator.model_validate(comment) for comment in result.comments]