-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Send email #188
Open
Karyum
wants to merge
9
commits into
master
Choose a base branch
from
send-email
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Send email #188
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c50320e
create the helper to send emails
Karyum 8e70ef9
adds the sendEmail helper to the create events controller
Karyum d3ae5e9
adds the sendEmail helper to the create places controller
Karyum 04c206e
changes a bit in the tests so they could cover the send email functio…
Karyum 6816bb0
change template id to the new one that was built
Karyum a11aac0
fixing travis tests
Karyum 089d256
travis 3.0 fix?
Karyum ca463c7
remove console log from final error handler
Karyum 04d4ec6
extract emails of users through the mongoose query
Karyum File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ const Place = require('../models/Place') | |
const { rejectIfNull } = require('../db/utils') | ||
const { messages: errMessages } = require('../constants/errors') | ||
const roles = require('../constants/roles') | ||
const sendEmail = require('../helpers/sendEmail') | ||
|
||
const placeController = module.exports = {} | ||
|
||
|
@@ -35,6 +36,7 @@ placeController.create = (req, res, next) => { | |
|
||
const newPlace = new Place(newPlaceDetails) | ||
newPlace.save() | ||
.then(place => req.user.role !== roles.BASIC ? place : sendEmail(place)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. again this is silly |
||
.then(place => res.status(201).send(place)) | ||
.catch(next) | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
const sgMail = require('@sendgrid/mail') | ||
const User = require('../models/User') | ||
sgMail.setApiKey(process.env.SENDGRID_API_KEY) | ||
sgMail.setSubstitutionWrappers('{{', '}}') | ||
|
||
const sendEmails = (emails, content) => { | ||
const msg = { | ||
to: emails, | ||
from: '[email protected]', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. put this in env var? |
||
templateId: '0839aec2-dd34-459d-9493-4fd9682b9073', | ||
substitutions: { | ||
name: content.en.name, | ||
id: content._id | ||
} | ||
} | ||
|
||
sgMail | ||
.sendMultiple(msg) | ||
} | ||
|
||
module.exports = content => | ||
new Promise((resolve, reject) => | ||
User.find({ role: { $not: /BASIC/ } }, 'email') | ||
.then(emails => sendEmails(emails, content)) | ||
.then(() => resolve(content)) | ||
.catch(reject)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not put side effects in a ternary! (use an if / else)
Your async flow is cray cray, does
sendEmail
return a promise?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i don't see any problem here other than readability maybe?, if i had this in
if/else
and in ternary it's just going to do the same thing if the user isBASIC
then sends an email then thesendEmail
function would resolve with the event, if he's not then resolve with the event without sending the email. so whats the reason here to put this in an if statement instead of ternary ?! @des-des