kfir/Event-CRUD-Flask-python3-API
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed major issue

Browse source
This commit is contained in:
Kfir Dayan 2024-01-10 09:37:05 +02:00
parent 3eaff8dccf
commit 5c584745ae
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/EventNotifyerService.py
View file

@ -9,7 +9,7 @@ class EventNotifyerService:
pass pass
def notifyUpcommingEvents(): def notifyUpcommingEvents():
events = EventService.get_upcoming_events() events = EventService.get_all_upcomming_events()
for event in events: for event in events:
users = UserService.get_users_with_same_location_but_not_been_notifyed(event['location']) users = UserService.get_users_with_same_location_but_not_been_notifyed(event['location'])
if not users: if not users:

9
services/EventService.py
View file

@ -22,10 +22,8 @@ class EventService:
@staticmethod @staticmethod
def get_upcoming_events(location=None, sort_by=None): def get_upcoming_events(location=None, sort_by=None):
timedelta = datetime.now() + timedelta(minutes=30)
query = Event.query.filter( query = Event.query.filter(
Event.deleted == False, Event.deleted == False
Event.duedate <= timedelta
) )
if location: if location:
query = query.filter(Event.location.ilike(f"%{location}%")) query = query.filter(Event.location.ilike(f"%{location}%"))
@ -75,11 +73,10 @@ class EventService:
@staticmethod @staticmethod
def get_all_upcomming_events(): def get_all_upcomming_events():
now = datetime.now() upcoming_deadline = datetime.now() + timedelta(minutes=30)
upcoming_deadline = now + timedelta(minutes=30)
events = Event.query.filter( events = Event.query.filter(
# Event.duedate <= upcoming_deadline, Event.duedate <= upcoming_deadline,
Event.deleted == False Event.deleted == False
).all() ).all()