diff --git a/app/config/appConfig.js b/app/config/appConfig.js index 411e6ff..01c6b37 100644 --- a/app/config/appConfig.js +++ b/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 STAGING = process.env.ENVIRONMENT !== "production"; +const USE_KIVI_ENVIRONMENT_TAG = process.env.KIVI_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 CHECK_UP_DAYS = parseInt(process.env.CHECK_UP_DAYS) || 10; +const NO_CHECK_UP_DAYS = parseInt(process.env.NO_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 API_MAP_KEY = process.env.API_MAP_KEY || ""; +const GOOGLE_MAP_KEY = process.env.GOOGLE_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, - API_MAP_KEY, - STAGING, - CHECK_UP_DAYS, + GOOGLE_MAP_KEY, + USE_KIVI_ENVIRONMENT_TAG, + NO_CHECK_UP_DAYS, PROSTOR_LOGIN, USER_AGENT }; diff --git a/app/controllers/location.js b/app/controllers/location.js index 214fcbf..b0e1944 100644 --- a/app/controllers/location.js +++ b/app/controllers/location.js @@ -17,15 +17,15 @@ const getLocation = async (req, res) => { return; } const selectedArea = searchRequest.areaToSearch; - const sw = selectedArea.coordinates[0][3]; - const ne = selectedArea.coordinates[0][1]; + const southWest = selectedArea.coordinates[0][3]; + const northEast = selectedArea.coordinates[0][1]; if (sw[0] && ne[0]) { selectedLatLngBounds = { - swLat: sw[1], - swLng: sw[0], - neLat: ne[1], - neLng: ne[0] + swLat: southWest[1], + swLng: southWest[0], + neLat: northEast[1], + neLng: northEast[0] }; boundsSelected = true; } diff --git a/app/helpers/db/searchRequestMatch.js b/app/helpers/db/searchRequestMatch.js index 794711b..4d4d053 100644 --- a/app/helpers/db/searchRequestMatch.js +++ b/app/helpers/db/searchRequestMatch.js @@ -2,7 +2,7 @@ const db = require("../../models/index"); const sequelize = require("sequelize"); const Op = sequelize.Op; -const { CHECK_UP_DAYS } = require("../../config/appConfig"); +const { NO_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 CHECK_UP_DAYS days from now + //The ones that received notification for real estate NO_CHECK_UP_DAYS days from now const date = new Date(); - const checkUpDate = date.getDate() - CHECK_UP_DAYS; + const checkUpDate = date.getDate() - NO_CHECK_UP_DAYS; date.setDate(checkUpDate); const dateQuery = { createdAt: { diff --git a/app/helpers/emailContentGenerator.js b/app/helpers/emailContentGenerator.js index d201e8f..01f593a 100644 --- a/app/helpers/emailContentGenerator.js +++ b/app/helpers/emailContentGenerator.js @@ -3,12 +3,12 @@ const { MAX_REAL_ESTATES_IN_EMAIL, APP_URL, - STAGING + USE_KIVI_ENVIRONMENT_TAG } = require("../config/appConfig"); const { AD_CATEGORY, AD_TYPE, EMAIL_FREQUENCY } = require("../common/enums"); -//Tag to recognize staging from development -const stagingTag = STAGING ? "[STAGING] " : ""; +//Tag to recognize staging from development if needed +const stagingTag = USE_KIVI_ENVIRONMENT_TAG ? "[STAGING] " : ""; const generateEmailFooter = (searchRequestId, emailFrequencyTitle) => { return `
Trenutno ste prijavljeni da obavještenja o novim nekretninama primate ${emailFrequencyTitle.toLowerCase()} .
diff --git a/app/services/notificationService.js b/app/services/notificationService.js index bb649ea..ef356cc 100644 --- a/app/services/notificationService.js +++ b/app/services/notificationService.js @@ -1,7 +1,7 @@ "use strict"; -const { STAGING } = require("../config/appConfig"); +const { USE_KIVI_ENVIRONMENT_TAG } = require("../config/appConfig"); -const stagingTag = STAGING ? "[STAGING] " : ""; +const stagingTag = USE_KIVI_ENVIRONMENT_TAG ? "[STAGING] " : ""; const { matchRealEstates, diff --git a/app/views/location.ejs b/app/views/location.ejs index 8e30feb..7f3d8bd 100644 --- a/app/views/location.ejs +++ b/app/views/location.ejs @@ -217,7 +217,7 @@ }); diff --git a/development.env b/development.env index bc1cc92..56a368c 100644 --- a/development.env +++ b/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 -ENVIRONMENT=Variable to denote development, staging and production +KIVI_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 -CHECK_UP_DAYS=Check up email is sent after this number of days without notification +NO_CHECK_UP_DAYS=Check up email is sent after this number of days without notification #=============== GOOGLE ANALYTICS =============# GA_ID=Google Analytics ID #=============== GOOGLE MAPS =============# -API_MAP_KEY=(your-key-here) +GOOGLE_MAP_KEY=(your-key-here) #=============== AWS SDK EMAIL SETTINGS =======# AWS_KEY_ID=(your-key-here)