Merge branch 'master' after user-agent change into email-density

app/config/appConfig.js

@@ -9,14 +9,14 @@ const APP_URL =
     ? process.env.APP_URL || "http://market-alarm"
     : process.env.APP_URL || `${APP_BASE_URL}:${APP_PORT}`;
 
-const USE_KIVI_ENVIRONMENT_TAG = process.env.KIVI_ENVIRONMENT !== "production";
+const STAGING = process.env.ENVIRONMENT !== "production";
 
 const DEFAULT_TIMEZONE = "Europe/Sarajevo";
 
 const CRAWLER_INTERVAL = parseInt(process.env.CRAWLER_INTERVAL) || 60;
 const STOP_CRAWLER = !!parseInt(process.env.STOP_CRAWLER);
 
-const NO_CHECK_UP_DAYS = parseInt(process.env.NO_CHECK_UP_DAYS) || 10;
+const CHECK_UP_DAYS = parseInt(process.env.CHECK_UP_DAYS) || 10;
 
 const AWS_EMAIL_CONFIG = {
   REGION: process.env.AWS_REGION || "",
@@ -34,7 +34,7 @@ const MAX_REAL_ESTATES_IN_FIRST_EMAIL =
 
 const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
 
-const GOOGLE_MAP_KEY = process.env.GOOGLE_MAP_KEY || "";
+const API_MAP_KEY = process.env.API_MAP_KEY || "";
 
 const PROSTOR_LOGIN = {
   EMAIL: process.env.PROSTOR_LOGIN_EMAIL,
@@ -55,9 +55,9 @@ module.exports = {
   MAX_REAL_ESTATES_IN_EMAIL,
   MAX_REAL_ESTATES_IN_FIRST_EMAIL,
   PRINT_CRAWLER_DEBUG,
-  GOOGLE_MAP_KEY,
+  API_MAP_KEY,
-  USE_KIVI_ENVIRONMENT_TAG,
+  STAGING,
-  NO_CHECK_UP_DAYS,
+  CHECK_UP_DAYS,
   PROSTOR_LOGIN,
   USER_AGENT
 };

app/controllers/location.js

@@ -17,15 +17,15 @@ const getLocation = async (req, res) => {
     return;
   }
   const selectedArea = searchRequest.areaToSearch;
-  const southWest = selectedArea.coordinates[0][3];
+  const sw = selectedArea.coordinates[0][3];
-  const northEast = selectedArea.coordinates[0][1];
+  const ne = selectedArea.coordinates[0][1];
 
   if (sw[0] && ne[0]) {
     selectedLatLngBounds = {
-      swLat: southWest[1],
+      swLat: sw[1],
-      swLng: southWest[0],
+      swLng: sw[0],
-      neLat: northEast[1],
+      neLat: ne[1],
-      neLng: northEast[0]
+      neLng: ne[0]
     };
     boundsSelected = true;
   }

app/helpers/db/searchRequest.js

@@ -156,33 +156,11 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else {
       // If real estate dont have defined number of rooms ex. null
-      //It returns requests that didn't choose number of rooms - also null
+      //It returns all search requests except for ones that dont want incpomlete ads
-      //Or ones that picked some values but also picked to includeIncomplete ads (or default)
       numberOfRoomsQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            [Op.and]: [
+        }
-              {
-                numberOfRoomsMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                numberOfRoomsMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.or]: {
-                [Op.eq]: true,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
       };
     }
   }
@@ -212,30 +190,9 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else {
       numberOfFloorsQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            [Op.and]: [
+        }
-              {
-                numberOfFloorsMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                numberOfFloorsMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.or]: {
-                [Op.eq]: true,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
       };
     }
   }
@@ -264,30 +221,9 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else {
       floorQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            [Op.and]: [
+        }
-              {
-                floorMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                floorMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.or]: {
-                [Op.eq]: true,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
       };
     }
   }
@@ -296,7 +232,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
   //If user dont check checkbox for ex. elevator  it does not mean he only wants no elevator
   //If real estate characteristic =true find all req, one that wants charachertistic or dont care - dont need query
   //If real estate characteristic = false, find all req exept for ones that wants characteristic to be true
-  //If real estate characteristic = null, dont know if true or false, find req that dont care or want char and want incomplete ads
+  //If real estate characteristic = null, dont know if true or false, find all req except ones that dont want incomplete ads
   let balconyQuery = {};
   if (realEstateTypeObject.hasBalconyProp && balcony !== true) {
     if (balcony === false) {
@@ -307,30 +243,9 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else if (balcony === null) {
       balconyQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            balcony: {
+        }
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                balcony: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.or]: {
-                    [Op.eq]: true,
-                    [Op.is]: null
-                  }
-                }
-              }
-            ]
-          }
-        ]
       };
     }
   }
