Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/api/feedbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from app.models.feedback import Feedback
from app.models.event import Event
from app.models.session import Session
from app.models.user import User


class FeedbackListPost(ResourceList):
Expand Down Expand Up @@ -72,7 +73,17 @@ def query(self, view_kwargs):
:return:
"""
query_ = self.session.query(Feedback)
query_ = event_query(self, query_, view_kwargs)
if view_kwargs.get('user_id'):
# feedbacks under an user
user = safe_query(self, User, 'id', view_kwargs['user_id'], 'user_id')
query_ = query_.join(User, User.id == Feedback.user_id).filter(User.id == user.id)
elif view_kwargs.get('session_id'):
# feedbacks under a session
session = safe_query(self, Session, 'id', view_kwargs['session_id'], 'session_id')
query_ = query_.join(Session, Session.id == Feedback.session_id).filter(Session.id == session.id)
else:
# feedbacks under an event
query_ = event_query(self, query_, view_kwargs)
return query_

view_kwargs = True
Expand Down
2 changes: 1 addition & 1 deletion app/api/schema/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Meta:
many=True,
type_='notification')
feedbacks = Relationship(
attribute='feedbacks',
attribute='feedback',
self_view='v1.user_feedback',
self_view_kwargs={'id': '<id>'},
related_view='v1.feedback_list',
Expand Down