{{#each marketAlertUrl}}
{{title}}{{/each}}
Kompletan spisak nekretnina možete pegledati ovdije:
Nekretnine
-
`
-}
+
`;
+};
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,
diff --git a/app/helpers/db/dbHelper.js b/app/helpers/db/dbHelper.js
index 2175036..b606cbb 100644
--- a/app/helpers/db/dbHelper.js
+++ b/app/helpers/db/dbHelper.js
@@ -1,90 +1,106 @@
-const db = require('../../models/index');
+const db = require("../../models/index");
/**
- * Find all subscribed RealEstateRequests
+ * Find all subscribed RealEstateRequests
*/
const allRERequest = async () => {
- return await db.RealEstateRequest.findAll({
- where: {
- subscribed: true
- }
- });
-}
+ return await db.RealEstateRequest.findAll({
+ where: {
+ subscribed: true
+ }
+ });
+};
/**
* Find all subscribed RealEstateRequests by UUID
*/
-const allRERequestByUiid = async (requestArray) => {
-
+const allRERequestByUiid = async requestArray => {
const Op = db.Sequelize.Op;
return await db.RealEstateRequest.findAll({
- where: {
- subscribed: true,
- [Op.or]: requestArray
- }
- });
-}
+ where: {
+ subscribed: true,
+ [Op.or]: requestArray
+ }
+ });
+};
/**
* Find all , or all depending on notified bolean marketalerts, that the hasLocation is true, and order them by email
- *
+ *
* @param fechAll bolean
* @param notified bolean
- *
+ *
* @returns array of MarketAlerts
*/
const allMarketAlerts = async (fetchAll, notified) => {
-
- let queryObject = {
- order: [
- ['email', 'DESC'],
- ]
- }
-
- if (!fetchAll){
- queryObject.where = {
- notified: notified,
- hasLocation: true
- }
- }
-
- return await db.MarketAlert.findAll(queryObject);
- }
-
- /**
- * Find all , MarketAlerts depending on request
- *
- * @param request string
- *
- * @returns array of MarketAlerts
- */
-const allMarketAlertsByRequest = async (request) => {
-
let queryObject = {
- where : {
- request: request
- }
+ order: [["email", "DESC"]]
+ };
+
+ if (!fetchAll) {
+ queryObject.where = {
+ notified: notified,
+ hasLocation: true
+ };
}
return await db.MarketAlert.findAll(queryObject);
-}
+};
-
/**
- * Find all unnotified marketalerts
+ * Find all , MarketAlerts depending on request
+ *
+ * @param request string
+ *
+ * @returns array of MarketAlerts
+ */
+const allMarketAlertsByRequest = async request => {
+ let queryObject = {
+ where: {
+ request: request
+ }
+ };
+
+ return await db.MarketAlert.findAll(queryObject);
+};
+
+/**
+ * Find MarketAlerts by id
+ *
+ * @param id number
+ *
+ * @returns single MarketAlert
+ */
+const getMarketAlertById = async id => {
+ let queryObject = {
+ where: {
+ id: id
+ }
+ };
+
+ return await db.MarketAlert.findOne(queryObject);
+};
+
+/**
+ * Find all unnotified marketalerts
* @param latLng array
* @param email string
- *
+ *
* @returns array of MarketAlerts
*/
const findPointInsideBoundingBox = async (latLng, email, uniqueId) => {
- return await db.sequelize.query(`SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND "uniqueId" = '${uniqueId}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${latLng[0]} ${latLng[1]})'))`);
-}
+ return await db.sequelize.query(
+ `SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND "uniqueId" = '${uniqueId}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${
+ latLng[0]
+ } ${latLng[1]})'))`
+ );
+};
module.exports = {
allRERequest,
allMarketAlerts,
allRERequestByUiid,
findPointInsideBoundingBox,
- allMarketAlertsByRequest
+ allMarketAlertsByRequest,
+ getMarketAlertById
};
diff --git a/index.js b/index.js
index a15ee99..5e9ad28 100644
--- a/index.js
+++ b/index.js
@@ -1,19 +1,38 @@
-const welcome = require('./app/controllers/welcome').getWelcome;
-const { getRealEstateTypes, postRealEstateTypes } = require('./app/controllers/realEstateTypes');
-const { getRegion, postRegion } = require('./app/controllers/regions');
-const { getMunicipality, postMunicipality } = require('./app/controllers/municipalities');
-const { getSize, postSize } = require('./app/controllers/sizes');
-const { getGardenSize, postGardenSize } = require('./app/controllers/gardenSizes');
-const { getPrice, postPrice } = require('./app/controllers/prices');
-const { getQueryReview, postQueryReview } = require('./app/controllers/queryReview');
-const { getQuerySubmit, postQuerySubmit } = require('./app/controllers/querySubmit');
-const { getGoAgain } = require('./app/controllers/goAgain');
-const { getNeighborhood, postNeighborhood } = require('./app/controllers/neighborhoodMap');
-const { getUnsubscribe } = require('./app/controllers/unsubscribe');
-const { getRealEstates} = require('./app/controllers/realEstates');
-const schedule = require('node-schedule');
-const crawlAll = require('./app/services/crawlerService')
-const processNotifications = require('./app/services/notificationService')
+const welcome = require("./app/controllers/welcome").getWelcome;
+const {
+ getRealEstateTypes,
+ postRealEstateTypes
+} = require("./app/controllers/realEstateTypes");
+const { getRegion, postRegion } = require("./app/controllers/regions");
+const {
+ getMunicipality,
+ postMunicipality
+} = require("./app/controllers/municipalities");
+const { getSize, postSize } = require("./app/controllers/sizes");
+const {
+ getGardenSize,
+ postGardenSize
+} = require("./app/controllers/gardenSizes");
+const { getPrice, postPrice } = require("./app/controllers/prices");
+const {
+ getQueryReview,
+ postQueryReview
+} = require("./app/controllers/queryReview");
+const {
+ getQuerySubmit,
+ postQuerySubmit
+} = require("./app/controllers/querySubmit");
+const { getGoAgain } = require("./app/controllers/goAgain");
+const {
+ getNeighborhood,
+ postNeighborhood
+} = require("./app/controllers/neighborhoodMap");
+const { getUnsubscribe } = require("./app/controllers/unsubscribe");
+const { getRealEstates } = require("./app/controllers/realEstates");
+const { redirect } = require("./app/controllers/redirect");
+const schedule = require("node-schedule");
+const crawlAll = require("./app/services/crawlerService");
+const processNotifications = require("./app/services/notificationService");
let express = require("express");
const path = require("path");
@@ -23,7 +42,7 @@ const sendNotification = require("./app/lib/sendNotification");
const scrapTheItems = require("./app/lib/scrapTheItems");
const sequelize = require("./app/models/index").sequelize;
const Twocheckout = require("2checkout-node");
-const layout = require('express-layout');
+const layout = require("express-layout");
const app = express();
app.use(bodyParser.json());
@@ -31,11 +50,11 @@ app.use(bodyParser.urlencoded({ extended: true }));
const port = process.env.PORT || 5000;
-app.set('views', path.join(__dirname, '/app/views'));
-app.set('view engine', 'ejs');
+app.set("views", path.join(__dirname, "/app/views"));
+app.set("view engine", "ejs");
app.use(layout());
-const compression = require('compression');
+const compression = require("compression");
app.use(compression());
app.get("/api/sendnotifications", async (req, res) => {
@@ -111,7 +130,7 @@ app.post("/api/payforalert", (req, res) => {
}
};
- tco.checkout.authorize(params, function (error, data) {
+ tco.checkout.authorize(params, function(error, data) {
if (error) {
res.send(error.message);
} else {
@@ -120,64 +139,73 @@ app.post("/api/payforalert", (req, res) => {
});
});
-app.get('/', welcome);
-app.get('/vrstanekretnine/:request_id', getRealEstateTypes);
-app.get('/vrstanekretnine', getRealEstateTypes);
+app.get("/", welcome);
+app.get("/vrstanekretnine/:request_id", getRealEstateTypes);
+app.get("/vrstanekretnine", getRealEstateTypes);
-app.post('/vrstanekretnine/:request_id', postRealEstateTypes);
-app.post('/vrstanekretnine', postRealEstateTypes);
+app.post("/vrstanekretnine/:request_id", postRealEstateTypes);
+app.post("/vrstanekretnine", postRealEstateTypes);
-app.get('/grad/:request_id', getRegion);
-app.post('/grad/:request_id', postRegion);
+app.get("/grad/:request_id", getRegion);
+app.post("/grad/:request_id", postRegion);
-app.get('/mjesto/:request_id', getMunicipality);
-app.post('/mjesto/:request_id', postMunicipality);
+app.get("/mjesto/:request_id", getMunicipality);
+app.post("/mjesto/:request_id", postMunicipality);
-app.get('/naselje/:request_id/:municipality', getNeighborhood);
-app.post('/naselje/:request_id/:municipality', postNeighborhood);
+app.get("/naselje/:request_id/:municipality", getNeighborhood);
+app.post("/naselje/:request_id/:municipality", postNeighborhood);
-app.get('/povrsina/:request_id', getSize);
-app.post('/povrsina/:request_id', postSize);
+app.get("/povrsina/:request_id", getSize);
+app.post("/povrsina/:request_id", postSize);
-app.get('/okucnica/:request_id', getGardenSize);
-app.post('/okucnica/:request_id', postGardenSize);
+app.get("/okucnica/:request_id", getGardenSize);
+app.post("/okucnica/:request_id", postGardenSize);
-app.get('/cijena/:request_id', getPrice);
-app.post('/cijena/:request_id', postPrice);
+app.get("/cijena/:request_id", getPrice);
+app.post("/cijena/:request_id", postPrice);
-app.get('/pregled/:request_id', getQueryReview);
-app.post('/pregled/:request_id', postQueryReview);
+app.get("/pregled/:request_id", getQueryReview);
+app.post("/pregled/:request_id", postQueryReview);
-app.get('/posalji/:request_id', getQuerySubmit);
-app.post('/posalji/:request_id', postQuerySubmit);
+app.get("/posalji/:request_id", getQuerySubmit);
+app.post("/posalji/:request_id", postQuerySubmit);
-app.get('/odjava/:request_id', getUnsubscribe);
+app.get("/odjava/:request_id", getUnsubscribe);
-app.get('/ponovo', getGoAgain);
+app.get("/ponovo", getGoAgain);
-app.get('/nekretnine/:request_id', getRealEstates);
+app.get("/nekretnine/:request_id", getRealEstates);
-app.use('/assets', express.static('./app/public'));
+app.get("/redirect/:id", redirect);
+
+app.use("/assets", express.static("./app/public"));
app.listen(port, () => console.log(`Example app listening on port ${port}!`));
var rule = new schedule.RecurrenceRule();
- rule.seccond = 1;
- schedule.scheduleJob(rule, async function () {
- console.log(new Date(), 'Crawler service started');
- await crawlAll();
- console.log(new Date(), 'Crawler service finished, starting Notification service');
- await processNotifications();
- console.log(new Date(), 'Notification service finished');
- });
-
- /**
- * Add flat method to Array
- */
- Object.defineProperty(Array.prototype, 'flat', {
- value: function(depth = 1) {
- return this.reduce(function (flat, toFlatten) {
- return flat.concat((Array.isArray(toFlatten) && (depth>1)) ? toFlatten.flat(depth-1) : toFlatten);
- }, []);
- }
+rule.seccond = 1;
+schedule.scheduleJob(rule, async function() {
+ console.log(new Date(), "Crawler service started");
+ await crawlAll();
+ console.log(
+ new Date(),
+ "Crawler service finished, starting Notification service"
+ );
+ await processNotifications();
+ console.log(new Date(), "Notification service finished");
+});
+
+/**
+ * Add flat method to Array
+ */
+Object.defineProperty(Array.prototype, "flat", {
+ value: function(depth = 1) {
+ return this.reduce(function(flat, toFlatten) {
+ return flat.concat(
+ Array.isArray(toFlatten) && depth > 1
+ ? toFlatten.flat(depth - 1)
+ : toFlatten
+ );
+ }, []);
+ }
});