@@ -344,30 +259,9 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else if (newBuilding === null) {
       newBuildingQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            newBuilding: {
+        }
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                newBuilding: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.or]: {
-                    [Op.eq]: true,
-                    [Op.is]: null
-                  }
-                }
-              }
-            ]
-          }
-        ]
       };
     }
   }
@@ -381,33 +275,13 @@ const findSearchRequestsForRealEstate = async realEstate => {
       };
     } else if (elevator === null) {
       elevatorQuery = {
-        [Op.or]: [
+        includeIncompleteAds: {
-          {
+          [Op.ne]: false
-            elevator: {
+        }
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                elevator: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.or]: {
-                    [Op.eq]: true,
-                    [Op.is]: null
-                  }
-                }
-              }
-            ]
-          }
-        ]
       };
     }
   }
+
   //General query consists of each individual query
   const query = {
     adType,

app/helpers/db/searchRequestMatch.js

@@ -2,7 +2,7 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
-const { NO_CHECK_UP_DAYS } = require("../../config/appConfig");
+const { CHECK_UP_DAYS } = require("../../config/appConfig");
 
 const findRealEstatesForSearchRequest = async searchRequestId => {
   const query = {
@@ -45,9 +45,9 @@ const findNotNotifiedMatches = async () => {
 };
 const findAllRequestsForCheckUp = async () => {
   //First we find IDs of search request that don't need to be emailed for check up - to EXCLUDE
-  //The ones that received notification for real estate NO_CHECK_UP_DAYS days from now
+  //The ones that received notification for real estate CHECK_UP_DAYS days from now
   const date = new Date();
-  const checkUpDate = date.getDate() - NO_CHECK_UP_DAYS;
+  const checkUpDate = date.getDate() - CHECK_UP_DAYS;
   date.setDate(checkUpDate);
   const dateQuery = {
     createdAt: {

app/helpers/emailContentGenerator.js

@@ -3,12 +3,12 @@
 const {
   MAX_REAL_ESTATES_IN_EMAIL,
   APP_URL,
-  USE_KIVI_ENVIRONMENT_TAG
+  STAGING
 } = require("../config/appConfig");
 const { AD_CATEGORY, AD_TYPE, EMAIL_FREQUENCY } = require("../common/enums");
 
-//Tag to recognize staging from development if needed
+//Tag to recognize staging from development
-const stagingTag = USE_KIVI_ENVIRONMENT_TAG ? "[STAGING] " : "";
+const stagingTag = STAGING ? "[STAGING] " : "";
 
 const generateEmailFooter = (searchRequestId, emailFrequencyTitle) => {
   return `  <div>Trenutno ste prijavljeni da obavještenja o novim nekretninama primate <strong>${emailFrequencyTitle.toLowerCase()} </strong>.</div>

app/services/notificationService.js

@@ -1,7 +1,7 @@
 "use strict";
-const { USE_KIVI_ENVIRONMENT_TAG } = require("../config/appConfig");
+const { STAGING } = require("../config/appConfig");
 
-const stagingTag = USE_KIVI_ENVIRONMENT_TAG ? "[STAGING] " : "";
+const stagingTag = STAGING ? "[STAGING] " : "";
 
 const {
   matchRealEstates,

app/views/location.ejs

@@ -217,7 +217,7 @@
   });
 </script>
 <script
-  src="https://maps.googleapis.com/maps/api/js?key=<%= process.env.GOOGLE_MAP_KEY %>&language=bs&libraries=places&callback=initMap"
+  src="https://maps.googleapis.com/maps/api/js?key=<%= process.env.API_MAP_KEY %>&language=bs&libraries=places&callback=initMap"
   async
   defer
 ></script>

development.env

@@ -8,19 +8,19 @@ 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
 
-KIVI_ENVIRONMENT=Variable to denote development, staging and production
+ENVIRONMENT=Variable to denote development, staging and production
 
 USER_AGENT=User agent header to send in fetch requests
 
 MAX_REAL_ESTATES_IN_EMAIL=Max number of real estates that will be shown in email, others will be truncated and URL with full list will be shwon
 MAX_REAL_ESTATES_IN_FIRST_EMAIL=Max number of real estates that will be shown in first (welcome) email
 
-NO_CHECK_UP_DAYS=Check up email is sent after this number of days without notification
+CHECK_UP_DAYS=Check up email is sent after this number of days without notification
 #=============== GOOGLE ANALYTICS =============#
 GA_ID=Google Analytics ID
 
 #=============== GOOGLE MAPS =============#
-GOOGLE_MAP_KEY=(your-key-here)
+API_MAP_KEY=(your-key-here)
 
 #=============== AWS SDK EMAIL SETTINGS =======#
 AWS_KEY_ID=(your-key-here)