`;
+
+ const emailFooter = generateEmailFooter(searchRequestId);
+
+ return `
Zdravo
+
Pronašli smo nekretnine koje odgovaraju Vašoj pretrazi
+
+ ${realEstateLinks}
+
+ ${moreRealEstates}
+
+
+ ${emailFooter}`;
+};
+
+const generateNewSearchRequestEmail = searchRequest => {
+ const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
+ const {
+ id,
+ gardenSizeMin,
+ gardenSizeMax,
+ sizeMin,
+ sizeMax,
+ priceMin,
+ priceMax
+ } = searchRequest;
+
+ const gardenSize = realEstateType.hasGardenSize
+ ? `
Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2
`
+ : ``;
+
+ const emailFooter = generateEmailFooter(id);
+
+ return `
Zdravo
+
Naručili ste da Vam javimo ako se nekretnina sa navedenim uslovima pojavi u oglasima:
+
+
+
Tip nekretnine: ${realEstateType.title}
+
Lokacija:
+
Kvadratura nekretnine: Od ${sizeMin} do ${sizeMax} m2
+ ${gardenSize}
+
Cijena: ${priceMin} do ${priceMax} KM
+
+
+ ${emailFooter}`;
+};
+
+module.exports = {
+ generateNotificationEmail,
+ generateNewSearchRequestEmail
+};
diff --git a/app/helpers/enums.js b/app/helpers/enums.js
deleted file mode 100644
index 93f1f6f..0000000
--- a/app/helpers/enums.js
+++ /dev/null
@@ -1,57 +0,0 @@
-const realEstateTypes = [
- { title: "Kuća", id: "kuca", hasGardenSize: true, olxid: 24 },
- { title: "Stan", id: "stan", hasGardenSize: false, olxid: 23 },
- { title: "Vikendica", id: "vikendica", hasGardenSize: true, olxid: 26 }
-];
-
-const sizes = [
- { title: "do 50 m2", id: "50m2" },
- { title: "do 75 m2", id: "75m2" },
- { title: "do 100 m2", id: "100m2" },
- { title: "do 150 m2", id: "150m2" },
- { title: "do 200 m2", id: "200m2" },
- { title: "preko 200 m2", id: "moreThan200m2" }
-];
-
-const gardenSizes = [
- { title: "do 100 m2", id: "100m2" },
- { title: "do 500 m2", id: "500m2" },
- { title: "do 1 dunum", id: "1000m2" },
- { title: "do 2 dunuma", id: "2000m2" },
- { title: "do 3 dunuma", id: "3000m2" },
- { title: "preko 3 dunuma", id: "moreThan3000m2" }
-];
-
-const prices = [
- { title: "do 50 000 KM", id: "50kKM" },
- { title: "do 100 000 KM", id: "100kKM" },
- { title: "do 150 000 KM", id: "150kKM" },
- { title: "do 200 000 KM", id: "200kKM" },
- { title: "do 250 000 KM", id: "250kKM" },
- { title: "preko 250 000 KM", id: "moreThan250kKM" }
-];
-
-const getEnumObject = (enumType, enumId) => {
- return enumType.find(enumValue => enumValue.id === enumId);
-};
-
-const getRealEstateTypeEnum = enumId => {
- return getEnumObject(realEstateTypes, enumId) || null;
-};
-
-const getEnumTypeTitle = (enumType, enumId) => {
- const enumObject = getEnumObject(enumType, enumId);
- if (!enumObject) {
- return null;
- }
- return enumObject.title;
-};
-
-module.exports = {
- realEstateTypes,
- sizes,
- gardenSizes,
- prices,
- getRealEstateTypeEnum,
- getEnumTypeTitle
-};
diff --git a/app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js b/app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js
new file mode 100644
index 0000000..69e37cf
--- /dev/null
+++ b/app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js
@@ -0,0 +1,15 @@
+"use strict";
+
+module.exports = {
+ up: (queryInterface, Sequelize) => {
+ return queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "adType" = 'SALE' WHERE "adType" = 'sell';`
+ );
+ },
+
+ down: (queryInterface, Sequelize) => {
+ return queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "adType" = 'sell' WHERE "adType" = 'SALE';`
+ );
+ }
+};
diff --git a/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js b/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js
new file mode 100644
index 0000000..9e5876d
--- /dev/null
+++ b/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js
@@ -0,0 +1,31 @@
+"use strict";
+
+module.exports = {
+ up: (queryInterface, Sequelize) => {
+ return Promise.all([
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'HOUSE' WHERE "realEstateType" = 'kuca';`
+ ),
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'FLAT' WHERE "realEstateType" = 'stan';`
+ ),
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'COTTAGE' WHERE "realEstateType" = 'vikendica';`
+ )
+ ]);
+ },
+
+ down: (queryInterface, Sequelize) => {
+ return Promise.all([
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'kuca' WHERE "realEstateType" = 'HOUSE';`
+ ),
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'stan' WHERE "realEstateType" = 'FLAT';`
+ ),
+ queryInterface.sequelize.query(
+ `UPDATE "SearchRequests" SET "realEstateType" = 'vikendica' WHERE "realEstateType" = 'COTTAGE';`
+ )
+ ]);
+ }
+};
diff --git a/app/models/realEstate.js b/app/models/realEstate.js
index 48c85d2..93b82c4 100644
--- a/app/models/realEstate.js
+++ b/app/models/realEstate.js
@@ -51,11 +51,5 @@ module.exports = (sequelize, DataTypes) => {
renewedDate: DataTypes.DATE
});
- RealEstate.associate = models => {
- RealEstate.belongsToMany(models.SearchRequestMatch, {
- through: "SearchRequestMatch"
- });
- };
-
return RealEstate;
};
diff --git a/app/models/searchRequest.js b/app/models/searchRequest.js
index 5e16c9e..431f708 100644
--- a/app/models/searchRequest.js
+++ b/app/models/searchRequest.js
@@ -1,5 +1,7 @@
"use strict";
+const { AD_TYPE } = require("../common/enums");
+
module.exports = (sequelize, DataTypes) => {
const SearchRequest = sequelize.define("SearchRequest", {
id: {
@@ -24,7 +26,7 @@ module.exports = (sequelize, DataTypes) => {
adType: {
type: DataTypes.TEXT,
allowNull: false,
- defaultValue: "sell"
+ defaultValue: AD_TYPE.AD_TYPE_SALE
},
email: DataTypes.TEXT,
locality: DataTypes.TEXT,
@@ -62,11 +64,5 @@ module.exports = (sequelize, DataTypes) => {
}
});
- SearchRequest.associate = models => {
- SearchRequest.belongsToMany(models.SearchRequestMatch, {
- through: "SearchRequestMatch"
- });
- };
-
return SearchRequest;
};
diff --git a/app/models/searchRequestMatch.js b/app/models/searchRequestMatch.js
index 6f9d048..19f367d 100644
--- a/app/models/searchRequestMatch.js
+++ b/app/models/searchRequestMatch.js
@@ -9,15 +9,6 @@ module.exports = (sequelize, DataTypes) => {
autoIncrement: true,
allowNull: false
},
- searchRequestId: {
- type: DataTypes.UUID,
- allowNull: false,
- primaryKey: true,
- references: {
- model: "SearchRequest",
- key: "id"
- }
- },
realEstateId: {
type: DataTypes.BIGINT,
allowNull: false,
@@ -29,6 +20,15 @@ module.exports = (sequelize, DataTypes) => {
onUpdate: "CASCADE",
onDelete: "SET NULL"
},
+ searchRequestId: {
+ type: DataTypes.UUID,
+ allowNull: false,
+ primaryKey: true,
+ references: {
+ model: "SearchRequest",
+ key: "id"
+ }
+ },
notified: {
type: DataTypes.BOOLEAN,
allowNull: false,
@@ -43,5 +43,12 @@ module.exports = (sequelize, DataTypes) => {
}
);
+ SearchRequestMatch.associate = models => {
+ SearchRequestMatch.hasMany(models.RealEstate, {
+ foreignKey: "id",
+ as: "realEstates"
+ });
+ };
+
return SearchRequestMatch;
};
diff --git a/app/services/emailService.js b/app/services/emailService.js
new file mode 100644
index 0000000..0371b94
--- /dev/null
+++ b/app/services/emailService.js
@@ -0,0 +1,56 @@
+"use strict";
+
+let AWS = require("aws-sdk");
+const htmlToText = require("html-to-text");
+
+const { AWS_EMAIL_CONFIG } = require("../config/appConfig");
+
+AWS.config.update({
+ region: AWS_EMAIL_CONFIG.REGION,
+ credentials: {
+ accessKeyId: AWS_EMAIL_CONFIG.CREDENTIALS.ACCESS_KEY_ID,
+ secretAccessKey: AWS_EMAIL_CONFIG.CREDENTIALS.SECRET_ACCESS_KEY
+ }
+});
+
+const awsMailer = new AWS.SES({ apiVersion: "2010-12-01" });
+
+const sendEmail = async (to, subject, message, from) => {
+ const params = {
+ Destination: {
+ ToAddresses: [to]
+ },
+ Message: {
+ Subject: {
+ Charset: "UTF-8",
+ Data: subject
+ },
+ Body: {
+ Html: {
+ Charset: "UTF-8",
+ Data: message
+ },
+ Text: {
+ Charset: "UTF-8",
+ Data: htmlToText.fromString(message)
+ }
+ }
+ },
+ ReturnPath: from ? from : AWS_EMAIL_CONFIG.SOURCE_EMAIL,
+ Source: from ? from : AWS_EMAIL_CONFIG.SOURCE_EMAIL
+ };
+
+ return new Promise((resolve, reject) => {
+ awsMailer.sendEmail(params, (error, data) => {
+ if (error) {
+ reject(error);
+ } else {
+ resolve(data);
+ }
+ });
+ });
+};
+
+module.exports = {
+ sendEmail
+};
diff --git a/app/services/notificationService.js b/app/services/notificationService.js
index e5625ca..52d171a 100644
--- a/app/services/notificationService.js
+++ b/app/services/notificationService.js
@@ -1,28 +1,39 @@
-const db = require("../models/index");
-const { allMarketAlerts } = require("../helpers/db/dbHelper");
+"use strict";
+const { matchRealEstates } = require("../services/searchMatchService");
const {
- createMarketAlertEmailTemplate,
- sendBulkEmail
-} = require("../helpers/awsEmail");
+ generateNotificationEmail,
+ generateNewSearchRequestEmail
+} = require("../helpers/emailContentGenerator");
+const { sendEmail } = require("../services/emailService");
-async function processNotifications() {
- try {
- const marketAlerts = await allMarketAlerts(false, false);
- await createMarketAlertEmailTemplate();
- if (marketAlerts.length > 0) {
- await sendBulkEmail(marketAlerts);
- }
+const notifyForNewRealEstates = async newRealEstates => {
+ const matches = await matchRealEstates(newRealEstates);
+ const searchRequestsToNotify = Object.keys(matches);
- await db.MarketAlert.update(
- { notified: true } /* set attributes' value */,
- { where: { notified: false } } /* where criteria */
- );
- } catch (e) {
- console.log(
- "NOTIFICATION SERVICE: could not send notifications reason: ",
- e
- );
+ const asyncSendEmailActions = [];
+ for (const id of searchRequestsToNotify) {
+ const { searchRequest } = matches[id];
+ const { email } = searchRequest;
+ const allMatchingRealEstates = matches[id].realEstates || [];
+ const emailContent = generateNotificationEmail(allMatchingRealEstates, id);
+
+ const sendEmailPromise = sendEmail(email, "Nove nekretnine", emailContent);
+ asyncSendEmailActions.push(sendEmailPromise);
+ sendEmailPromise
+ .then(res => console.log(res))
+ .catch(err => console.log(err));
}
-}
-module.exports = processNotifications;
+ await Promise.all(asyncSendEmailActions);
+};
+
+const notifyForNewSearchRequest = async searchRequest => {
+ const emailContent = generateNewSearchRequestEmail(searchRequest);
+ const { email } = searchRequest;
+ await sendEmail(email, "Market Alert", emailContent);
+};
+
+module.exports = {
+ notifyForNewRealEstates,
+ notifyForNewSearchRequest
+};
diff --git a/app/services/searchMatchService.js b/app/services/searchMatchService.js
new file mode 100644
index 0000000..1075bee
--- /dev/null
+++ b/app/services/searchMatchService.js
@@ -0,0 +1,45 @@
+"use strict";
+
+const {
+ findSearchRequestsForRealEstate
+} = require("../helpers/db/searchRequest");
+const { addMatches } = require("../helpers/db/searchRequestMatch");
+
+const matchRealEstates = async realEstates => {
+ if (Array.isArray(realEstates)) {
+ const asyncMatchActions = [];
+ const matches = {};
+ const matchingRecords = [];
+ for (const realEstate of realEstates) {
+ const searchRequestsPromise = findSearchRequestsForRealEstate(realEstate);
+ asyncMatchActions.push(searchRequestsPromise);
+
+ searchRequestsPromise.then(searchRequests => {
+ for (const searchRequest of searchRequests) {
+ const { id } = searchRequest;
+ if (!matches[id]) {
+ matches[id] = {
+ searchRequest,
+ realEstates: []
+ };
+ }
+ matches[id].realEstates.push(realEstate);
+ matchingRecords.push({
+ searchRequestId: searchRequest.id,
+ realEstateId: realEstate.id,
+ notified: false
+ });
+ }
+ });
+ }
+
+ await Promise.all(asyncMatchActions);
+
+ await addMatches(matchingRecords);
+ return matches;
+ }
+};
+
+module.exports = {
+ matchRealEstates
+};
diff --git a/development.env b/development.env
index 480f5a5..6368ee7 100644
--- a/development.env
+++ b/development.env
@@ -8,9 +8,12 @@ SEQUELIZE_LOGGING=0- no sequelize logging, 1- log to the console
PORT=Port for the app, defaults to 5000
APP_BASE_URL=base url for the app
-AMAZON_ACCES_KEY_ID=(your-key-here)
-AMAZON_SECRET_ACCESS_KEY=(your-key-here)
-AMAZON_REGION=eu-west-1
+MAX_REAL_ESTATES_IN_EMAIL=Number of real estates that will be shown in URL, others will be truncated and URL with full list will be shwon
+
+AWS_KEY_ID=(your-key-here)
+AWS_SECRET_ACCESS_KEY=(your-key-here)
+AWS_REGION=eu-west-1
+
APP_URL=http://localhost:3001
SOURCE_EMAIL=info@saburly.com
diff --git a/index.js b/index.js
index 5faf461..3ac5a92 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,3 @@
-require("dotenv").config();
-
const express = require("express");
const path = require("path");
const bodyParser = require("body-parser");
@@ -13,6 +11,9 @@ const {
} = require("./app/config/appConfig");
const routes = require("./app/routes");
const { crawlAll } = require("./app/crawler/crawl");
+const {
+ notifyForNewRealEstates
+} = require("./app/services/notificationService");
const app = express();
@@ -38,6 +39,7 @@ const crawl = () => {
crawlerRunning = true;
crawlAll().then(newRealEstates => {
crawlerRunning = false;
+ notifyForNewRealEstates(newRealEstates);
});
}
};
diff --git a/package-lock.json b/package-lock.json
index ad66538..b18ae09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2077,6 +2077,29 @@
}
}
},
+ "he": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+ },
+ "html-to-text": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-5.1.1.tgz",
+ "integrity": "sha512-Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA==",
+ "requires": {
+ "he": "^1.2.0",
+ "htmlparser2": "^3.10.1",
+ "lodash": "^4.17.11",
+ "minimist": "^1.2.0"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+ }
+ }
+ },
"htmlparser2": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
diff --git a/package.json b/package.json
index f915d34..fe4691e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
"setup": "docker build -t marketalerts . && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 4 && npm run migrate",
"docker-start": "docker start pg_marketalerts",
"docker-stop": "docker stop pg_marketalerts",
- "crawl": "cd app/crawler && node npmCrawl.js"
+ "crawl": "cd app/crawler && node npmCrawl.js",
+ "test-search": "cd test && node searchTest.js"
},
"repository": {
"type": "git",
@@ -34,6 +35,7 @@
"express": "^4.16.4",
"express-ejs-layouts": "^2.5.0",
"express-layout": "^0.1.0",
+ "html-to-text": "^5.1.1",
"moment": "^2.24.0",
"moment-timezone": "^0.5.26",
"node-fetch": "^2.3.0",
diff --git a/test/searchTest.js b/test/searchTest.js
new file mode 100644
index 0000000..ecb705a
--- /dev/null
+++ b/test/searchTest.js
@@ -0,0 +1,24 @@
+const { getRealEstateById } = require("../app/helpers/db/realEstate");
+const {
+ notifyForNewRealEstates
+} = require("../app/services/notificationService");
+
+(async () => {
+ const realEstate1 = await getRealEstateById(53069); //B.Luka, 149.000 KM, 67m2
+ const realEstate2 = await getRealEstateById(53180); //B.Luka, 70.000 KM, 24m2
+
+ const realEstate3 = await getRealEstateById(53067); //Grbavica, 109.500 KM, 51m2
+ const realEstate4 = await getRealEstateById(53077); //alipašino, 66.000 KM, 32.58 m2
+
+ const realEstate5 = await getRealEstateById(53080); //Tuzla, - KM, 47,1 m2
+ const realEstate6 = await getRealEstateById(53646); //Tuzla, 73.500 KM, 53m2
+
+ notifyForNewRealEstates([
+ realEstate1,
+ realEstate2,
+ realEstate3,
+ realEstate4,
+ realEstate5,
+ realEstate6
+ ]);
+})();