fix: Remove upcoming events from after event email text (#6624)

app/api/helpers/mail.py

@@ -204,7 +204,7 @@ def send_user_email_role_invite(email, role_name, event_name, link):
     )
 
 
-def send_email_after_event(email, event_name, upcoming_events):
+def send_email_after_event(email, event_name, frontend_url):
     """email for role invite"""
     send_email(
         to=email,
@@ -215,7 +215,7 @@ def send_email_after_event(email, event_name, upcoming_events):
         html=MAILS[AFTER_EVENT]['message'].format(
             email=email,
             event_name=event_name,
-            upcoming_events=upcoming_events
+            url=frontend_url
         )
     )
 

app/api/helpers/query.py

@@ -38,6 +38,7 @@ def event_query(self, query_, view_kwargs, event_id='event_id', event_identifier
     return query_
 
 
+# TODO: Unused function. Remove
 def get_upcoming_events():
     return Event.query.filter(Event.starts_at >= datetime.datetime.now()).filter(
         Event.ends_at >= datetime.datetime.now()).filter_by(deleted_at=None)

app/api/helpers/scheduled_jobs.py

@@ -29,13 +29,6 @@ def send_after_event_mail():
     from app import current_app as app
     with app.app_context():
         events = Event.query.filter_by(state='published', deleted_at=None).all()
-        upcoming_events = get_upcoming_events()
-        upcoming_event_links = "<ul>"
-        for upcoming_event in upcoming_events:
-            frontend_url = get_settings()['frontend_url']
-            upcoming_event_links += "<li><a href='{}/events/{}'>{}</a></li>" \
-                .format(frontend_url, upcoming_event.id, upcoming_event.name)
-        upcoming_event_links += "</ul>"
         for event in events:
             organizers = get_user_event_roles_by_role_name(event.id, 'organizer')
             speakers = Speaker.query.filter_by(event_id=event.id, deleted_at=None).all()
@@ -44,16 +37,17 @@ def send_after_event_mail():
             time_difference = current_time - event.ends_at
             time_difference_minutes = (time_difference.days * 24 * 60) + \
                 (time_difference.seconds / 60)
+            frontend_url = get_settings()['frontend_url']
             if current_time > event.ends_at and time_difference_minutes < 1440:
                 for speaker in speakers:
                     if not speaker.is_email_overridden:
-                        send_email_after_event(speaker.user.email, event.name, upcoming_event_links)
+                        send_email_after_event(speaker.user.email, event.name, frontend_url)
                         send_notif_after_event(speaker.user, event.name)
                 for organizer in organizers:
-                    send_email_after_event(organizer.user.email, event.name, upcoming_event_links)
+                    send_email_after_event(organizer.user.email, event.name, frontend_url)
                     send_notif_after_event(organizer.user, event.name)
                 if owner:
-                    send_email_after_event(owner.user.email, event.name, upcoming_event_links)
+                    send_email_after_event(owner.user.email, event.name, frontend_url)
                     send_notif_after_event(owner.user, event.name)
 
 

app/api/helpers/system_mails.py

@@ -63,8 +63,7 @@
         'message': (
             u"Hi {email},<br/>" +
             u"Thank You for participating in our event. We hope you enjoyed it. "
-            u"Please check the list of more upcoming events. <br />" +
-            u"Here are the upcoming events: {upcoming_events}. Get ready!! "
+            u"Please check out other upcoming events around you on {url} <br />"
         ),
         'sent_at': '1 day after the event'
     },