Skip to content

Commit b8b66a0

Browse files
fix: returns queried feedback only
1 parent d4825f1 commit b8b66a0

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

app/api/feedbacks.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from app.models.feedback import Feedback
1515
from app.models.event import Event
1616
from app.models.session import Session
17+
from app.models.user import User
1718

1819

1920
class FeedbackListPost(ResourceList):
@@ -72,7 +73,17 @@ def query(self, view_kwargs):
7273
:return:
7374
"""
7475
query_ = self.session.query(Feedback)
75-
query_ = event_query(self, query_, view_kwargs)
76+
if view_kwargs.get('user_id'):
77+
# feedbacks under an user
78+
user = safe_query(self, User, 'id', view_kwargs['user_id'], 'user_id')
79+
query_ = query_.join(User, User.id == Feedback.user_id).filter(User.id == user.id)
80+
elif view_kwargs.get('session_id'):
81+
# feedbacks under a session
82+
session = safe_query(self, Session, 'id', view_kwargs['session_id'], 'session_id')
83+
query_ = query_.join(Session, Session.id == Feedback.session_id).filter(Session.id == session.id)
84+
else:
85+
# feedbacks under an event
86+
query_ = event_query(self, query_, view_kwargs)
7687
return query_
7788

7889
view_kwargs = True

app/api/schema/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Meta:
9090
many=True,
9191
type_='notification')
9292
feedbacks = Relationship(
93-
attribute='feedbacks',
93+
attribute='feedback',
9494
self_view='v1.user_feedback',
9595
self_view_kwargs={'id': '<id>'},
9696
related_view='v1.feedback_list',

0 commit comments

Comments
 (0)