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

codedsun · 2019-11-26T20:04:23Z

Fixes #6623

Short description of what this resolves:

Changes text of email

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

codecov · 2019-11-26T20:08:52Z

Codecov Report

Merging #6624 into development will increase coverage by 0.02%.
The diff coverage is 20%.

@@               Coverage Diff               @@
##           development    #6624      +/-   ##
===============================================
+ Coverage        65.06%   65.08%   +0.02%     
===============================================
  Files              297      297              
  Lines            15258    15253       -5     
===============================================
  Hits              9927     9927              
+ Misses            5331     5326       -5

Impacted Files	Coverage Δ
app/api/helpers/query.py	`44% <ø> (ø)`	⬆️
app/api/helpers/system_mails.py	`100% <ø> (ø)`	⬆️
app/api/helpers/scheduled_jobs.py	`24.39% <0%> (+0.95%)`	⬆️
app/api/helpers/mail.py	`29.29% <100%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dcb8b4e...e4dc5a1. Read the comment docs.

codedsun · 2019-11-26T20:17:58Z

@iamareebjamal Check this

iamareebjamal · 2019-11-26T20:42:03Z

Read the complete issue again

codedsun · 2019-11-26T21:01:41Z

Take out the list of upcoming events and instead link to eventyay.com

@iamareebjamal
Currently they are linked to? as from the code the frontend_url is grabbed from settings.py. But can you explain me ...what they meant either the frontend url is wrong ? or the event id's are wrong?

kushthedude · 2019-11-26T21:08:27Z

app/api/helpers/system_mails.py

@@ -63,7 +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"Please check out other upcoming events around you on eventyay.com <br />" +


Take out the list of upcoming events and instead link to eventyay.com
@codedsun

Please read my comment here
#6624 (comment)

@kushthedude

Remove the list of upcoming events which are being shown .

Omg, I thought take out means extraction -_-

codedsun · 2019-11-26T21:25:34Z

@kushthedude Review now!

iamareebjamal · 2019-11-26T21:28:52Z

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 eventyay.com <br />"


This repository is for open-event-server, not eventyay.com

have to use this via frontend_url? @iamareebjamal

codedsun · 2019-11-26T21:35:53Z

@iamareebjamal check now

iamareebjamal · 2019-11-26T21:36:30Z

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()


If get_upcoming_events is not used anywhere else, comment on it saying TODO: Unused function. Remove

…server into mail

app/api/helpers/query.py

…into mail

codedsun · 2019-11-26T21:41:34Z

@iamareebjamal Check now

codedsun · 2019-11-26T21:55:28Z

thank you so much :)

…

On Wed, Nov 27, 2019, 3:22 AM Areeb Jamal ***@***.***> wrote: ***@***.**** approved this pull request. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#6624?email_source=notifications&email_token=AEYZISB63XUAP7I4BAI3RJLQVWLBDA5CNFSM4JR5FDE2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCNCUWDQ#pullrequestreview-323308302>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AEYZISBAHHWBRPL47SQ2E43QVWLBDANCNFSM4JR5FDEQ> .

kushthedude

Lgtm

auto-label bot added the fix label Nov 26, 2019

kushthedude suggested changes Nov 26, 2019

View reviewed changes

codedsun force-pushed the mail branch from 9d3cb65 to 8c6854d Compare November 26, 2019 21:24

iamareebjamal reviewed Nov 26, 2019

View reviewed changes

fix: After event email text

bae44d9

codedsun force-pushed the mail branch from 8c6854d to bae44d9 Compare November 26, 2019 21:33

codedsun requested a review from iamareebjamal November 26, 2019 21:34

iamareebjamal reviewed Nov 26, 2019

View reviewed changes

codedsun added 2 commits November 27, 2019 03:08

fix: After event email text

0fc85dd

Merge branch 'development' of https://github.com/fossasia/open-event-…

d557380

…server into mail

houndci-bot reviewed Nov 26, 2019

View reviewed changes

app/api/helpers/query.py Outdated Show resolved Hide resolved

Merge branch 'mail' of https://github.com/codedsun/open-event-server …

e4dc5a1

…into mail

codedsun force-pushed the mail branch from 87e275f to e4dc5a1 Compare November 26, 2019 21:40

iamareebjamal approved these changes Nov 26, 2019

View reviewed changes

iamareebjamal requested a review from kushthedude November 26, 2019 21:52

kushthedude approved these changes Nov 26, 2019

View reviewed changes

iamareebjamal changed the title ~~fix: After event email text~~ fix: Remove upcoming events from after event email text Nov 26, 2019

iamareebjamal merged commit e9b879a into fossasia:development Nov 26, 2019

codedsun added a commit to codedsun/open-event-server that referenced this pull request Dec 22, 2019

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

bfd80d8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

codedsun commented Nov 26, 2019

codecov bot commented Nov 26, 2019 •

edited

codedsun commented Nov 26, 2019

iamareebjamal commented Nov 26, 2019

codedsun commented Nov 26, 2019 •

edited

kushthedude Nov 26, 2019

codedsun Nov 26, 2019

kushthedude Nov 26, 2019

codedsun Nov 26, 2019

codedsun commented Nov 26, 2019

iamareebjamal Nov 26, 2019

codedsun Nov 26, 2019

codedsun commented Nov 26, 2019

iamareebjamal Nov 26, 2019

codedsun Nov 26, 2019

codedsun commented Nov 26, 2019

codedsun commented Nov 26, 2019 via email

kushthedude left a comment

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

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

Conversation

codedsun commented Nov 26, 2019

Short description of what this resolves:

Checklist

codecov bot commented Nov 26, 2019 • edited

Codecov Report

codedsun commented Nov 26, 2019

iamareebjamal commented Nov 26, 2019

codedsun commented Nov 26, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Nov 26, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Nov 26, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codedsun commented Nov 26, 2019

codedsun commented Nov 26, 2019 via email

kushthedude left a comment

Choose a reason for hiding this comment

codecov bot commented Nov 26, 2019 •

edited

codedsun commented Nov 26, 2019 •

edited