Email links now point to our URL and then redirect to the original property URL, ran prettier on the affected files
This commit is contained in:
=
@@ -1,32 +1,29 @@
|
||||
|
||||
const dotenv = require('dotenv').config();
|
||||
const { getRealEstateTypeEnum } = require('./enums');
|
||||
const { getRegionName, getMunicipalityName } = require('./codes');
|
||||
const { allRERequestByUiid } = require('./db/dbHelper');
|
||||
var AWS = require('aws-sdk');
|
||||
const TEMPLATE_NAME = "MarketAlertTemplate"
|
||||
const dotenv = require("dotenv").config();
|
||||
const { getRealEstateTypeEnum } = require("./enums");
|
||||
const { getRegionName, getMunicipalityName } = require("./codes");
|
||||
const { allRERequestByUiid } = require("./db/dbHelper");
|
||||
var AWS = require("aws-sdk");
|
||||
const TEMPLATE_NAME = "MarketAlertTemplate";
|
||||
|
||||
AWS.config.update({
|
||||
region: process.env.AMAZON_REGION,
|
||||
credentials:
|
||||
{
|
||||
credentials: {
|
||||
accessKeyId: process.env.AMAZON_ACCES_KEY_ID,
|
||||
secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY
|
||||
}
|
||||
});
|
||||
|
||||
const sendTemplatedEmail = async (email, request) => {
|
||||
|
||||
const params = {
|
||||
Destination: { /* required */
|
||||
CcAddresses: [
|
||||
],
|
||||
ToAddresses: [
|
||||
email
|
||||
]
|
||||
Destination: {
|
||||
/* required */
|
||||
CcAddresses: [],
|
||||
ToAddresses: [email]
|
||||
},
|
||||
Message: { /* required */
|
||||
Body: { /* required */
|
||||
Message: {
|
||||
/* required */
|
||||
Body: {
|
||||
/* required */
|
||||
Html: {
|
||||
Charset: "UTF-8",
|
||||
Data: getGreetingsEmailHTML(request)
|
||||
@@ -37,76 +34,124 @@ const sendTemplatedEmail = async (email, request) => {
|
||||
}
|
||||
},
|
||||
Subject: {
|
||||
Charset: 'UTF-8',
|
||||
Data: `Javimi Potvrda: ${getSubject(request.realEstateType, request.region, request.municipality)}`
|
||||
Charset: "UTF-8",
|
||||
Data: `Javimi Potvrda: ${getSubject(
|
||||
request.realEstateType,
|
||||
request.region,
|
||||
request.municipality
|
||||
)}`
|
||||
}
|
||||
},
|
||||
Source: process.env.SOURCE_EMAIL, /* required */
|
||||
ReplyToAddresses: [
|
||||
process.env.SOURCE_EMAIL,
|
||||
],
|
||||
Source: process.env.SOURCE_EMAIL /* required */,
|
||||
ReplyToAddresses: [process.env.SOURCE_EMAIL]
|
||||
};
|
||||
|
||||
const sendEmailPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendEmail(params).promise();
|
||||
const sendEmailPromise = new AWS.SES({ apiVersion: "2010-12-01" })
|
||||
.sendEmail(params)
|
||||
.promise();
|
||||
await sendEmailPromise;
|
||||
}
|
||||
};
|
||||
|
||||
const getGreetingsEmailHTML = (realestateRequest) => {
|
||||
const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
|
||||
const gardenSize = realEstateType.hasGardenSize ? `<div><strong>Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2 </strong></div>` : ``
|
||||
const getGreetingsEmailHTML = realestateRequest => {
|
||||
const realEstateType = getRealEstateTypeEnum(
|
||||
realestateRequest.realEstateType
|
||||
);
|
||||
const gardenSize = realEstateType.hasGardenSize
|
||||
? `<div><strong>Kvadratura okućnice: Od ${
|
||||
realestateRequest.gardenSizeMin
|
||||
} do ${realestateRequest.gardenSizeMax} m2 </strong></div>`
|
||||
: ``;
|
||||
|
||||
return `<h1> Zdravo,
|
||||
Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima. </h1>
|
||||
<h2> Ovo je tražena nekretnina: </h2>
|
||||
<div>
|
||||
<div> <strong>Tip nekretnine: ${realEstateType.title} </strong></div>
|
||||
<div><strong>Područje: ${getRegionName(realestateRequest.region)} </strong></div>
|
||||
<div><strong>Mjesto: ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)} </strong></div>
|
||||
<div><strong>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2 </strong></div>
|
||||
<div><strong>Područje: ${getRegionName(
|
||||
realestateRequest.region
|
||||
)} </strong></div>
|
||||
<div><strong>Mjesto: ${getMunicipalityName(
|
||||
realestateRequest.region,
|
||||
realestateRequest.municipality
|
||||
)} </strong></div>
|
||||
<div><strong>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${
|
||||
realestateRequest.sizeMax
|
||||
} m2 </strong></div>
|
||||
${gardenSize}
|
||||
<div><strong>Cijena: ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM </strong></div>
|
||||
<div><strong>Cijena: ${realestateRequest.priceMin} do ${
|
||||
realestateRequest.priceMax
|
||||
} KM </strong></div>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
</div>
|
||||
<div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${realestateRequest.uniqueId} </strong></div>
|
||||
<div><strong>Ako želiš promijeniti uslove pretrage klikni ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId} </strong></div>
|
||||
<div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${
|
||||
process.env.APP_URL
|
||||
}/odjava/${realestateRequest.uniqueId} </strong></div>
|
||||
<div><strong>Ako želiš promijeniti uslove pretrage klikni ${
|
||||
process.env.APP_URL
|
||||
}/pregled/${realestateRequest.uniqueId} </strong></div>
|
||||
<h4> Tvoj,
|
||||
Javimi tim.
|
||||
</h4>`
|
||||
</h4>`;
|
||||
};
|
||||
|
||||
}
|
||||
const getGreetingsEmaiTextVersion = realestateRequest => {
|
||||
const realEstateType = getRealEstateTypeEnum(
|
||||
realestateRequest.realEstateType
|
||||
);
|
||||
const gardenSize = realEstateType.hasGardenSize
|
||||
? "Kvadratura okućnice od " +
|
||||
realestateRequest.gardenSizeMin +
|
||||
" do " +
|
||||
realestateRequest.gardenSizeMax
|
||||
: "";
|
||||
|
||||
const getGreetingsEmaiTextVersion = (realestateRequest) => {
|
||||
const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
|
||||
const gardenSize = realEstateType.hasGardenSize ? "Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax : ""
|
||||
|
||||
const text = "Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: "
|
||||
+ realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality)
|
||||
+ "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX +
|
||||
+ gardenSize
|
||||
"\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax +
|
||||
"\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" + process.env.APP_URL + "/odjava/" + realestateRequest.uniqueId +
|
||||
"\n Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId +
|
||||
"\n Tvoj,\n Javimi tim"
|
||||
const text =
|
||||
"Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: " +
|
||||
realestateRequest.realEstateType +
|
||||
"\n Područje" +
|
||||
getRegionName(realestateRequest.region) +
|
||||
"\n Mjesto " +
|
||||
getMunicipalityName(
|
||||
realestateRequest.region,
|
||||
realestateRequest.municipality
|
||||
) +
|
||||
"\n Kvadratura nekretnine Od " +
|
||||
realestateRequest.sizeMin +
|
||||
" do " +
|
||||
realestateRequest.sizeMaX +
|
||||
+gardenSize;
|
||||
"\n Cijena od " +
|
||||
realestateRequest.priceMin +
|
||||
" do " +
|
||||
realestateRequest.priceMax +
|
||||
"\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" +
|
||||
process.env.APP_URL +
|
||||
"/odjava/" +
|
||||
realestateRequest.uniqueId +
|
||||
"\n Ako želiš promijeniti uslove pretrage klikni " +
|
||||
process.env.APP_URL +
|
||||
"/odpregled/" +
|
||||
realestateRequest.uniqueId +
|
||||
"\n Tvoj,\n Javimi tim";
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
const sendBulkEmail = async (marketAlerts) => {
|
||||
};
|
||||
|
||||
const sendBulkEmail = async marketAlerts => {
|
||||
try {
|
||||
|
||||
destinations = []
|
||||
destinations = [];
|
||||
groupedRERequests = [];
|
||||
|
||||
|
||||
const RERequestUuidsMaped = marketAlerts.map(marketAlert => marketAlert.request);
|
||||
const RERequestUuidsMaped = marketAlerts.map(
|
||||
marketAlert => marketAlert.request
|
||||
);
|
||||
|
||||
const RERequestUuidsArray = Array.from(new Set(RERequestUuidsMaped));
|
||||
|
||||
const RERequestUuids = RERequestUuidsArray.map(marketAlert => {
|
||||
return { uniqueId: marketAlert }
|
||||
return { uniqueId: marketAlert };
|
||||
});
|
||||
|
||||
const RERequests = await allRERequestByUiid(RERequestUuids);
|
||||
@@ -114,25 +159,24 @@ const sendBulkEmail = async (marketAlerts) => {
|
||||
|
||||
RERequests.forEach(RERequest => {
|
||||
var formatedRequest = {};
|
||||
formatedRequest[RERequest.uniqueId] =
|
||||
requestDataValues[RERequest.uniqueId] = {
|
||||
realEstateType: RERequest.realEstateType,
|
||||
region: RERequest.region,
|
||||
municipality: RERequest.municipality,
|
||||
requestUrl : `${process.env.APP_URL}/nekretnine/${RERequest.uniqueId}`
|
||||
};
|
||||
formatedRequest[RERequest.uniqueId] = requestDataValues[
|
||||
RERequest.uniqueId
|
||||
] = {
|
||||
realEstateType: RERequest.realEstateType,
|
||||
region: RERequest.region,
|
||||
municipality: RERequest.municipality,
|
||||
requestUrl: `${process.env.APP_URL}/nekretnine/${RERequest.uniqueId}`
|
||||
};
|
||||
});
|
||||
|
||||
marketAlerts.forEach(marketAlert => {
|
||||
|
||||
const requestObject = {
|
||||
email: marketAlert.email,
|
||||
realEstateType: requestDataValues[marketAlert.request].realEstateType,
|
||||
municipality: requestDataValues[marketAlert.request].municipality,
|
||||
region: requestDataValues[marketAlert.request].region,
|
||||
requestUrl: requestDataValues[marketAlert.request].requestUrl
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
if (!groupedRERequests[marketAlert.request]) {
|
||||
groupedRERequests[marketAlert.request] = {
|
||||
@@ -144,65 +188,66 @@ const sendBulkEmail = async (marketAlerts) => {
|
||||
groupedRERequests[marketAlert.request].marketAlertArray.push({
|
||||
url: marketAlert.url,
|
||||
title: marketAlert.title,
|
||||
id: marketAlert.id
|
||||
});
|
||||
});
|
||||
for (request in groupedRERequests) {
|
||||
|
||||
const marketAlert = groupedRERequests[request];
|
||||
let extractedData = toAWSArray(marketAlert.marketAlertArray);
|
||||
const realEstateType = getRealEstateTypeEnum(marketAlert.requestObject.realEstateType).title;
|
||||
const realEstateType = getRealEstateTypeEnum(
|
||||
marketAlert.requestObject.realEstateType
|
||||
).title;
|
||||
const region = getRegionName(marketAlert.requestObject.region);
|
||||
const municipality = getMunicipalityName(marketAlert.requestObject.region, marketAlert.requestObject.municipality);
|
||||
const requestUrl = marketAlert.requestObject.requestUrl
|
||||
const municipality = getMunicipalityName(
|
||||
marketAlert.requestObject.region,
|
||||
marketAlert.requestObject.municipality
|
||||
);
|
||||
const requestUrl = marketAlert.requestObject.requestUrl;
|
||||
|
||||
let repData = `{ "marketAlertUrl":[${extractedData}], "realestateType":"${realEstateType}", "region":"${region}", "municipality":"${municipality}", "requestUrl":"${requestUrl}" }`
|
||||
let repData = `{ "marketAlertUrl":[${extractedData}], "realestateType":"${realEstateType}", "region":"${region}", "municipality":"${municipality}", "requestUrl":"${requestUrl}" }`;
|
||||
|
||||
destinations.push({
|
||||
Destination: {
|
||||
ToAddresses: [
|
||||
marketAlert.requestObject.email
|
||||
]
|
||||
ToAddresses: [marketAlert.requestObject.email]
|
||||
},
|
||||
ReplacementTemplateData: repData
|
||||
})
|
||||
|
||||
});
|
||||
}
|
||||
console.log("AWS EMAIL : Bulk email replacement data:");
|
||||
console.log(destinations);
|
||||
|
||||
var params = {
|
||||
Destinations:
|
||||
destinations,
|
||||
Source: process.env.SOURCE_EMAIL, /* required */
|
||||
Template: TEMPLATE_NAME, /* required */
|
||||
DefaultTemplateData: '{ \"REPLACEMENT_TAG_NAME\":\"REPLACEMENT_VALUE\" }',
|
||||
ReplyToAddresses: [
|
||||
process.env.SOURCE_EMAIL,
|
||||
]
|
||||
Destinations: destinations,
|
||||
Source: process.env.SOURCE_EMAIL /* required */,
|
||||
Template: TEMPLATE_NAME /* required */,
|
||||
DefaultTemplateData: '{ "REPLACEMENT_TAG_NAME":"REPLACEMENT_VALUE" }',
|
||||
ReplyToAddresses: [process.env.SOURCE_EMAIL]
|
||||
};
|
||||
|
||||
// Create the promise and SES service object
|
||||
const sendPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendBulkTemplatedEmail(params).promise();
|
||||
const sendPromise = new AWS.SES({ apiVersion: "2010-12-01" })
|
||||
.sendBulkTemplatedEmail(params)
|
||||
.promise();
|
||||
const awsResult = await sendPromise;
|
||||
console.log("AWS SES bulk email response");
|
||||
console.log(awsResult);
|
||||
|
||||
|
||||
} catch (e) {
|
||||
console.log("Could not send bulk email", e)
|
||||
console.log("Could not send bulk email", e);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const toAWSArray = (urlArray) => {
|
||||
|
||||
let arrayString = ""
|
||||
const redirectUrl = marketAlertId =>
|
||||
`${process.env.APP_URL}/redirect/${marketAlertId}`;
|
||||
const toAWSArray = urlArray => {
|
||||
let arrayString = "";
|
||||
urlArray.forEach(element => {
|
||||
const formatetdTitle = element.title.replace(/"/g, "");
|
||||
arrayString = arrayString + `{"url":"${element.url.trim()}" , "title":"${formatetdTitle}"},`
|
||||
arrayString =
|
||||
arrayString +
|
||||
`{"url":"${redirectUrl(element.id)}" , "title":"${formatetdTitle}"},`;
|
||||
});
|
||||
return arrayString.slice(0, -1);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
const getNotificationEmailHtml = () => {
|
||||
return `<h2> Zdravo,
|
||||
@@ -212,36 +257,40 @@ const getNotificationEmailHtml = () => {
|
||||
<div>{{#each marketAlertUrl}}<li><a href="{{url}}">{{title}}</a></li><br />{{/each}}<div/>
|
||||
<div/>
|
||||
<div>Kompletan spisak nekretnina možete pegledati ovdije: <a href="{{requestUrl}}">Nekretnine</a> <div>
|
||||
</div>`
|
||||
}
|
||||
</div>`;
|
||||
};
|
||||
|
||||
const getNotificationEmailText = () => {
|
||||
return ` Zdravo,
|
||||
Pronašli smo nekretninu koju ste tražili. Ovo su tražene nekretnine: {{#each marketAlertUrl}} {{url}} {{title}} {{/each}} , Kompletan spisan nekretnina mozete pegledati ovdije: {{requestUrl}}`
|
||||
}
|
||||
Pronašli smo nekretninu koju ste tražili. Ovo su tražene nekretnine: {{#each marketAlertUrl}} {{url}} {{title}} {{/each}} , Kompletan spisan nekretnina mozete pegledati ovdije: {{requestUrl}}`;
|
||||
};
|
||||
|
||||
const createMarketAlertEmailTemplate = async () => {
|
||||
const marketAlertTemplate = {
|
||||
Template: {
|
||||
TemplateName: TEMPLATE_NAME,
|
||||
SubjectPart: "Javi mi obavijest: {{realestateType}}, {{region}}, {{municipality}}",
|
||||
SubjectPart:
|
||||
"Javi mi obavijest: {{realestateType}}, {{region}}, {{municipality}}",
|
||||
TextPart: getNotificationEmailText(),
|
||||
HtmlPart: getNotificationEmailHtml()
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
const templatePromise = new AWS.SES({ apiVersion: '2010-12-01' }).updateTemplate(marketAlertTemplate).promise();
|
||||
await templatePromise
|
||||
|
||||
const templatePromise = new AWS.SES({ apiVersion: "2010-12-01" })
|
||||
.updateTemplate(marketAlertTemplate)
|
||||
.promise();
|
||||
await templatePromise;
|
||||
} catch (e) {
|
||||
console.log("Could not create MarketAlertEmailTemplate", e);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const getSubject = (realEstateType, region, municipality) => {
|
||||
return `${getRealEstateTypeEnum(realEstateType).title} ${getRegionName(region)}, ${getMunicipalityName(region, municipality)}`
|
||||
}
|
||||
return `${getRealEstateTypeEnum(realEstateType).title} ${getRegionName(
|
||||
region
|
||||
)}, ${getMunicipalityName(region, municipality)}`;
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
sendTemplatedEmail,
|
||||
|
||||
Reference in New Issue
Block a user