chore: cancel event email content #1517

Sboonny · 2022-09-09T12:57:09Z

I have read Chapter's contributing guidelines.
My pull request has a descriptive title (not a vague title like Update README.md).
My pull request targets the main branch of Chapter.

Currently, It isn't possible to run cypress locally, and it doesn't work on Gitpod, so I will delay adding test until then.

How it looks

the email content

The Upcoming Event for Heidenreich, Koch and Kreiger is canceled.

View Upcoming Events for Abshire - Barrows: [Abshire - Barrows chapter](https://3000-sboonny-chapter-0ge8coe9jt5.ws-eu64.gitpod.io/chapters/4).
----------------------------

- Stop receiving upcoming event notifications for Abshire - Barrows. you can do it here: https://3000-sboonny-chapter-0ge8coe9jt5.ws-eu64.gitpod.io/events/15?emaillink=true.
- More about Abshire - Barrows or to unfollow this chapter: https://3000-sboonny-chapter-0ge8coe9jt5.ws-eu64.gitpod.io/chapters/4.

----------------------------
You received this email because you subscribed to Heidenreich, Koch and Kreiger Event.

See the options above to change your notifications.

gitpod-io · 2022-09-09T12:57:13Z

ghost · 2022-09-09T12:58:10Z

👇 Click on the image for a new way to code review

Make big changes easier — review code in small groups of related files
Know where to start — see the whole change at a glance
Take a code tour — explore the change with an interactive tour
Make comments and review — all fully sync’ed with github

Try it now!

Legend

server/src/controllers/Events/resolver.ts

gikf · 2022-09-09T19:28:46Z

server/src/controllers/Events/resolver.ts

+      View Upcoming Events for ${event.chapter.name}: <a href='${chapterURL}'>${event.chapter.name} chapter</a>.<br />
+      ----------------------------<br />
+      <br />
+      - Stop receiving upcoming event notifications for ${event.chapter.name}. you can do it here: <a href="${eventURL}">${eventURL}</a>.<br />


From event page, only further event notifications for that event can be changed. Seems that either wording or url needs to be changed.

I have updated it to this

- Stop receiving event notifications for ${event.name}. You can do it here: <a href="${eventURL}">${eventURL}</a>. 

But it maybe redundant, should we delete that line?

Co-authored-by: Krzysztof G. <60067306+gikf@users.noreply.github.com>

gikf · 2022-09-10T08:25:03Z

Out of curiosity, what's the join and leave function mentioned in comment?

Sboonny · 2022-09-10T08:42:51Z

In issue #274, there is this a mentioning of join button in this comment. It should act as indicator that you are planning to attend the Event, as far as I know

So Event Card could have a join button

gikf · 2022-09-10T12:20:01Z

That sounds like joining and leaving chapter. Joining chapter is implemented as a standalone action and also is implicitly performed when user is RSVPing for an event from not joined chapter.

Leaving chapter is not implemented.

server/src/controllers/Events/resolver.ts

ojeytonwilliams · 2022-10-24T10:10:12Z

server/src/controllers/Events/resolver.ts

+      const cancelEventEmail = `The Upcoming Event ${event.name} is canceled.<br />
+      <br />
+      View Upcoming Events for ${event.chapter.name}: <a href='${chapterURL}'>${event.chapter.name} chapter</a>.<br />
+      ----------------------------<br />
+      <br />
+      - Stop receiving event notifications for ${event.name}. You can do it here: <a href="${eventURL}">${eventURL}</a>.<br />
+      - More about ${event.chapter.name} or to unfollow this chapter: <a href="${chapterURL}">${chapterURL}</a>.<br />
+      <br />
+      ----------------------------<br />
+      You received this email because you Subscribed to ${event.name} Event.<br />
+      <br />
+      See the options above to change your notifications.


Suggested change

const cancelEventEmail = `The Upcoming Event ${event.name} is canceled. 

 

View Upcoming Events for ${event.chapter.name}: <a href='${chapterURL}'>${event.chapter.name} chapter</a>. 

---------------------------- 

 

- Stop receiving event notifications for ${event.name}. You can do it here: <a href="${eventURL}">${eventURL}</a>. 

- More about ${event.chapter.name} or to unfollow this chapter: <a href="${chapterURL}">${chapterURL}</a>. 

 

---------------------------- 

You received this email because you Subscribed to ${event.name} Event. 

 

See the options above to change your notifications.

const cancelEventEmail = `The upcoming event ${event.name} has been canceled. 

 

View upcoming events for ${event.chapter.name}: <a href='${chapterURL}'>${event.chapter.name} chapter</a>. 

---------------------------- 

I think this flows better. I deleted the notifications text because it should be possible to DRY it out.

We have two types of emails

Ones sent in response to a user action

Ones sent because a user is subscribed

All emails should have the same unsubscribe text

To manage notifications about this event, go to <a href="${eventURL}">${eventURL}</a>. To manage notifications from this chapter about new events, go to <a href="${chapterURL}">${chapterURL}</a>. 

Emails that are sent because the user is subscribed to an event should explain that. Similarly emails that are sent because of a chapter subscription should explain that.

Finally emails that are sent in response to a user action need no explanation.

@Sboonny could you handle this in this PR? I think makes sense to handle them all together, so we can make sure they're consistent.

in 0620983

I have tried to DRY it using unsubscribeOption, but the resolver didn't use user.id.

So before I add them, do we need user.id in cancel events email? although it doesn't make sense to unfollow canceled events, people may want to cancel their chapter membership.

So do we add it? or just link it?

It seems simplest to always provide both of the unsubscribe links. We don't need to customise them for the users current subscription state.

Unfollowing cancelled events should mostly be pointless, but conceivably events could be uncancelled. It's safer to let users unsubscribe and respect their wishes.

Sure, random question 😅, the 0620983 should have failed cypress because there were no user.id, but it succeeded. should we worry about that?

Nvm it checked for 4 tests

Given that the tests didn't run, I'm not worried!

sorry for the confusion, the function meant to run without user.id, which is interesting 🤔

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

server/src/controllers/Events/resolver.ts

server/src/util/eventEmail.ts

ojeytonwilliams

Hey @Sboonny I hope the suggestions make sense, but give me a shout if they don't.

server/src/util/eventEmail.ts

server/src/controllers/Events/resolver.ts

ojeytonwilliams · 2022-11-22T09:58:58Z

server/src/controllers/Events/resolver.ts

+    const unsubScribeOptions = NotificationContextText({
+      linkToEvent: eventURL,
+      linkToChapter: chapterURL,
+    });


This should use getEventUnsubscribeOptions (and be unsubscribeOptions)

This is complicated because this cancel RSVP without userId, so if we are using getEventUnsubscibeOptions, we will force user to log in

Should we move the text to the resolver with comment of why we are doing this?

We can't force users to login when they want to unsubscribe from email notifications. Fortunately, there's no need to. We have access to the userId via event_users. Since each email is different (different unsubscribe tokens) you can use batchSender to send them all. There's an example of that in sendEventInvite.

server/src/controllers/Events/resolver.ts

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

server/src/controllers/Events/resolver.ts

Sboonny · 2022-11-28T19:00:01Z

I have merged this, if there is an issue ping me and if it's breaking the site revert it and ping me to fix it 👍

chore: cancel event email content

5d02192

Sboonny requested a review from a team September 9, 2022 12:57

Sboonny added the status: ready for review label Sep 9, 2022

gikf reviewed Sep 9, 2022

View reviewed changes

Sboonny and others added 3 commits September 9, 2022 21:46

Grammar typo

b8f019f

Co-authored-by: Krzysztof G. <60067306+gikf@users.noreply.github.com>

Change notification wording

ee94fe7

fix grammar typo

d2ef1eb

gikf requested a review from allella September 10, 2022 13:10

ojeytonwilliams added status: merge conflict and removed status: ready for review labels Sep 14, 2022

Merge branch 'main' into chore/cancel-event-email-content

600f475

Sboonny added status: ready for review and removed status: merge conflict labels Sep 15, 2022

update select to include id and name

6a471ea

ojeytonwilliams added status: merge conflict and removed status: ready for review labels Oct 17, 2022

Merge branch 'main' into chore/cancel-event-email-content

290c43b

Sboonny added status: ready for review and removed status: merge conflict labels Oct 21, 2022

ojeytonwilliams suggested changes Oct 24, 2022

View reviewed changes

Sboonny and others added 4 commits October 24, 2022 12:16

fix event url and alter the flow of the email

a6126b7

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Dry Email content text

0620983

Merge branch 'main' into chore/cancel-event-email-content

3bd23b3

use the current user id in cancel email

16de043

Sboonny commented Oct 25, 2022

View reviewed changes

server/src/controllers/Events/resolver.ts Outdated Show resolved Hide resolved

Sboonny removed the status: ready for review label Oct 25, 2022

Sboonny marked this pull request as draft October 25, 2022 11:21

WIP: add generic notification text function for cancel event email

4ee6854

Sboonny commented Oct 28, 2022

View reviewed changes

server/src/controllers/Events/resolver.ts Outdated Show resolved Hide resolved

Sboonny commented Oct 28, 2022

View reviewed changes

server/src/util/eventEmail.ts Outdated Show resolved Hide resolved

Muhammed Mustafa added 2 commits November 21, 2022 16:16

Merge branch 'main' into chore/cancel-event-email-content

bce7345

Fix merge conflict errors

b582327

Sboonny marked this pull request as ready for review November 22, 2022 08:48

Sboonny added the status: ready for review label Nov 22, 2022

ojeytonwilliams suggested changes Nov 22, 2022

View reviewed changes

Sboonny and others added 4 commits November 22, 2022 10:21

make it clearer and reduce boilerplate code

66a3337

Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>

Send email to subscribed memebers

2e7c4da

remove extra code and used already there variable

f157474

fix the if statement logic

28dd217

Sboonny commented Nov 22, 2022

View reviewed changes

server/src/controllers/Events/resolver.ts Outdated Show resolved Hide resolved

Sboonny added 2 commits November 22, 2022 14:12

change if logic to check for length

ae35156

fix the if statement logic

35611a4

Sboonny mentioned this pull request Nov 22, 2022

As an owner or chapter admin I can cancel events and all participants who have RSVP'd will get an email notification. #100

Closed

5 tasks

Sboonny merged commit 5da4faa into freeCodeCamp:main Nov 28, 2022

Sboonny deleted the chore/cancel-event-email-content branch November 28, 2022 19:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: cancel event email content #1517

chore: cancel event email content #1517

Sboonny commented Sep 9, 2022 •

edited

Loading

gitpod-io bot commented Sep 9, 2022

ghost commented Sep 9, 2022 •

edited by ghost

Loading

gikf Sep 9, 2022

Sboonny Sep 10, 2022

gikf commented Sep 10, 2022

Sboonny commented Sep 10, 2022

gikf commented Sep 10, 2022

ojeytonwilliams Oct 24, 2022

Sboonny Oct 24, 2022 •

edited

Loading

ojeytonwilliams Oct 25, 2022

Sboonny Oct 25, 2022 •

edited

Loading

ojeytonwilliams Oct 25, 2022

Sboonny Oct 25, 2022

ojeytonwilliams left a comment

ojeytonwilliams Nov 22, 2022

Sboonny Nov 22, 2022

Sboonny Nov 22, 2022

ojeytonwilliams Nov 22, 2022

Sboonny commented Nov 28, 2022

chore: cancel event email content #1517

chore: cancel event email content #1517

Conversation

Sboonny commented Sep 9, 2022 • edited Loading

gitpod-io bot commented Sep 9, 2022

ghost commented Sep 9, 2022 • edited by ghost Loading

Legend

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gikf commented Sep 10, 2022

Sboonny commented Sep 10, 2022

gikf commented Sep 10, 2022

Choose a reason for hiding this comment

Sboonny Oct 24, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sboonny Oct 25, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ojeytonwilliams left a comment

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

Choose a reason for hiding this comment

Sboonny commented Nov 28, 2022

Sboonny commented Sep 9, 2022 •

edited

Loading

ghost commented Sep 9, 2022 •

edited by ghost

Loading

Sboonny Oct 24, 2022 •

edited

Loading

Sboonny Oct 25, 2022 •

edited

Loading