From 778b5ff411db1a55fa343c3765a2a8a05c2df428 Mon Sep 17 00:00:00 2001
From: Nedim Uka <nedim@saburly.com>
Date: Mon, 15 Jul 2019 11:40:28 +0200
Subject: [PATCH] Fixed bug, for duplicate results for 2 similar re reqests of
 one user

---
 app/helpers/awsEmail.js            | 6 +++---
 app/helpers/crawlers/olxClawler.js | 2 +-
 app/helpers/db/dbHelper.js         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js
index f6ce8c6..04279d1 100644
--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -109,10 +109,10 @@ const sendBulkEmail = async (marketAlerts) => {
       return { uniqueId: marketAlert }
     });
 
-    const RERequest = await allRERequestByUiid(RERequestUuids);
+    const RERequests = await allRERequestByUiid(RERequestUuids);
     const requestDataValues = [];
 
-    RERequest.forEach(RERequest => {
+    RERequests.forEach(RERequest => {
       var formatedRequest = {};
       formatedRequest[RERequest.uniqueId] =
         requestDataValues[RERequest.uniqueId] = {
@@ -211,7 +211,7 @@ const getNotificationEmailHtml = () => {
   <div>
   <div>{{#each marketAlertUrl}}<li><a href="{{url}}">{{title}}</a></li><br />{{/each}}<div/> 
   <div/>
-  <div>Kompletan spisan nekretnina mozete pegledati ovdije: <a href="{{requestUrl}}">Nekretnine</a> <div>
+  <div>Kompletan spisak nekretnina možete pegledati ovdije: <a href="{{requestUrl}}">Nekretnine</a> <div>
   </div>`
 }
 
diff --git a/app/helpers/crawlers/olxClawler.js b/app/helpers/crawlers/olxClawler.js
index dcc90d7..139b30b 100644
--- a/app/helpers/crawlers/olxClawler.js
+++ b/app/helpers/crawlers/olxClawler.js
@@ -43,7 +43,7 @@ module.exports = class OlxCrawler {
 
                 if (null !== finalResult) {
                     if (finalResult.lat !== undefined && finalResult.lat !== null && finalResult.lat !== "") {
-                        const pointInsideBoundingBox = await findPointInsideBoundingBox([finalResult.lng, finalResult.lat], finalResult.email);
+                        const pointInsideBoundingBox = await findPointInsideBoundingBox([finalResult.lng, finalResult.lat], finalResult.email, finalResult.uuid);
 
 
                         if (pointInsideBoundingBox[0].length !== 0) {
diff --git a/app/helpers/db/dbHelper.js b/app/helpers/db/dbHelper.js
index de696e9..2175036 100644
--- a/app/helpers/db/dbHelper.js
+++ b/app/helpers/db/dbHelper.js
@@ -77,8 +77,8 @@ const allMarketAlertsByRequest = async (request) => {
  * 
  * @returns array of MarketAlerts
  */
-const findPointInsideBoundingBox = async (latLng, email) => {
-  return await db.sequelize.query(`SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${latLng[0]} ${latLng[1]})'))`);
+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]})'))`);
 }
 
 module.exports = {