From f091014189491a59020f4ba0162c18650c3fce1a Mon Sep 17 00:00:00 2001 From: iamareebjamal Date: Fri, 4 Sep 2020 11:30:17 +0530 Subject: [PATCH] fix: Add more constraints to upcoming events --- app/api/events.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/api/events.py b/app/api/events.py index 57e773d0f1..b3d8ad06fe 100644 --- a/app/api/events.py +++ b/app/api/events.py @@ -7,7 +7,7 @@ from flask_rest_jsonapi.exceptions import ObjectNotFound from marshmallow_jsonapi import fields from marshmallow_jsonapi.flask import Schema -from sqlalchemy import or_ +from sqlalchemy import or_, and_ from sqlalchemy.orm.exc import NoResultFound from app.api.bootstrap import api @@ -862,9 +862,20 @@ def query(self, view_kwargs): query_ = ( self.session.query(Event) .filter( + Event.starts_at > current_time, Event.ends_at > current_time, Event.state == 'published', Event.privacy == 'public', + or_( + Event.is_promoted, + and_( + Event.original_image_url != None, + Event.logo_url != None, + Event.event_type_id != None, + Event.event_topic_id != None, + Event.event_sub_topic_id != None, + ), + ), ) .order_by(Event.starts_at) )