refac
This commit is contained in:
1 parent
fc9c2ea191
commit
7ee75a0c04
1 file changed
+11
-4
@@ -222,12 +222,19 @@ class FeedbackTable:
|
|||||||
) -> FeedbackListResponse:
|
) -> FeedbackListResponse:
|
||||||
async with get_async_db_context(db) as db:
|
async with get_async_db_context(db) as db:
|
||||||
stmt = select(Feedback, User).join(User, Feedback.user_id == User.id)
|
stmt = select(Feedback, User).join(User, Feedback.user_id == User.id)
|
||||||
|
count_stmt = (
|
||||||
|
select(func.count(Feedback.id))
|
||||||
|
.select_from(Feedback)
|
||||||
|
.join(User, Feedback.user_id == User.id)
|
||||||
|
)
|
||||||
|
|
||||||
if filter:
|
if filter:
|
||||||
# Apply model_id filter (exact match)
|
# Apply model_id filter (exact match)
|
||||||
model_id = filter.get('model_id')
|
model_id = filter.get('model_id')
|
||||||
if model_id:
|
if model_id:
|
||||||
stmt = stmt.filter(Feedback.data['model_id'].as_string() == model_id)
|
model_id_filter = Feedback.data['model_id'].as_string() == model_id
|
||||||
|
stmt = stmt.filter(model_id_filter)
|
||||||
|
count_stmt = count_stmt.filter(model_id_filter)
|
||||||
|
|
||||||
order_by = filter.get('order_by')
|
order_by = filter.get('order_by')
|
||||||
direction = filter.get('direction')
|
direction = filter.get('direction')
|
||||||
@@ -256,9 +263,9 @@ class FeedbackTable:
|
|||||||
else:
|
else:
|
||||||
stmt = stmt.order_by(Feedback.created_at.desc())
|
stmt = stmt.order_by(Feedback.created_at.desc())
|
||||||
|
|
||||||
# Count BEFORE pagination
|
# Count before pagination without wrapping the ordered item query.
|
||||||
count_result = await db.execute(select(func.count()).select_from(stmt.subquery()))
|
count_result = await db.execute(count_stmt)
|
||||||
total = count_result.scalar()
|
total = count_result.scalar() or 0
|
||||||
|
|
||||||
if skip:
|
if skip:
|
||||||
stmt = stmt.offset(skip)
|
stmt = stmt.offset(skip)
|
||||||
|
|||||||
Reference in new issue
Block a user