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

Fixed bug, for duplicate results for 2 similar re reqests of one user

Browse Source
This commit is contained in:
Nedim Uka
2019-07-15 11:40:28 +02:00
parent 81c30c36ec
commit 778b5ff411
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/awsEmail.js
View File

@@ -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>`
}

2
app/helpers/crawlers/olxClawler.js
View File

@@ -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) {

4
app/helpers/db/dbHelper.js
View File

@@ -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 = {