senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed garden size email issues

Browse Source
This commit is contained in:
Nedim Uka
2019-06-11 10:26:48 +02:00
parent 8f9e3ae46a
commit 506ac67956
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@@ -2,4 +2,5 @@
AMAZON_SECRET_ACCESS_KEY=HIFVed2iqt3PRCsvrO9Evqxr/7/u+UmY8WrTItq3 AMAZON_SECRET_ACCESS_KEY=HIFVed2iqt3PRCsvrO9Evqxr/7/u+UmY8WrTItq3
AMAZON_REGION=eu-west-1 AMAZON_REGION=eu-west-1
APP_URL=http://localhost:3001 APP_URL=http://localhost:3001
SOURCE_EMAIL=info@saburly.com

1
.gitignore vendored
View File

@@ -1 +1,2 @@
node_modules/ node_modules/
.env

29
app/helpers/awsEmail.js
View File

@@ -1,6 +1,8 @@
const dotenv = require('dotenv'); const dotenv = require('dotenv');
dotenv.config(); dotenv.config();
const { getRealEstateTypeEnum } = require('./enums');
const { getRegionName, getMunicipalityName } = require('./codes');
const AWS = require('aws-sdk'); const AWS = require('aws-sdk');
AWS.config.update({ AWS.config.update({
region: process.env.AMAZON_REGION, region: process.env.AMAZON_REGION,
@@ -10,7 +12,6 @@ AWS.config.update({
secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY
} }
}); });
const { getRegionName, getMunicipalityName } = require('./codes');
const sendTemplatedEmail = async (email, request) => { const sendTemplatedEmail = async (email, request) => {
@@ -38,9 +39,9 @@ const sendTemplatedEmail = async (email, request) => {
Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}` Data: `Javimi Potvrda: ${request.realEstateType} ${getRegionName(request.region)}, ${getMunicipalityName(request.region, request.municipality)}`
} }
}, },
Source: 'info@saburly.com', /* required */ Source: process.env.SOURCE_EMAIL, /* required */
ReplyToAddresses: [ ReplyToAddresses: [
'info@saburly.com', process.env.SOURCE_EMAIL,
], ],
}; };
@@ -49,17 +50,22 @@ const sendTemplatedEmail = async (email, request) => {
} }
const getEmailHTML = (realestateRequest) => { const getEmailHTML = (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, return `<h1> Zdravo,
Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima. </h1> Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima. </h1>
<h2> Ovo je tražena nekretnina: </h2> <h2> Ovo je tražena nekretnina: </h2>
<div> <div>
<div> <strong>Tip nekretnine: ${realestateRequest.realEstateType} </strong></div> <div> <strong>Tip nekretnine: ${realEstateType.title} </strong></div>
<div><strong>Područje ${getRegionName(realestateRequest.region)} </strong></div> <div><strong>Područje: ${getRegionName(realestateRequest.region)} </strong></div>
<div><strong>Mjesto ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)} </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>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2 </strong></div>
<div><strong>Kvadratura okućnice Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} 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>
<div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${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> <div><strong>Ako želiš promijeniti uslove pretrage klikni ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId} </strong></div>
@@ -70,10 +76,13 @@ Javimi tim.
} }
const getEmaiTextVersion = (realestateRequest) => { const getEmaiTextVersion = (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: " 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) + realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality)
+ "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX + + "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX +
"\n Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax + + gardenSize
"\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax + "\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 ž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 Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId +

5
development.env Normal file
View File

@@ -0,0 +1,5 @@
AMAZON_ACCES_KEY_ID=(your-key-here)
AMAZON_SECRET_ACCESS_KEY=(your-key-here)
AMAZON_REGION=eu-west-1
APP_URL=http://localhost:3001
SOURCE_EMAIL=info@saburly.com