From 7428f59c4a866d80a95a3c5a37f59c023a00e0af Mon Sep 17 00:00:00 2001 From: Abhinav Khare Date: Tue, 13 Aug 2019 09:23:50 -0400 Subject: [PATCH] Revert "fix: Return only accepted session and public speaker call (#6328)" This reverts commit 3987cd3b9a1dcb0202f4e997a6971872e29e2cd4. --- app/api/sessions.py | 4 ++-- app/api/speakers_calls.py | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/app/api/sessions.py b/app/api/sessions.py index b7ccc8c6c2..d3abb83444 100644 --- a/app/api/sessions.py +++ b/app/api/sessions.py @@ -86,7 +86,7 @@ def query(self, view_kwargs): :param view_kwargs: :return: """ - query_ = self.session.query(Session).filter(Session.state == "accepted") + query_ = self.session.query(Session) if view_kwargs.get('track_id') is not None: track = safe_query(self, Track, 'id', view_kwargs['track_id'], 'track_id') query_ = query_.join(Track).filter(Track.id == track.id) @@ -104,7 +104,7 @@ def query(self, view_kwargs): if view_kwargs.get('speaker_id'): speaker = safe_query(self, Speaker, 'id', view_kwargs['speaker_id'], 'speaker_id') # session-speaker :: many-to-many relationship - query_ = Session.query.filter(Session.speakers.any(id=speaker.id), Session.state == "accepted") + query_ = Session.query.filter(Session.speakers.any(id=speaker.id)) return query_ diff --git a/app/api/speakers_calls.py b/app/api/speakers_calls.py index a59e512a73..f4740189e9 100644 --- a/app/api/speakers_calls.py +++ b/app/api/speakers_calls.py @@ -86,29 +86,20 @@ def before_get_object(self, view_kwargs): """ if view_kwargs.get('event_identifier'): try: - event = self.session.query(Event).filter_by(identifier=view_kwargs['event_identifier'], - privacy='public').one() + event = self.session.query(Event).filter_by(identifier=view_kwargs['event_identifier']).one() except NoResultFound: raise ObjectNotFound({'parameter': 'event_identifier'}, "Event: {} not found".format(view_kwargs['event_identifier'])) else: view_kwargs['event_id'] = event.id - elif view_kwargs.get('event_id'): + if view_kwargs.get('event_id'): try: - speakers_call = self.session.query(SpeakersCall).filter_by(event_id=view_kwargs['event_id'], - privacy='public').one() + speakers_call = self.session.query(SpeakersCall).filter_by(event_id=view_kwargs['event_id']).one() except NoResultFound: raise ObjectNotFound({'parameter': 'event_identifier'}, "Object: not found") view_kwargs['id'] = speakers_call.id - else: - try: - speakers_call = self.session.query(SpeakersCall).filter_by(id=view_kwargs['id'], privacy='public').one() - except NoResultFound: - raise ObjectNotFound({'parameter': 'speaker_call_id'}, "Object: not found") - view_kwargs['id'] = speakers_call.id - decorators = (api.has_permission('is_coorganizer', fetch="event_id", fetch_as="event_id", model=SpeakersCall, methods="PATCH,DELETE"),) schema = SpeakersCallSchema