Merge branch 'master' into 'tag-staging-email'

# Conflicts:
#   app/config/appConfig.js
This commit is contained in:
Naida Vatric
2020-02-04 13:07:43 +00:00
22 changed files with 841 additions and 142 deletions

View File

@@ -7,10 +7,12 @@ const {
const {
generateNotificationEmail,
generateNewSearchRequestEmail,
generateEmailSubject
generateEmailSubject,
generateCheckUpEmail
} = require("../helpers/emailContentGenerator");
const {
findNotNotifiedMatches,
findAllRequestsForCheckUp,
findRealEstatesForSearchRequest
} = require("../helpers/db/searchRequestMatch");
const { sendEmail } = require("../services/emailService");
@@ -125,8 +127,26 @@ const notifyRequestsWithDailyOption = async () => {
await notifyMatches(matches, true);
};
const checkUpNotify = async () => {
const searchRequestsForCheckUp = await findAllRequestsForCheckUp();
const asyncSendEmailActions = [];
for (const searchRequest of searchRequestsForCheckUp) {
const { email } = searchRequest.dataValues;
const emailSubject = `Kivi: Mi tražimo nekretnine za vas!`;
const emailContent = generateCheckUpEmail(searchRequest.dataValues);
const sendEmailPromise = sendEmail(email, emailSubject, emailContent);
asyncSendEmailActions.push(sendEmailPromise);
sendEmailPromise.catch(err => console.log("[Email Sending Failed]", err));
}
await Promise.all(asyncSendEmailActions);
};
module.exports = {
notifyForNewRealEstates,
notifyForNewSearchRequest,
notifyRequestsWithDailyOption
notifyRequestsWithDailyOption,
checkUpNotify
};