Added hrefs to global varialbe

.gitignore

@@ -1,3 +1,2 @@
 node_modules/
 .env
-.idea/

app/common/enums.js

@@ -1,183 +0,0 @@
-const PRICE_SLIDER_OPTIONS_SALE = {
-  start: [50000, 85000],
-  range: {
-    min: [0],
-    max: [300000]
-  },
-  step: 1000,
-  connect: true
-};
-
-const PRICE_SLIDER_OPTIONS_RENT = {
-  start: [300, 500],
-  range: {
-    min: [0],
-    max: [2000]
-  },
-  step: 50,
-  connect: true
-};
-
-//This will be used for Flats, Apartments, Houses
-const HOME_SIZE_SLIDER_OPTIONS = {
-  start: [30, 75],
-  range: {
-    min: [0],
-    max: [400]
-  },
-  step: 5,
-  connect: true
-};
-
-const GARDEN_SIZE_SLIDER_OPTIONS = {
-  start: [100, 1000],
-  range: {
-    min: [0],
-    max: [10000]
-  },
-  step: 100,
-  connect: true
-};
-
-const LAND_SIZE_SLIDER_OPTIONS = {
-  start: [5000, 15000],
-  range: {
-    min: [0],
-    max: [100000]
-  },
-  step: 100,
-  connect: true
-};
-const GARAGE_SIZE_SLIDER_OPTIONS = {
-  start: [10, 20],
-  range: {
-    min: [0],
-    max: [150]
-  },
-  step: 2,
-  connect: true
-};
-
-const GARAGE_PRICE_SLIDER_OPTIONS = {
-  start: [2000, 10000],
-  range: {
-    min: [0],
-    max: [100000]
-  },
-  step: 500,
-  connect: true
-};
-
-const AD_TYPE = {
-  AD_TYPE_SALE: {
-    id: 1,
-    stringId: "SALE",
-    title: "Prodaja"
-  },
-  AD_TYPE_RENT: {
-    id: 2,
-    stringId: "RENT",
-    title: "Najam"
-  },
-  AD_TYPE_REQUEST: {
-    id: 3,
-    stringId: "REQUEST",
-    title: "Potražnja"
-  }
-};
-
-const AD_CATEGORY = {
-  ALL: {
-    id: "ALL"
-  },
-  FLAT: {
-    id: "FLAT",
-    title: "Stan",
-    hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
-  },
-  HOUSE: {
-    id: "HOUSE",
-    title: "Kuća",
-    hasGardenSize: true,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
-    gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
-  },
-  OFFICE: {
-    id: "OFFICE",
-    title: "Kancelarija",
-    hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
-  },
-  LAND: {
-    id: "LAND",
-    title: "Zemljište",
-    hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: LAND_SIZE_SLIDER_OPTIONS
-  },
-  APARTMENT: {
-    id: "APARTMENT",
-    title: "Apartman",
-    hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
-  },
-  GARAGE: {
-    id: "GARAGE",
-    title: "Garaža",
-    hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: GARAGE_SIZE_SLIDER_OPTIONS
-  },
-  COTTAGE: {
-    id: "COTTAGE",
-    title: "Vikendica",
-    hasGardenSize: true,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
-    gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
-  }
-};
-
-const AD_STATUS = {
-  STATUS_NORMAL: 1,
-  STATUS_RESERVED: 2,
-  STATUS_SOLD: 3,
-  STATUS_DELETED: 4,
-  STATUS_URGENT: 5,
-  STATUS_DISCOUNTED: 6
-};
-
-const AD_AGENCY = {
-  OLX: "OLX",
-  RENTAL: "RENTAL",
-  PROSTOR: "PROSTOR",
-  AKTIDO: "AKTIDO"
-};
-
-const CRAWLER_AD_TYPE = {
-  NONE: 0,
-  ALL: 1,
-  ONLY_SELL: 2,
-  ONLY_RENT: 3,
-  ONLY_REQUEST: 4
-};
-
-module.exports = {
-  AD_TYPE,
-  AD_CATEGORY,
-  AD_STATUS,
-  AD_AGENCY,
-  CRAWLER_AD_TYPE
-};

app/config/appConfig.js

@@ -1,43 +0,0 @@
-"use strict";
-require("dotenv").config({ path: __dirname + "/./../../.env" });
-
-const APP_PORT = process.env.PORT || 5000;
-const APP_BASE_URL = process.env.APP_BASE_URL || "http://localhost";
-
-const APP_URL =
-  process.env.NODE_ENV && process.env.NODE_ENV === "production"
-    ? process.env.APP_URL || "http://market-alarm"
-    : process.env.APP_URL || `${APP_BASE_URL}:${APP_PORT}`;
-
-const DEFAULT_TIMEZONE = "Europe/Sarajevo";
-
-const CRAWLER_INTERVAL = parseInt(process.env.CRAWLER_INTERVAL) || 60;
-const STOP_CRAWLER = !!parseInt(process.env.STOP_CRAWLER);
-
-const AWS_EMAIL_CONFIG = {
-  REGION: process.env.AWS_REGION || "",
-  CREDENTIALS: {
-    ACCESS_KEY_ID: process.env.AWS_KEY_ID || "",
-    SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || ""
-  },
-  SOURCE_EMAIL: process.env.SOURCE_EMAIL || ""
-};
-
-const MAX_REAL_ESTATES_IN_EMAIL =
-  parseInt(process.env.MAX_REAL_ESTATES_IN_EMAIL) || 10;
-const MAX_REAL_ESTATES_IN_FIRST_EMAIL =
-  parseInt(process.env.MAX_REAL_ESTATES_IN_FIRST_EMAIL) || 5;
-
-const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
-
-module.exports = {
-  APP_PORT,
-  APP_URL,
-  DEFAULT_TIMEZONE,
-  CRAWLER_INTERVAL,
-  STOP_CRAWLER,
-  AWS_EMAIL_CONFIG,
-  MAX_REAL_ESTATES_IN_EMAIL,
-  MAX_REAL_ESTATES_IN_FIRST_EMAIL,
-  PRINT_CRAWLER_DEBUG
-};

app/controllers/gardenSizes.js

@@ -0,0 +1,43 @@
+const { currentRERequest } = require('../helpers/url');
+const { getRealEstateTypeEnum } = require('../helpers/enums');
+
+const getGardenSize = (req,res) => {
+
+  const unit = " m2"
+  const rangeFrom = {
+    min : 10,
+    max : 3000,
+    value : 0,
+    step : 10
+  }
+
+  const rangeTo = {
+    min : 10,
+    max : 3000,
+    value : 100,
+    step : 10
+  }
+
+  res.render('gardenSize', { rangeFrom, rangeTo, unit });
+};
+
+const postGardenSize = async (req, res) => {
+  const request = await currentRERequest(req);
+
+  const nextStepPage = req.query.nextStep || 'cijena';
+  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
+
+  const realEstateType = getRealEstateTypeEnum(request.realEstateType);
+  if (realEstateType && realEstateType.hasGardenSize) {
+    request.gardenSizeMin = req.body.from;
+    request.gardenSizeMax = req.body.to;
+    await request.save();
+  }
+
+  res.redirect(nextStepUrl);
+};
+
+module.exports = {
+  getGardenSize,
+  postGardenSize
+};

app/controllers/goAgain.js

@@ -1,6 +1,5 @@
-const getGoAgain = async (req, res) => {
+const getGoAgain = async (req,res) => {
-  const title = "Uspjeh!";
+  res.render('goAgain');
-  res.render("goAgain", { title });
 };
 
 module.exports = {

app/controllers/location.js

@@ -1,57 +0,0 @@
-const { currentSearchRequest } = require("../helpers/url");
-
-const getLocation = async (req, res) => {
-  const title = "Odaberite lokaciju";
-  const nextStep = req.query.nextStep || "/";
-
-  res.render("location", {
-    nextStep,
-    title
-  });
-};
-
-const postLocation = async (req, res) => {
-  let searchRequest = await currentSearchRequest(req);
-
-  if (!searchRequest || !searchRequest.dataValues) {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  const northWest = [req.body.west, req.body.north];
-  const northEast = [req.body.east, req.body.north];
-  const southEast = [req.body.east, req.body.south];
-  const southWest = [req.body.west, req.body.south];
-
-  const locationInputValue =
-    req.body.locationInput && req.body.locationInput.length > 0
-      ? req.body.locationInput
-      : null;
-
-  searchRequest.areaToSearch = {
-    type: "Polygon",
-    coordinates: [[northWest, northEast, southEast, southWest, northWest]],
-    crs: { type: "name", properties: { name: "EPSG:4326" } }
-  };
-
-  let locationInputData;
-  if (req.body.locationInputData) {
-    try {
-      locationInputData = JSON.parse(req.body.locationInputData);
-    } catch (e) {
-      locationInputData = null;
-    }
-  }
-
-  await searchRequest.save();
-
-  const nextStepPage = req.query.nextStep || "filteri";
-  const nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
-
-  res.redirect(nextStepUrl);
-};
-
-module.exports = {
-  getLocation,
-  postLocation
-};

app/controllers/municipalities.js

@@ -0,0 +1,26 @@
+const { currentRERequest } = require('../helpers/url');
+const { getMunicipalitiesForRegion, getMunicipalityName } = require('../helpers/codes');
+
+const getMunicipality = async (req, res) => {
+  let request = await currentRERequest(req);
+  const municipalities = getMunicipalitiesForRegion(request.region);
+
+  res.render('municipality', { municipalities });
+};
+
+const postMunicipality = async (req, res) => {
+
+  const request = await currentRERequest(req);
+  const nextStepParam = req.query.nextStep ? "?nextStep=" + req.query.nextStep : "";
+  const nextStepUrl = `/${'naselje'}/${request.uniqueId}/${getMunicipalityName(request.region, req.body.municipality)}${nextStepParam}`;
+
+  request.municipality = req.body.municipality;
+  await request.save();
+
+  res.redirect(nextStepUrl);
+};
+
+module.exports = {
+  getMunicipality,
+  postMunicipality
+};

app/controllers/neighborhoodMap.js

@@ -0,0 +1,37 @@
+const { currentRERequest } = require('../helpers/url');
+
+const getNeighborhood = async (req, res) => {
+    const municipality = req.params.municipality
+    const nextStep = req.query.nextStep || '/';
+    res.render('neighborhoodMap', {
+        nextStep,
+        municipality
+    });
+
+};
+
+const postNeighborhood = async (req, res) => {
+    let request = await currentRERequest(req);
+    const northWest = [req.body.west, req.body.north];
+    const northEast = [req.body.east, req.body.north];
+    const southEast = [req.body.east, req.body.south];
+    const southWest = [req.body.west, req.body.south];
+
+    request.bounding_box = {
+        type: 'Polygon', coordinates: [
+            [northWest, northEast, southEast,
+                southWest, northWest]
+        ]
+    };
+    await request.save();
+
+    const nextStepPage = req.query.nextStep || 'povrsina';
+    const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
+
+    res.redirect(nextStepUrl);
+};
+
+module.exports = {
+    getNeighborhood,
+    postNeighborhood
+};

app/controllers/prices.js

@@ -0,0 +1,40 @@
+const { currentRERequest } = require('../helpers/url');
+
+const getPrice = (req,res) => {
+
+  const unit = " KM"
+  const rangeFrom = {
+    min : 1000,
+    max : 250000,
+    value : 0,
+    step : 1000
+  }
+
+  const rangeTo = {
+    min : 1000,
+    max : 250000,
+    value : 50000,
+    step : 1000
+  }
+
+
+  res.render('price', {rangeFrom, rangeTo, unit  });
+};
+
+const postPrice = async (req, res) => {
+  const request = await currentRERequest(req);
+
+  const nextStepPage = req.query.nextStep || 'pregled';
+  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
+
+  request.priceMin = req.body.from;
+  request.priceMax = req.body.to;
+  await request.save();
+
+  res.redirect(nextStepUrl);
+};
+
+module.exports = {
+  getPrice,
+  postPrice
+};

app/controllers/queryReview.js

@@ -1,174 +1,80 @@
-const { currentSearchRequest } = require("../helpers/url");
+const { currentRERequest } = require('../helpers/url');
-const { isValidEmail } = require("../helpers/email");
+const { getRegionName, getMunicipalityName } = require('../helpers/codes');
-const {
+const { realEstateTypes, sizes, gardenSizes, prices, getEnumTypeTitle, getRealEstateTypeEnum } = require('../helpers/enums');
-  notifyForNewSearchRequest
-} = require("../services/notificationService");
-const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
 
-const getQueryReviewData = searchRequest => {
+const getQueryReview = async (req,res) => {
-  const {
+  const request = await currentRERequest(req);
-    id,
-    adType,
-    realEstateType,
-    sizeMin,
-    sizeMax,
-    gardenSizeMin,
-    gardenSizeMax,
-    priceMin,
-    priceMax
-  } = searchRequest.dataValues;
-
-  const realEstateTypeObject = AD_CATEGORY[realEstateType];
-  const enableGardenSizeEdit = realEstateTypeObject
-    ? realEstateTypeObject.hasGardenSize
-    : false;
-
-  let adTypeTitle = "";
-  switch (adType) {
-    case AD_TYPE.AD_TYPE_SALE.stringId:
-      adTypeTitle = AD_TYPE.AD_TYPE_SALE.title;
-      break;
-    case AD_TYPE.AD_TYPE_RENT.stringId:
-      adTypeTitle = AD_TYPE.AD_TYPE_RENT.title;
-      break;
-    default:
-      adTypeTitle = "-";
-      break;
-  }
-
-  const realEstateTypeTitle = realEstateTypeObject
-    ? `[${adTypeTitle}] ${realEstateTypeObject.title}`
-    : "-";
-
-  const locationTitle = "Promjenite lokaciju";
-  const sizeTitle = `${sizeMin} - ${sizeMax} m2`;
-  const gardenSizeTitle = enableGardenSizeEdit
-    ? `${gardenSizeMin} - ${gardenSizeMax} m2`
-    : "-";
-  const priceTitle = `${priceMin} - ${priceMax} KM`;
-
-  return [
-    {
-      id: "realEstateType",
-      title: realEstateTypeTitle,
-      url: `/vrstanekretnine/${id}?nextStep=filteri`
-    },
-    {
-      id: "location",
-      title: locationTitle,
-      url: `/lokacija/${id}?nextStep=pregled`
-    },
-    {
-      id: "size",
-      title: sizeTitle,
-      url: `/filteri/${id}?nextStep=pregled`
-    },
-    {
-      id: "gardenSize",
-      title: gardenSizeTitle,
-      url: enableGardenSizeEdit ? `/filteri/${id}?nextStep=pregled` : ""
-    },
-    {
-      id: "price",
-      title: priceTitle,
-      url: `/filteri/${id}?nextStep=pregled`
-    }
-  ].filter(data => data.title != "-");
-};
-
-const getQueryReview = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
-
-  if (!searchRequest || !searchRequest.dataValues) {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  const title = "Da li je ovo to što ste tražili ?";
   const nextStep = req.query.nextStep;
-  const error = req.query.error;
-  const queryReviewData = getQueryReviewData(searchRequest);
-  const email = searchRequest.email;
 
-  res.render("queryReview", {
+  if (!request || !request.dataValues) {
+    return null;
+  }
+
+  const { 
+    realEstateType, 
+    region, 
+    municipality, 
+    sizeMin, 
+    sizeMax, 
+    gardenSizeMin, 
+    gardenSizeMax, 
+    priceMin, 
+    priceMax } = request.dataValues;
+
+  const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
+  const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
+
+  const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
+  const regionName = region ? getRegionName(region) : null;
+  const municipalityName = (region && municipality) ? getMunicipalityName(region, municipality) : null;
+  const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
+  const gardenSizeTitle =  gardenSizeMin ? gardenSizeMin + "-" + gardenSizeMax + " m2" : null;
+  const priceTitle =  priceMin ? priceMin + "-" + priceMax + " KM" : null;
+
+  const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : '';
+
+  const queryData = [
+    {
+      id: 'realEstateType',
+      title: realEstateTypeTitle,
+      url: `/vrstanekretnine/${uniqueId}?nextStep=pregled`,
+    },
+    {
+      id: 'region',
+      title: regionName,
+      url: `/grad/${uniqueId}?nextStep=mjesto`,
+    },
+    {
+      id: 'municipality',
+      title: municipalityName,
+      url: `/mjesto/${uniqueId}?nextStep=pregled`,
+    },
+    {
+      id: 'size',
+      title: sizeTitle,
+      url: `/povrsina/${uniqueId}?nextStep=pregled`,
+    },
+    {
+      id: 'gardenSize',
+      title: gardenSizeTitle,
+      url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : '',
+    },
+    {
+      id: 'price',
+      title: priceTitle,
+      url: `/cijena/${uniqueId}?nextStep=pregled`
+    }
+  ];
+
+  res.render('queryReview', {
     nextStep,
-    queryReviewData,
+    queryData,
-    title,
-    email,
-    error
   });
 };
 
 const postQueryReview = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
+  const request = await currentRERequest(req);
-
+  const nextStep = req.query.nextStep || `/posalji/${request.uniqueId}`;
-  if (!searchRequest || !searchRequest.dataValues) {
-    return null;
-  }
-
-  const nextStep = req.query.nextStep || "/ponovo";
-  const emailInput = req.body.email;
-  const emailConfirmInput = req.body.confirmEmail;
-  const title = "Da li je ovo to što ste tražili ?";
-  const queryReviewData = getQueryReviewData(searchRequest);
-
-  if (emailInput !== emailConfirmInput) {
-    const error = "Greška ! Unešeni emailovi nisu isti";
-    res.render("queryReview", {
-      error,
-      title,
-      queryReviewData,
-      email: ""
-    });
-    return;
-  }
-
-  if (!isValidEmail(emailInput)) {
-    const error = "Greška ! Unesite validan email";
-    res.render("queryReview", {
-      error,
-      title,
-      queryReviewData,
-      email: ""
-    });
-    return;
-  }
-
-  searchRequest.email = emailInput;
-  searchRequest.subscribed = true;
-
-  try {
-    await searchRequest.save();
-  } catch (e) {
-    console.log("[ERROR] Failed to save search request !", e);
-    console.log("Search request : ", searchRequest);
-    const error =
-      "Greška ! Nismo uspjeli kreirati zahtjev za Vašu pretragu. Molimo pokuštajte ponovo";
-    res.render("queryReview", {
-      error,
-      title,
-      queryReviewData,
-      email: ""
-    });
-    return;
-  }
-
-  try {
-    await notifyForNewSearchRequest(searchRequest);
-  } catch (e) {
-    console.log("[ERROR] Failed to send initial welcome email", e);
-    console.log("Search request : ", searchRequest);
-
-    const error =
-      "Greška ! Nismo uspjeli poslati email na Vašu adresu, pokušajte sa drugom email adresom";
-    res.render("queryReview", {
-      error,
-      title,
-      queryReviewData,
-      email: ""
-    });
-    return;
-  }
 
   res.redirect(nextStep);
 };

app/controllers/querySubmit.js

@@ -0,0 +1,51 @@
+const { currentRERequest } = require('../helpers/url');
+const { isValidEmail } = require('../helpers/email');
+const { sendTemplatedEmail} = require('../helpers/awsEmail');
+
+const getQuerySubmit = async (req, res) => {
+  const nextStep = req.query.nextStep;
+  const error = req.query.error;
+
+  res.render('querySubmit', {
+    nextStep,
+    error
+  });
+};
+
+const postQuerySubmit = async (req, res) => {
+  const request = await currentRERequest(req);
+  const nextStep = req.query.nextStep || '/ponovo';
+
+  const emailInput = req.body.email;
+  const emailConfirmInput = req.body.confirm;
+  let error = "Greška ! Unesite validan email";
+
+  if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
+
+    error = "Greška ! Unesite validan email";
+    res.render('querySubmit', {
+      error
+    });
+    return;
+  }
+
+  if (emailInput !== emailConfirmInput) {
+
+    error = "Greška ! Unešeni emailovi nisu isti";
+    res.render('querySubmit', {
+      error
+    });
+    return;
+  }
+
+  request.email = req.body.email;
+  request.subscribed = true;
+  await request.save();
+  sendTemplatedEmail(req.body.email, request);
+  res.redirect(nextStep); 
+};
+
+module.exports = {
+  getQuerySubmit,
+  postQuerySubmit
+};

app/controllers/realEstateFilters.js

@@ -1,109 +0,0 @@
-const { currentSearchRequest } = require("../helpers/url");
-const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
-
-const getFilters = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
-
-  if (!searchRequest || !searchRequest.dataValues) {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  const title = "Filteri za pretraživanje";
-
-  const {
-    adType,
-    realEstateType,
-    priceMin,
-    priceMax,
-    sizeMin,
-    sizeMax,
-    gardenSizeMin,
-    gardenSizeMax
-  } = searchRequest;
-  const category = AD_CATEGORY[realEstateType] || AD_CATEGORY.FLAT;
-
-  const {
-    hasGardenSize,
-    priceSliderOptionsSale,
-    priceSliderOptionsRent,
-    sizeSliderOptions,
-    gardenSizeSliderOptions
-  } = category;
-
-  let priceSliderOptions;
-  if (adType === AD_TYPE.AD_TYPE_SALE.stringId) {
-    priceSliderOptions = Object.assign({}, priceSliderOptionsSale);
-  } else if (adType === AD_TYPE.AD_TYPE_RENT.stringId) {
-    priceSliderOptions = Object.assign({}, priceSliderOptionsRent);
-  } else {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  if (priceMin || priceMax) {
-    priceSliderOptions.start = [priceMin, priceMax];
-  }
-
-  if (sizeMin || sizeMax) {
-    sizeSliderOptions.start = [sizeMin, sizeMax];
-  }
-
-  if (gardenSizeSliderOptions && (gardenSizeMin || gardenSizeMax)) {
-    gardenSizeSliderOptions.start = [gardenSizeMin, gardenSizeMax];
-  }
-
-  res.render("realEstateFilters", {
-    title,
-    hasGardenSize,
-    priceSliderOptions: JSON.stringify(priceSliderOptions),
-    sizeSliderOptions: JSON.stringify(sizeSliderOptions),
-    gardenSizeSliderOptions: JSON.stringify(gardenSizeSliderOptions)
-  });
-};
-
-const postFilters = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
-
-  if (!searchRequest || !searchRequest.dataValues) {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  const nextStepPage = req.query.nextStep || "pregled";
-  const nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
-
-  const priceMin = parseInt(req.body.priceMin) || 0;
-  const priceMax = parseInt(req.body.priceMax) || 0;
-  const sizeMin = parseInt(req.body.sizeMin) || 0;
-  const sizeMax = parseInt(req.body.sizeMax) || 0;
-
-  //TODO: Filter validation
-
-  searchRequest.priceMin = priceMin;
-  searchRequest.priceMax = priceMax;
-  searchRequest.sizeMin = sizeMin;
-  searchRequest.sizeMax = sizeMax;
-
-  if (
-    req.body.gardenSizeMin !== undefined &&
-    req.body.gardenSizeMax !== undefined
-  ) {
-    const gardenSizeMin = parseInt(req.body.gardenSizeMin);
-    const gardenSizeMax = parseInt(req.body.gardenSizeMax);
-
-    //TODO: Filter validation
-
-    searchRequest.gardenSizeMin = gardenSizeMin;
-    searchRequest.gardenSizeMax = gardenSizeMax;
-  }
-
-  await searchRequest.save();
-
-  res.redirect(nextStepUrl);
-};
-
-module.exports = {
-  getFilters,
-  postFilters
-};

app/controllers/realEstateTypes.js

@@ -1,78 +1,41 @@
-const { currentSearchRequest } = require("../helpers/url");
+const db = require('../models/index');
-const { createSearchRequest } = require("../helpers/db/searchRequest");
 
-const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
+const { currentRERequest } = require('../helpers/url');
+const { realEstateTypes, getRealEstateTypeEnum } = require('../helpers/enums');
 
-const getRealEstateTypes = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
 
-  const title = "Koju nekretninu tražite?";
+const getRealEstateTypes = (req,res) => {
-  let selectedAdType = AD_TYPE.AD_TYPE_SALE.id;
+  res.render('realEstateType', { realEstateTypes });
-  if (
-    searchRequest &&
-    searchRequest.adType &&
-    searchRequest.adType === AD_TYPE.AD_TYPE_RENT.stringId
-  ) {
-    selectedAdType = AD_TYPE.AD_TYPE_RENT.id;
-  }
-  const realEstateTypes = Object.keys(AD_CATEGORY)
-    .map(category => AD_CATEGORY[category])
-    .filter(category => category.title);
-
-  res.render("realEstateType", {
-    selectedAdType,
-    realEstateTypes,
-    title,
-    AD_TYPE
-  });
 };
 
 const postRealEstateTypes = async (req, res) => {
-  const searchRequest = await currentSearchRequest(req);
+  const request = await currentRERequest(req);
 
-  const adType = parseInt(req.body.adType);
+  const nextStepPage = req.query.nextStep || 'grad';
 
-  const adTypeStringIds = {
+  if (request && request.uniqueId) {
-    [AD_TYPE.AD_TYPE_SALE.id]: AD_TYPE.AD_TYPE_SALE.stringId,
+    const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
-    [AD_TYPE.AD_TYPE_RENT.id]: AD_TYPE.AD_TYPE_RENT.stringId
+    request.realEstateType = req.body.realestatetype;
-  };
+    if (!getRealEstateTypeEnum(request.realEstateType).hasGardenSize){
-
+      request.gardenSize = null;
-  const adTypeStringId =
-    adTypeStringIds[adType] || AD_TYPE.AD_TYPE_SALE.stringId;
-
-  const validRealEstateTypes = Object.keys(AD_CATEGORY).filter(
-    category => !!AD_CATEGORY[category].title
-  );
-
-  const selectedRealEstateType = req.body.realEstateType || null;
-  if (validRealEstateTypes.indexOf(selectedRealEstateType) === -1) {
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  const nextStepPage = req.query.nextStep || "lokacija";
-
-  let nextStepUrl = "";
-  if (searchRequest && searchRequest.id) {
-    nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
-    searchRequest.adType = adTypeStringId;
-    searchRequest.realEstateType = selectedRealEstateType;
-
-    await searchRequest.save();
-  } else {
-    try {
-      const newSearchRequest = await createSearchRequest({
-        adType: adTypeStringId,
-        realEstateType: selectedRealEstateType
-      });
-
-      nextStepUrl = `/${nextStepPage}/${newSearchRequest.id}`;
-    } catch (error) {
-      console.log(error);
-      nextStepUrl = `/`;
     }
+    await request.save();
+
+    res.redirect(nextStepUrl)
+  } else {
+    db.RealEstateRequest.create({
+      realEstateType: req.body.realestatetype
+    }).then( (result) => {
+      const nextStepUrl = `/${nextStepPage}/${result.uniqueId}`;
+      res.redirect(nextStepUrl);
+    }).catch( (e) => {
+      res.send(e);
+    });
   }
-  res.redirect(nextStepUrl);
+
+
+
+
 };
 
 module.exports = {

app/controllers/realEstates.js

@@ -1,16 +0,0 @@
-"use strict";
-const {
-  findRealEstatesForSearchRequest
-} = require("../helpers/db/searchRequestMatch");
-
-const getRealEstates = async (req, res) => {
-  const searchRequestId = req.params["searchRequestId"] || "";
-  const realEstates = await findRealEstatesForSearchRequest(searchRequestId);
-
-  const title = "Nekretnine koje odgovaraju Vašim uslovima pretrage";
-  res.render("realEstates", { realEstates, title });
-};
-
-module.exports = {
-  getRealEstates
-};

app/controllers/redirect.js

@@ -1,33 +0,0 @@
-const { getRealEstateById } = require("../helpers/db/realEstate");
-
-const getRedirect = async (req, res) => {
-  const id = req.params.id || null;
-  let error = false;
-  let redirectUrl = undefined;
-  if (!id) {
-    error = true;
-  } else {
-    try {
-      const realEstate = await getRealEstateById(id);
-      if (!realEstate) {
-        error = true;
-      } else {
-        redirectUrl = realEstate.url;
-      }
-    } catch (e) {
-      error = true;
-    }
-  }
-
-  if (error) {
-    const title = "";
-    res.render("notFound", { title });
-  } else {
-    const title = "Preusmjeravanje";
-    res.render("redirect", { title, redirectUrl });
-  }
-};
-
-module.exports = {
-  getRedirect
-};

app/controllers/regions.js

@@ -0,0 +1,27 @@
+const { currentRERequest } = require('../helpers/url');
+const { getRegions } = require('../helpers/codes');
+
+const regions = getRegions();
+
+const getRegion = (req,res) => {
+  res.render('region', { regions });
+};
+
+const postRegion = async (req, res) => {
+  const request = await currentRERequest(req);
+
+  const nextStepQueryParam = req.query.nextStep ? '?nextStep=pregled' : '';
+  const nextStepPage = req.query.nextStep || 'mjesto';
+  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}${nextStepQueryParam}`;
+
+  request.region = req.body.region;
+  request.municipality = null;
+  await request.save();
+
+  res.redirect(nextStepUrl)
+};
+
+module.exports = {
+  getRegion,
+  postRegion
+};

app/controllers/sizes.js

@@ -0,0 +1,42 @@
+const { currentRERequest } = require('../helpers/url');
+const { sizes, getRealEstateTypeEnum } = require('../helpers/enums');
+
+const getSize = (req,res) => {
+
+  const unit = " m2"
+  const rangeFrom = {
+    min : 10,
+    max : 250,
+    value : 0,
+    step : 10
+  }
+
+  const rangeTo = {
+    min : 10,
+    max : 250,
+    value : 50,
+    step : 10
+  }
+
+  res.render('size', { rangeFrom, rangeTo, unit });
+};
+
+const postSize = async (req, res) => {
+  const request = await currentRERequest(req);
+
+  const realEstateType = getRealEstateTypeEnum(request.realEstateType);
+
+  const nextStep = realEstateType && realEstateType.hasGardenSize ? 'okucnica' : 'cijena';
+  const nextStepPage = req.query.nextStep || nextStep;
+  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
+  request.sizeMin = req.body.from;
+  request.sizeMax = req.body.to;
+  await request.save();
+
+  res.redirect(nextStepUrl);
+};
+
+module.exports = {
+  getSize,
+  postSize
+};

app/controllers/unsubscribe.js

@@ -1,20 +1,15 @@
-const { currentSearchRequest } = require("../helpers/url");
+
+const { currentRERequest } = require('../helpers/url');
 
 const getUnsubscribe = async (req, res) => {
-  const title = "Uspješno ste se odjavili";
+    const request = await currentRERequest(req);
-  const searchRequest = await currentSearchRequest(req);
+    request.subscribed = false;
+    await request.save();
 
-  if (!searchRequest || !searchRequest.dataValues) {
+    res.render('unsubscribe', { nextStep: '/vrstanekretnine' });
-    res.render("notFound", { title: " " });
-    return;
-  }
-
-  searchRequest.subscribed = false;
-  await searchRequest.save();
-
-  res.render("unsubscribe", { nextStep: "/vrstanekretnine", title });
 };
 
+
 module.exports = {
-  getUnsubscribe
+    getUnsubscribe
-};
+};

app/controllers/welcome.js

@@ -1,5 +1,5 @@
-const getWelcome = (req, res) => {
+const getWelcome = (req,res) => {
-  res.render("welcome", { nextStep: "/vrstanekretnine", title: false });
+  res.render('welcome', { nextStep: '/vrstanekretnine' } );
 };
 
 module.exports = {

app/crawler/crawl.js

@@ -1,81 +0,0 @@
-"use strict";
-/*
-   Entry point for crawling functionality
-   All communication between crawlers and savers is here
-   All environment specific configuration is read here and
-   passed to the crawlers and savers.
-*/
-const OlxCrawler = require("./specificCrawlers/olx");
-const RentalCrawler = require("./specificCrawlers/rental");
-const ProstorCrawler = require("./specificCrawlers/prostor");
-const AktidoCrawler = require("./specificCrawlers/aktido");
-
-const {
-  OLX_CONFIG,
-  RENTAL_CONFIG,
-  PROSTOR_CONFIG,
-  AKTIDO_CONFIG
-} = require("./crawlerConfig");
-const PostgresSaver = require("./savers/postgres");
-
-async function crawlAll() {
-  const postgresSaver = new PostgresSaver();
-
-  const crawlers = [
-    new OlxCrawler(
-      [postgresSaver],
-      OLX_CONFIG.OLX_CRAWLER_AD_TYPE,
-      OLX_CONFIG.OLX_CRAWLER_AD_CATEGORIES,
-      OLX_CONFIG.OLX_MAX_PAGES,
-      OLX_CONFIG.OLX_MAX_RESULTS_PER_PAGE,
-      OLX_CONFIG.OLX_IGNORED_USERNAMES,
-      OLX_CONFIG.OLX_DELAY_BETWEEN_PAGES
-    ),
-    new RentalCrawler(
-      [postgresSaver],
-      RENTAL_CONFIG.RENTAL_CRAWLER_AD_TYPE,
-      RENTAL_CONFIG.RENTAL_CRAWLER_AD_CATEGORIES,
-      RENTAL_CONFIG.RENTAL_MAX_PAGES,
-      RENTAL_CONFIG.RENTAL_MAX_RESULTS_PER_PAGE,
-      RENTAL_CONFIG.RENTAL_IGNORED_USERNAMES,
-      RENTAL_CONFIG.RENTAL_DELAY_BETWEEN_PAGES
-    ),
-    new ProstorCrawler(
-      [postgresSaver],
-      PROSTOR_CONFIG.PROSTOR_CRAWLER_AD_TYPE,
-      PROSTOR_CONFIG.PROSTOR_CRAWLER_AD_CATEGORIES,
-      PROSTOR_CONFIG.PROSTOR_MAX_PAGES,
-      PROSTOR_CONFIG.PROSTOR_MAX_RESULTS_PER_PAGE,
-      PROSTOR_CONFIG.PROSTOR_IGNORED_USERNAMES,
-      PROSTOR_CONFIG.PROSTOR_DELAY_BETWEEN_PAGES
-    ),
-    new AktidoCrawler(
-      [postgresSaver],
-      AKTIDO_CONFIG.AKTIDO_CRAWLER_AD_TYPE,
-      AKTIDO_CONFIG.AKTIDO_CRAWLER_AD_CATEGORIES,
-      AKTIDO_CONFIG.AKTIDO_MAX_PAGES,
-      AKTIDO_CONFIG.AKTIDO_MAX_RESULTS_PER_PAGE,
-      AKTIDO_CONFIG.AKTIDO_IGNORED_USERNAMES,
-      AKTIDO_CONFIG.AKTIDO_DELAY_BETWEEN_PAGES
-    )
-  ];
-
-  const newRealEstates = [];
-
-  for (const crawler of crawlers) {
-    try {
-      const newRealEstatesFromSingleCrawler = await crawler.crawl();
-      if (Array.isArray(newRealEstatesFromSingleCrawler)) {
-        newRealEstates.push(...newRealEstatesFromSingleCrawler);
-      }
-    } catch (e) {
-      console.log("Error crawling. Trying next crawler! ", e);
-    }
-  }
-
-  return newRealEstates;
-}
-
-module.exports = {
-  crawlAll
-};

app/crawler/crawlerConfig.js

@@ -1,14 +0,0 @@
-"use strict";
-require("dotenv").config({ path: __dirname + "/./../../.env" });
-
-const OLX_CONFIG = require("./specificConfigs/olx");
-const RENTAL_CONFIG = require("./specificConfigs/rental");
-const PROSTOR_CONFIG = require("./specificConfigs/prostor");
-const AKTIDO_CONFIG = require("./specificConfigs/aktido");
-
-module.exports = {
-  OLX_CONFIG,
-  RENTAL_CONFIG,
-  PROSTOR_CONFIG,
-  AKTIDO_CONFIG
-};

app/crawler/npmCrawl.js

@@ -1,5 +0,0 @@
-const { crawlAll } = require("./crawl");
-
-(async () => {
-  await crawlAll();
-})();

app/crawler/savers/postgres.js

@@ -1,47 +0,0 @@
-const moment = require("moment");
-
-const { bulkUpsertRealEstates } = require("../../helpers/db/realEstate");
-
-class PostgresSaver {
-  connect() {
-    //TODO: It seems we never worry about open/close connection with Sequelize ?
-    //TODO: Check if postgres is ready
-    return true;
-  }
-
-  async save(results) {
-    const savedRecords = await bulkUpsertRealEstates(results);
-
-    if (Array.isArray(savedRecords)) {
-      const newRealEstates = [];
-      const existingRealEstates = [];
-
-      for (const savedRecord of savedRecords) {
-        const { createdAt, updatedAt } = savedRecord;
-
-        const createdAtMoment = moment.utc(createdAt);
-        const updatedAtMoment = moment.utc(updatedAt);
-
-        if (createdAtMoment.isSame(updatedAtMoment, "second")) {
-          newRealEstates.push(savedRecord);
-        } else {
-          existingRealEstates.push(savedRecord);
-        }
-      }
-
-      return {
-        newRecords: newRealEstates,
-        existingRecords: existingRealEstates
-      };
-    } else {
-      throw { message: "[POSTGRES] Failed to save records" };
-    }
-  }
-
-  close() {
-    //TODO: It seems we never worry about open/close connection with Sequelize ?
-    return true;
-  }
-}
-
-module.exports = PostgresSaver;

app/crawler/specificConfigs/aktido.js

@@ -1,34 +0,0 @@
-"use strict";
-const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../../common/enums");
-
-const aktidoCrawlerAdType =
-  process.env.AKTIDO_CRAWLER_AD_TYPE !== undefined
-    ? CRAWLER_AD_TYPE[process.env.AKTIDO_CRAWLER_AD_TYPE]
-    : null;
-
-const aktidoParsedCrawlerAdCategories =
-  process.env.AKTIDO_CRAWLER_AD_CATEGORIES !== undefined
-    ? process.env.AKTIDO_CRAWLER_AD_CATEGORIES.split(",").map(category =>
-        category.trim()
-      )
-    : ["FLAT", "HOUSE"];
-
-const aktidoIgnoredUsernames = [];
-
-const transformedAktidoCrawlerAdCategories = aktidoParsedCrawlerAdCategories
-  .map(categoryName =>
-    AD_CATEGORY[categoryName] ? AD_CATEGORY[categoryName].id : undefined
-  )
-  .filter(category => !!category);
-
-module.exports = {
-  AKTIDO_MAX_PAGES: parseInt(process.env.AKTIDO_MAX_PAGES) || 500,
-  AKTIDO_MAX_RESULTS_PER_PAGE:
-    parseInt(process.env.AKTIDO_MAX_RESULTS_PER_PAGE) || 50,
-  AKTIDO_CRAWLER_AD_TYPE: aktidoCrawlerAdType || CRAWLER_AD_TYPE.NONE,
-  AKTIDO_CRAWLER_AD_CATEGORIES: transformedAktidoCrawlerAdCategories,
-  AKTIDO_IGNORED_USERNAMES: aktidoIgnoredUsernames || [],
-  AKTIDO_DELAY_BETWEEN_PAGES:
-    parseInt(process.env.AKTIDO_DELAY_BETWEEN_PAGES) || 1000,
-  AKTIDO_FORCE_CRAWL: !!parseInt(process.env.AKTIDO_FORCE_CRAWL)
-};

app/crawler/specificConfigs/olx.js

@@ -1,39 +0,0 @@
-"use strict";
-const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../../common/enums");
-
-const olxCrawlerAdType =
-  process.env.OLX_CRAWLER_AD_TYPE !== undefined
-    ? CRAWLER_AD_TYPE[process.env.OLX_CRAWLER_AD_TYPE]
-    : null;
-
-const olxParsedCrawlerAdCategories =
-  process.env.OLX_CRAWLER_AD_CATEGORIES !== undefined
-    ? process.env.OLX_CRAWLER_AD_CATEGORIES.split(",").map(category =>
-        category.trim()
-      )
-    : ["FLAT", "HOUSE"];
-
-const olxIgnoredUsernames =
-  process.env.OLX_IGNORED_USERNAMES !== undefined
-    ? process.env.OLX_IGNORED_USERNAMES.split(",").map(username =>
-        username.trim()
-      )
-    : [];
-
-const transformedOlxCrawlerAdCategories = olxParsedCrawlerAdCategories
-  .map(categoryName =>
-    AD_CATEGORY[categoryName] ? AD_CATEGORY[categoryName].id : undefined
-  )
-  .filter(category => !!category);
-
-module.exports = {
-  OLX_MAX_PAGES: parseInt(process.env.OLX_MAX_PAGES) || 500,
-  OLX_MAX_RESULTS_PER_PAGE:
-    parseInt(process.env.OLX_MAX_RESULTS_PER_PAGE) || 50,
-  OLX_CRAWLER_AD_TYPE: olxCrawlerAdType || CRAWLER_AD_TYPE.NONE,
-  OLX_CRAWLER_AD_CATEGORIES: transformedOlxCrawlerAdCategories,
-  OLX_IGNORED_USERNAMES: olxIgnoredUsernames || [],
-  OLX_DELAY_BETWEEN_PAGES:
-    parseInt(process.env.OLX_DELAY_BETWEEN_PAGES) || 1000,
-  OLX_FORCE_CRAWL: !!parseInt(process.env.OLX_FORCE_CRAWL)
-};

app/crawler/specificConfigs/prostor.js

@@ -1,33 +0,0 @@
-"use strict";
-const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../../common/enums");
-
-const prostorCrawlerAdType =
-  process.env.PROSTOR_CRAWLER_AD_TYPE !== undefined
-    ? CRAWLER_AD_TYPE[process.env.PROSTOR_CRAWLER_AD_TYPE]
-    : null;
-
-const prostorParsedCrawlerAdCategories =
-  process.env.PROSTOR_CRAWLER_AD_CATEGORIES !== undefined
-    ? process.env.PROSTOR_CRAWLER_AD_CATEGORIES.split(",").map(category =>
-        category.trim()
-      )
-    : ["FLAT", "HOUSE"];
-
-const prostorIgnoredUsernames = [];
-
-const transformedProstorCrawlerAdCategories = prostorParsedCrawlerAdCategories
-  .map(categoryName =>
-    AD_CATEGORY[categoryName] ? AD_CATEGORY[categoryName].id : undefined
-  )
-  .filter(category => !!category);
-
-module.exports = {
-  PROSTOR_MAX_PAGES: parseInt(process.env.PROSTOR_MAX_PAGES) || 100,
-  PROSTOR_MAX_RESULTS_PER_PAGE:
-    parseInt(process.env.PROSTOR_MAX_RESULTS_PER_PAGE) || 5000,
-  PROSTOR_CRAWLER_AD_TYPE: prostorCrawlerAdType || CRAWLER_AD_TYPE.NONE,
-  PROSTOR_CRAWLER_AD_CATEGORIES: transformedProstorCrawlerAdCategories,
-  PROSTOR_IGNORED_USERNAMES: prostorIgnoredUsernames || [],
-  PROSTOR_DELAY_BETWEEN_PAGES:
-    parseInt(process.env.PROSTOR_DELAY_BETWEEN_PAGES) || 1000
-};

app/crawler/specificConfigs/rental.js

@@ -1,34 +0,0 @@
-"use strict";
-const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../../common/enums");
-
-const rentalCrawlerAdType =
-  process.env.RENTAL_CRAWLER_AD_TYPE !== undefined
-    ? CRAWLER_AD_TYPE[process.env.RENTAL_CRAWLER_AD_TYPE]
-    : null;
-
-const rentalParsedCrawlerAdCategories =
-  process.env.RENTAL_CRAWLER_AD_CATEGORIES !== undefined
-    ? process.env.RENTAL_CRAWLER_AD_CATEGORIES.split(",").map(category =>
-        category.trim()
-      )
-    : ["FLAT", "HOUSE"];
-
-const rentalIgnoredUsernames = [];
-
-const transformedRentalCrawlerAdCategories = rentalParsedCrawlerAdCategories
-  .map(categoryName =>
-    AD_CATEGORY[categoryName] ? AD_CATEGORY[categoryName].id : undefined
-  )
-  .filter(category => !!category);
-
-module.exports = {
-  RENTAL_MAX_PAGES: parseInt(process.env.RENTAL_MAX_PAGES) || 500,
-  RENTAL_MAX_RESULTS_PER_PAGE:
-    parseInt(process.env.RENTAL_MAX_RESULTS_PER_PAGE) || 50,
-  RENTAL_CRAWLER_AD_TYPE: rentalCrawlerAdType || CRAWLER_AD_TYPE.NONE,
-  RENTAL_CRAWLER_AD_CATEGORIES: transformedRentalCrawlerAdCategories,
-  RENTAL_IGNORED_USERNAMES: rentalIgnoredUsernames || [],
-  RENTAL_DELAY_BETWEEN_PAGES:
-    parseInt(process.env.RENTAL_DELAY_BETWEEN_PAGES) || 1000,
-  RENTAL_FORCE_CRAWL: !!parseInt(process.env.RENTAL_FORCE_CRAWL)
-};

app/crawler/specificCrawlers/aktido.js

@@ -1,370 +0,0 @@
-"use strict";
-
-const fetch = require("node-fetch");
-const cheerio = require("cheerio");
-const Promise = require("bluebird");
-const moment = require("moment-timezone");
-const htmlToText = require("html-to-text");
-
-const {
-  AD_TYPE,
-  AD_CATEGORY,
-  AD_AGENCY,
-  AD_STATUS,
-  CRAWLER_AD_TYPE
-} = require("../../common/enums");
-
-const {
-  DEFAULT_TIMEZONE,
-  PRINT_CRAWLER_DEBUG
-} = require("../../config/appConfig");
-
-const AKTIDO_ENUMS = {
-  AKTIDO_AD_TYPE: {
-    [CRAWLER_AD_TYPE.ALL]: "/prodaja-1/najam-2",
-    [CRAWLER_AD_TYPE.ONLY_SELL]: "/prodaja-1",
-    [CRAWLER_AD_TYPE.ONLY_RENT]: "/najam-2"
-  },
-  AKTIDO_AD_CATEGORY: {
-    [AD_CATEGORY.ALL.id]: "",
-    [AD_CATEGORY.FLAT.id]: "/tip-2",
-    [AD_CATEGORY.HOUSE.id]: "/tip-1",
-    [AD_CATEGORY.LAND.id]: "/tip-5",
-    [AD_CATEGORY.OFFICE.id]: "/tip-4",
-    [AD_CATEGORY.APARTMENT.id]: "/tip-3",
-    [AD_CATEGORY.GARAGE.id]: "/tip-6"
-    //[AD_CATEGORY.COTTAGE.id]: ""
-  },
-  AKTIDO_PUBLISHED_DATE_FORMAT: "YYYY-MM-DD HH:mm:ss",
-  AKTIDO_RENEWED_DATE_FORMAT: "YYYY-MM-DD u HH:mm:ss"
-};
-
-const { AKTIDO_FORCE_CRAWL } = require("../specificConfigs/aktido");
-
-class AktidoCrawler {
-  constructor(
-    savers = [],
-    crawlerAdTypes = CRAWLER_AD_TYPE.ALL,
-    crawlerAdCategories = [AD_CATEGORY.FLAT, AD_CATEGORY.HOUSE],
-    maxPages = 1000,
-    maxResultsPerPage = 100,
-    ignoredUsernames = [],
-    delayBetweenPages = 1000
-  ) {
-    this.savers = savers;
-    this.baseUrl = "https://www.aktido.ba/pretraga/sortiraj-date_DESC";
-    this.crawlerAdTypes = crawlerAdTypes;
-    this.crawlerAdCategories = crawlerAdCategories;
-    this.maxPages = maxPages;
-    this.maxResultsPerPage = maxResultsPerPage;
-    this.delayBetweenPages = delayBetweenPages;
-  }
-
-  async crawl() {
-    const crawlAdCategories = this.crawlerAdCategories;
-
-    const newRealEstates = [];
-
-    if (crawlAdCategories) {
-      const indexGenerators = [];
-      for (const adCategory of crawlAdCategories) {
-        indexGenerators.push(this.categoryIndexer(adCategory));
-      }
-
-      let done = false;
-      while (!done) {
-        const categoryIndexerPromises = [];
-        const generatorsToRemove = [];
-        for (const indexGenerator of indexGenerators) {
-          categoryIndexerPromises.push(indexGenerator.next());
-          generatorsToRemove.push(false);
-        }
-
-        const singlePageResults = await Promise.all(categoryIndexerPromises);
-        const entries = singlePageResults.entries();
-
-        for (const [index, { value: singlePageResult }] of entries) {
-          if (singlePageResult) {
-            const saveResults = await this.saveCrawledResults(singlePageResult);
-            const { newRecords } = saveResults;
-
-            newRealEstates.push(...newRecords);
-
-            if (
-              Array.isArray(newRecords) &&
-              newRecords.length === 0 &&
-              !AKTIDO_FORCE_CRAWL
-            ) {
-              generatorsToRemove[index] = true;
-            }
-          } else {
-            //Generator returned undefined, remove this generator from array
-            generatorsToRemove[index] = true;
-            // console.log("Generator ", index + 1, "has no more pages");
-          }
-        }
-
-        // console.log("Generators state : ", generatorsToRemove);
-        for (let i = generatorsToRemove.length - 1; i >= 0; i--) {
-          if (generatorsToRemove[i]) {
-            // console.log("\tRemove generator ", i + 1);
-            indexGenerators.splice(i, 1);
-          }
-        }
-        if (indexGenerators.length === 0) {
-          done = true;
-        }
-
-        await this.sleep(this.delayBetweenPages);
-      }
-    }
-    return newRealEstates;
-  }
-
-  async *categoryIndexer(adCategory) {
-    let pageToIndex = 1;
-
-    const urlAdTypePart = AKTIDO_ENUMS.AKTIDO_AD_TYPE[this.crawlerAdTypes];
-    const urlCategoryPart = AKTIDO_ENUMS.AKTIDO_AD_CATEGORY[adCategory];
-    if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
-      while (true) {
-        const urlPageToCrawl = `${this.baseUrl}${urlAdTypePart}${urlCategoryPart}/stranica-${pageToIndex}`;
-        const singlePageResults = await this.indexSinglePage(
-          urlPageToCrawl,
-          this.maxResultsPerPage
-        );
-
-        if (Array.isArray(singlePageResults) && singlePageResults.length > 0) {
-          yield singlePageResults;
-        } else {
-          return undefined;
-        }
-
-        ++pageToIndex;
-        if (pageToIndex === this.maxPages) {
-          return undefined;
-        }
-      }
-    } else {
-      return undefined;
-    }
-  }
-
-  async indexSinglePage(url, maxResultsPerPage) {
-    if (PRINT_CRAWLER_DEBUG) {
-      console.log("[AKTIDO] Index page : ", url);
-    }
-
-    try {
-      const res = await fetch(url);
-      const body = await res.text();
-      const $ = cheerio.load(body);
-      let hrefs = [];
-
-      $(
-        "body > div > div.container > div.row > div.col-xs-12.col-sm-12.col-md-12.col-lg-9.content-main > div.row.box-items.group-grid-view"
-      )
-        .find(".moreInfo")
-        .each((i, elem) => {
-          const href = $(elem)
-            .find("a")
-            .first()
-            .attr("href");
-          if (href) {
-            hrefs.push(href);
-          }
-        });
-
-      let actualNoOfResults =
-        hrefs.length <= maxResultsPerPage ? hrefs.length : maxResultsPerPage;
-
-      const asyncScraping = [];
-      for (let i = 0; i < actualNoOfResults; i++) {
-        asyncScraping.push(this.scrapeAd(hrefs[i]));
-      }
-
-      const scrapedData = await Promise.all(asyncScraping);
-      const filteredScrapedData = scrapedData.filter(adData => !!adData);
-      return filteredScrapedData;
-    } catch (e) {
-      console.error("[AKTIDO] Exception caught:" + e);
-      return [];
-    }
-  }
-
-  async scrapeAd(url) {
-    // console.log("[AKTIDO] Scraping : ", url);
-    try {
-      const adPageSource = await fetch(url);
-      const body = await adPageSource.text();
-      const $ = cheerio.load(body);
-
-      const mapElementParent = $(".box-map").parent();
-      const scriptElement = $("script", mapElementParent);
-      if (
-        scriptElement[0] &&
-        scriptElement[0].children &&
-        scriptElement[0].children[0] &&
-        scriptElement[0].children[0].data
-      ) {
-        let extractedData;
-        try {
-          //data string starts with : var json_map_data = [{"r ...
-          //so we remove first 20 characters
-
-          const jsonData = scriptElement[0].children[0].data.substring(20);
-          const parsedJsonData = JSON.parse(jsonData);
-          extractedData = parsedJsonData[0];
-        } catch (e) {
-          throw { message: "Can't find ad data JSON" };
-        }
-
-        const aktidoId = extractedData["re_realEstates_id"];
-        const adCategory = this.getKiviCategoryIdFromAktidoId(
-          parseInt(extractedData["re_types_id"])
-        );
-        if (!adCategory) {
-          throw {
-            message: `Invalid category : ${extractedData["re_types_id"]}`
-          };
-        }
-        const adType = this.getKiviAdTypeFromAktidoActionId(
-          parseInt(extractedData["re_action_id"])
-        );
-        if (!adType) {
-          throw {
-            message: `Invalid ad type : ${extractedData["re_action_id"]}`
-          };
-        }
-
-        const title = extractedData["re_realEstates_portalName"];
-        const extractedPrice = parseFloat(
-          extractedData["re_realEstates_price"]
-        );
-        const price = extractedPrice ? extractedPrice : null;
-        const area = parseFloat(extractedData["re_realEstates_area"]);
-        const gardenSize = parseFloat(
-          extractedData["re_realEstates_fieldArea"]
-        );
-        const longDescription = htmlToText.fromString(
-          extractedData["re_realEstates_description"]
-        );
-        const locationLong = extractedData["re_realEstates_longitude"];
-        const locationLat = extractedData["re_realEstates_latitude"];
-        const publishedDateMoment = moment.tz(
-          extractedData["re_realEstates_inserted"],
-          AKTIDO_ENUMS.AKTIDO_PUBLISHED_DATE_FORMAT,
-          DEFAULT_TIMEZONE
-        );
-        if (!publishedDateMoment.isValid()) {
-          throw {
-            message: `Invalid published date : ${
-              extractedData["re_realEstates_inserted"]
-            }`
-          };
-        }
-
-        const renewedDateMoment = moment.tz(
-          extractedData["re_realEstates_edited"],
-          AKTIDO_ENUMS.AKTIDO_RENEWED_DATE_FORMAT,
-          DEFAULT_TIMEZONE
-        );
-        if (!renewedDateMoment.isValid()) {
-          throw {
-            message: `Invalid renewed date : ${
-              extractedData["re_realEstates_edited"]
-            }`
-          };
-        }
-
-        const adStatus = AD_STATUS.STATUS_NORMAL;
-
-        const data = {
-          url,
-          agencyObjectId: aktidoId,
-          originAgencyName: AD_AGENCY.AKTIDO,
-          realEstateType: adCategory,
-          adType,
-          title,
-          price,
-          area,
-          gardenSize,
-          shortDescription: "",
-          longDescription: longDescription,
-          streetNumber: 0,
-          streetName: "",
-          locality: "",
-          municipality: "",
-          city: "",
-          region: "",
-          entity: "",
-          country: "",
-          locationLat,
-          locationLong,
-          adStatus,
-          publishedDate: publishedDateMoment.toISOString(),
-          renewedDate: renewedDateMoment.toISOString()
-        };
-
-        return data;
-      } else {
-        console.log("[AKTIDO] No JSON data for this ad : ", url);
-        return null;
-      }
-    } catch (e) {
-      console.error("[AKTIDO] Exception caught: " + e.message, "\r\nURL:", url);
-      return null;
-    }
-    return null;
-  }
-
-  //======= HELPER FUNCTIONS =============
-
-  getKiviCategoryIdFromAktidoId(aktidoCategoryId) {
-    switch (aktidoCategoryId) {
-      case 1:
-        return AD_CATEGORY.HOUSE.id;
-      case 2:
-        return AD_CATEGORY.FLAT.id;
-      case 3:
-        return AD_CATEGORY.APARTMENT.id;
-      case 4:
-        return AD_CATEGORY.OFFICE.id;
-      case 5:
-        return AD_CATEGORY.LAND.id;
-      case 6:
-        return AD_CATEGORY.GARAGE.id;
-      default:
-        return undefined;
-    }
-  }
-
-  getKiviAdTypeFromAktidoActionId(actionId) {
-    switch (actionId) {
-      case 1:
-        return AD_TYPE.AD_TYPE_SALE.stringId;
-      case 2:
-        return AD_TYPE.AD_TYPE_RENT.stringId;
-      default:
-        return undefined;
-    }
-  }
-
-  async sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-
-  async saveCrawledResults(results) {
-    const savers = this.savers;
-
-    // for (const saver of savers) {
-    //   await saver.save(results);
-    // }
-
-    //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
-    //so that we can use some sequelize options and information when data is inserted
-  }
-}
-
-module.exports = AktidoCrawler;

app/crawler/specificCrawlers/olx.js

@@ -1,577 +0,0 @@
-"use strict";
-
-const fetch = require("node-fetch");
-const cheerio = require("cheerio");
-const Promise = require("bluebird");
-const moment = require("moment-timezone");
-
-const {
-  AD_TYPE,
-  AD_CATEGORY,
-  AD_AGENCY,
-  AD_STATUS,
-  CRAWLER_AD_TYPE
-} = require("../../common/enums");
-
-const {
-  DEFAULT_TIMEZONE,
-  PRINT_CRAWLER_DEBUG
-} = require("../../config/appConfig");
-
-const OLX_ENUMS = {
-  OLX_AD_TYPE: {
-    [CRAWLER_AD_TYPE.ALL]: "",
-    [CRAWLER_AD_TYPE.ONLY_SELL]: "&vrsta=samoprodaja",
-    [CRAWLER_AD_TYPE.ONLY_RENT]: "&vrsta=samoizdavanje",
-    [CRAWLER_AD_TYPE.ONLY_REQUEST]: "&vrsta=samopotraznja"
-  },
-  OLX_AD_CATEGORY: {
-    [AD_CATEGORY.FLAT.id]: "&kategorija=23",
-    [AD_CATEGORY.HOUSE.id]: "&kategorija=24",
-    [AD_CATEGORY.LAND.id]: "&kategorija=29",
-    [AD_CATEGORY.OFFICE.id]: "&kategorija=25",
-    [AD_CATEGORY.APARTMENT.id]: "&kategorija=27",
-    [AD_CATEGORY.GARAGE.id]: "&kategorija=30",
-    [AD_CATEGORY.COTTAGE.id]: "&kategorija=26"
-  },
-  MAX_DETAIL_FIELDS: 30,
-  OLX_PUBLISHED_DATE_FORMAT: "DD.MM.YYYY. u HH:mm",
-  OLX_RENEWED_DATE_FORMAT: "DD.MM.YYYY. u HH:mm"
-};
-
-const { OLX_FORCE_CRAWL } = require("../specificConfigs/olx");
-
-class OlxCrawler {
-  constructor(
-    savers = [],
-    crawlerAdTypes = CRAWLER_AD_TYPE.ALL,
-    crawlerAdCategories = [AD_CATEGORY.FLAT, AD_CATEGORY.HOUSE],
-    maxPages = 1000,
-    maxResultsPerPage = 100,
-    ignoredUsernames = [],
-    delayBetweenPages = 1000
-  ) {
-    this.savers = savers;
-    this.baseUrl = "https://www.olx.ba/pretraga?sort_order=desc&sort_po=datum";
-    this.crawlerAdTypes = crawlerAdTypes;
-    this.crawlerAdCategories = crawlerAdCategories;
-    this.maxPages = maxPages;
-    this.maxResultsPerPage = maxResultsPerPage;
-    this.ignoredUsernames = ignoredUsernames;
-    this.delayBetweenPages = delayBetweenPages;
-  }
-
-  async crawl() {
-    const crawlAdCategories = this.crawlerAdCategories;
-
-    const newRealEstates = [];
-
-    if (crawlAdCategories) {
-      const indexGenerators = [];
-      for (const adCategory of crawlAdCategories) {
-        indexGenerators.push(this.categoryIndexer(adCategory));
-      }
-
-      let done = false;
-      while (!done) {
-        const categoryIndexerPromises = [];
-        const generatorsToRemove = [];
-        for (const indexGenerator of indexGenerators) {
-          categoryIndexerPromises.push(indexGenerator.next());
-          generatorsToRemove.push(false);
-        }
-
-        const singlePageResults = await Promise.all(categoryIndexerPromises);
-        const entries = singlePageResults.entries();
-
-        for (const [index, { value: singlePageResult }] of entries) {
-          if (singlePageResult) {
-            const saveResults = await this.saveCrawledResults(singlePageResult);
-            const { newRecords, existingRecords } = saveResults;
-
-            newRealEstates.push(...newRecords);
-
-            for (const existingRecord of existingRecords) {
-              const { publishedDate, renewedDate } = existingRecord;
-
-              const publishedDateMoment = moment.utc(publishedDate);
-              const renewedDateMoment = moment.utc(renewedDate);
-
-              const stopCrawlingThisCategory = publishedDateMoment.isSame(
-                renewedDateMoment,
-                "minute"
-              );
-
-              if (stopCrawlingThisCategory && !OLX_FORCE_CRAWL) {
-                generatorsToRemove[index] = true;
-                // console.log("\tGenerator ", index + 1, "has no more new ads");
-                break;
-              }
-            }
-          } else {
-            //Generator returned undefined, remove this generator from array
-            generatorsToRemove[index] = true;
-            // console.log("Generator ", index + 1, "has no more pages");
-          }
-        }
-
-        // console.log("Generators state : ", generatorsToRemove);
-        for (let i = generatorsToRemove.length - 1; i >= 0; i--) {
-          if (generatorsToRemove[i]) {
-            // console.log("\tRemove generator ", i + 1);
-            indexGenerators.splice(i, 1);
-          }
-        }
-        if (indexGenerators.length === 0) {
-          done = true;
-        }
-
-        await this.sleep(this.delayBetweenPages);
-      }
-    }
-    return newRealEstates;
-  }
-
-  async *categoryIndexer(adCategory) {
-    let pageToIndex = 1;
-
-    const urlAdTypePart = OLX_ENUMS.OLX_AD_TYPE[this.crawlerAdTypes];
-    const urlCategoryPart = OLX_ENUMS.OLX_AD_CATEGORY[adCategory];
-    if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
-      while (true) {
-        const urlPageToCrawl = `${this.baseUrl}${urlAdTypePart}${urlCategoryPart}&stranica=${pageToIndex}`;
-        const singlePageResults = await this.indexSinglePage(
-          urlPageToCrawl,
-          this.maxResultsPerPage
-        );
-
-        if (Array.isArray(singlePageResults) && singlePageResults.length > 0) {
-          yield singlePageResults;
-        } else {
-          return undefined;
-        }
-
-        ++pageToIndex;
-        if (pageToIndex === this.maxPages) {
-          return undefined;
-        }
-      }
-    } else {
-      return undefined;
-    }
-  }
-
-  async indexSinglePage(url, maxResultsPerPage) {
-    if (PRINT_CRAWLER_DEBUG) {
-      console.log("[OLX] Index page : ", url);
-    }
-
-    try {
-      const res = await fetch(url);
-      const body = await res.text();
-      const $ = cheerio.load(body);
-      let hrefs = [];
-
-      $("#rezultatipretrage")
-        .find(".listitem")
-        .each((i, elem) => {
-          const href = $(elem)
-            .find("a")
-            .first()
-            .attr("href");
-          if (href) {
-            hrefs.push(href);
-          }
-        });
-
-      let actualNoOfResults =
-        hrefs.length <= maxResultsPerPage ? hrefs.length : maxResultsPerPage;
-
-      const asyncScraping = [];
-      for (let i = 0; i < actualNoOfResults; i++) {
-        asyncScraping.push(this.scrapeAd(hrefs[i]));
-      }
-
-      const scrapedData = await Promise.all(asyncScraping);
-      const filteredScrapedData = scrapedData.filter(adData => !!adData);
-      return filteredScrapedData;
-    } catch (e) {
-      console.error("Exception caught:" + e);
-      return [];
-    }
-  }
-
-  async scrapeAd(url) {
-    // console.log("Scraping : ", url);
-    try {
-      const adPageSource = await fetch(url);
-      const body = await adPageSource.text();
-      const $ = cheerio.load(body);
-      let status = AD_STATUS.STATUS_NORMAL;
-
-      const propertySelectors = {
-        username:
-          "#lg > div.desno2.profil > div:nth-child(2) > div.vrsta1.vrsta_desno > a > div.username > span",
-        title: "#naslovartikla",
-        descriptions: ".artikal_detaljniopis_tekst",
-        category:
-          "#artikal_glavni_div > div.artikal_lijevo > div.artikal_kat > div > span:nth-child(3) > a > span"
-      };
-
-      const username = $(propertySelectors.username)
-        .text()
-        .trim();
-      if (this.ignoredUsernames.includes((username || "").toLowerCase())) {
-        return null;
-      }
-
-      const title = $(propertySelectors.title)
-        .text()
-        .trim();
-      const descriptions = $(propertySelectors.descriptions);
-      const category = $(propertySelectors.category)
-        .text()
-        .trim();
-
-      //====== PRICE DETECTION AND EXTRACTION =====
-      let price = null;
-      const normalPriceValue = $("#pc > p:nth-child(2)").text();
-      const urgentPriceValue = $(
-        "#artikal_glavni_div > div.artikal_lijevo > div:nth-child(5) > p"
-      )
-        .text()
-        .trim();
-
-      if (normalPriceValue && normalPriceValue.length > 0) {
-        price = normalPriceValue;
-        if (
-          $("#pc > p.n")
-            .text()
-            .indexOf("Hitna") !== -1
-        ) {
-          status = AD_STATUS.STATUS_URGENT;
-        } else {
-          status = AD_STATUS.STATUS_NORMAL;
-        }
-      } else if (urgentPriceValue && urgentPriceValue.length > 0) {
-        const priceValues = urgentPriceValue.split("KM");
-        //priceValues will contain values like ["100000", "90000", ...], second element is urgent price
-        if (priceValues.length > 1) {
-          price = priceValues[1].trim();
-          status = AD_STATUS.STATUS_DISCOUNTED;
-        } else {
-          throw { message: "Can't find urgent price" };
-        }
-      } else {
-        throw {
-          message: "Can't find price (it is not normal nor urgent price ?)"
-        };
-      }
-
-      //====== OTHER AD INFORMATION ===============
-      let adType = null;
-      let olxId = null;
-
-      let otherInformationDivId;
-      //We need to locate DIV ID where other information are stored
-      for (let possibleId = 10; possibleId <= 20; possibleId++) {
-        const adTypeFieldTitle = $(
-          `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${possibleId}) > div:nth-child(2) > div.df1`
-        )
-          .text()
-          .trim();
-
-        if (adTypeFieldTitle === "Vrsta oglasa") {
-          otherInformationDivId = possibleId;
-          break;
-        }
-      }
-
-      if (!otherInformationDivId) {
-        throw { message: "Other information DIV could not be found" };
-      }
-
-      const olxIdFieldSelector = `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${otherInformationDivId}) > div:nth-child(4)`;
-      const publishedDateValueSelector = `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${otherInformationDivId}) > div:nth-child(3) > div.df2.neanimiraj > time`;
-      const renewedDateFullValueSelector = `#artikal_glavni_div > div.artikal_lijevo > div.op.ob.pop`;
-
-      const publishedDate = $(publishedDateValueSelector)
-        .text()
-        .trim();
-
-      const publishedDateMoment = moment.tz(
-        publishedDate,
-        OLX_ENUMS.OLX_PUBLISHED_DATE_FORMAT,
-        DEFAULT_TIMEZONE
-      );
-
-      if (!publishedDateMoment.isValid()) {
-        throw { message: "Invalid published date ! Check parsing format" };
-      }
-
-      const renewedDate = $(renewedDateFullValueSelector)
-        .data("content")
-        .trim();
-
-      const renewedDateMoment = moment.tz(
-        renewedDate,
-        OLX_ENUMS.OLX_RENEWED_DATE_FORMAT,
-        DEFAULT_TIMEZONE
-      );
-
-      if (!renewedDateMoment) {
-        throw {
-          message:
-            "Invalid renewed date ! Check how parser parsed renewed date text"
-        };
-      }
-
-      adType = $(
-        `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${otherInformationDivId}) > div:nth-child(2) > div.df2`
-      )
-        .text()
-        .trim();
-      const olxIdFieldTitle = $(`${olxIdFieldSelector} > div.df1`)
-        .text()
-        .trim();
-      olxId = $(`${olxIdFieldSelector} > div.df2`)
-        .text()
-        .trim();
-
-      if (olxIdFieldTitle !== "OLX ID") {
-        throw { message: "Cannot find correct OLX ID" };
-      }
-      //===========================================
-
-      //====== DETAIL INFORMATION FIELDS ==========
-      let area = null;
-      let gardenSize = null;
-
-      let fieldIndex = 1;
-      do {
-        const fieldSelector = `#dodatnapolja1 > div:nth-child(${fieldIndex})`;
-        const fieldTitleSelector = `${fieldSelector} > div.df1`;
-        const fieldValueSelector = `${fieldSelector} > div.df2`;
-
-        const fieldTitle = $(fieldTitleSelector)
-          .text()
-          .trim();
-        const fieldValue = $(fieldValueSelector)
-          .text()
-          .trim();
-
-        switch (fieldTitle) {
-          case "Kvadrata":
-            area = fieldValue;
-            break;
-          case "Okućnica (kvadratura)":
-            gardenSize = fieldValue;
-            break;
-        }
-
-        if (++fieldIndex === OLX_ENUMS.MAX_DETAIL_FIELDS || fieldTitle === "") {
-          break;
-        }
-      } while (true);
-      //===========================================
-
-      //====== UNUSED FIELDS FOR NOW ==============
-      const time = $("time").attr("datetime");
-      const numberOfViews = $(
-        "#artikal_glavni_div > div.artikal_lijevo > div:nth-child(18) > div:nth-child(6) > div.df2"
-      )
-        .text()
-        .trim();
-      //===========================================
-
-      //=========================================
-      const parsedCategory = this.getAdCategoryId(category);
-      if (!parsedCategory) {
-        throw { message: `Unknown ad category [${category}]` };
-      }
-
-      const parsedAdType = this.getAdTypeId(adType);
-      if (!parsedAdType) {
-        throw { message: "Unknown ad type" };
-      }
-
-      const parsedArea = this.parseArea(area) || null;
-      const parsedGardenSize = this.parseArea(gardenSize) || null;
-      const parsedPrice = this.parsePrice(price) || null;
-
-      const latLngRegex = /LatLng\(([0-9]+\.[0-9]+)\,\s+([0-9]+\.[0-9]+)\)/g;
-      const locationLatLngMatches = latLngRegex.exec(body);
-
-      let locationLat = null;
-      let locationLong = null;
-      if (locationLatLngMatches && locationLatLngMatches.length >= 3) {
-        locationLat = parseFloat(locationLatLngMatches[1]) || null;
-        locationLong = parseFloat(locationLatLngMatches[2]) || null;
-      }
-
-      const data = {
-        url,
-        agencyObjectId: olxId,
-        originAgencyName: AD_AGENCY.OLX,
-        realEstateType: parsedCategory,
-        adType: parsedAdType,
-        title,
-        price: parsedPrice,
-        area: parsedArea,
-        gardenSize: parsedGardenSize,
-        shortDescription: descriptions
-          .first()
-          .text()
-          .trim(),
-        longDescription: descriptions
-          .last()
-          .text()
-          .trim(),
-        streetNumber: 0,
-        streetName: "",
-        locality: "",
-        municipality: "",
-        city: "",
-        region: "",
-        entity: "",
-        country: "",
-        locationLat,
-        locationLong,
-        adStatus: status,
-        publishedDate: publishedDateMoment.toISOString(),
-        renewedDate: renewedDateMoment.toISOString()
-      };
-
-      return data;
-    } catch (e) {
-      console.error("Exception caught: " + e.message, "\r\nURL:", url);
-    }
-    return null;
-  }
-
-  //======= HELPER FUNCTIONS =============
-
-  getAdCategoryId(categoryText) {
-    switch (categoryText) {
-      case "Stanovi":
-        return AD_CATEGORY.FLAT.id;
-      case "Zemljišta":
-        return AD_CATEGORY.LAND.id;
-      case "Kuće":
-        return AD_CATEGORY.HOUSE.id;
-      case "Poslovni prostori":
-        return AD_CATEGORY.OFFICE.id;
-      case "Apartmani":
-        return AD_CATEGORY.APARTMENT.id;
-      case "Garaže":
-        return AD_CATEGORY.GARAGE.id;
-      case "Vikendice":
-        return AD_CATEGORY.COTTAGE.id;
-      default:
-        return undefined;
-    }
-  }
-
-  getAdTypeId(adTypeText) {
-    switch (adTypeText) {
-      case "Prodaja":
-        return AD_TYPE.AD_TYPE_SALE.stringId;
-      case "Izdavanje":
-        return AD_TYPE.AD_TYPE_RENT.stringId;
-      case "Potražnja":
-        return AD_TYPE.AD_TYPE_RENT.stringId;
-      default:
-        return undefined;
-    }
-  }
-
-  parseArea(areaText) {
-    if (!areaText) {
-      return NaN;
-    }
-    const removeDotsExceptLastOneRegex = /[.](?=.*[.])/g;
-    const textWithOnlyOneDecimalDot = areaText
-      .replace(",", ".")
-      .replace(removeDotsExceptLastOneRegex, "");
-
-    return parseFloat(textWithOnlyOneDecimalDot);
-  }
-
-  parsePrice(priceText) {
-    if (!priceText) {
-      return NaN;
-    }
-    const formattedPriceText = priceText.replace(".", "").replace(",", ".");
-    return parseFloat(formattedPriceText);
-  }
-
-  parseRenewedDate(renewedDateText) {
-    const currentMoment = moment.tz(DEFAULT_TIMEZONE);
-
-    if (renewedDateText.includes("Prije mjesec dana")) {
-      return currentMoment.add(-1, "month");
-    }
-
-    if (renewedDateText.includes("Jučer")) {
-      return currentMoment.add(-1, "day");
-    }
-
-    if (renewedDateText.includes("Prije sat")) {
-      return currentMoment.add(-1, "hour");
-    }
-
-    if (renewedDateText.includes("dan")) {
-      // format for this case should be "Prije N dana" or "Prije N dan"
-      const dateParts = renewedDateText.split(" ");
-      if (dateParts[0] === "Prije") {
-        const numberOfDays = parseInt(dateParts[1]);
-        return currentMoment.add(-1 * numberOfDays, "days");
-      } else {
-        return undefined;
-      }
-    }
-
-    if (renewedDateText.includes("sat")) {
-      const dateParts = renewedDateText.split(" ");
-      const parsedHours =
-        dateParts && dateParts.length > 2 ? parseInt(dateParts[1]) : undefined;
-      if (!parsedHours) {
-        return undefined;
-      }
-      return currentMoment.add(-1 * parsedHours, "hours");
-    }
-
-    const todayVariations = ["min", "sekund", "maloprije"];
-    for (const todayVariation of todayVariations) {
-      if (renewedDateText.includes(todayVariation)) {
-        return currentMoment;
-      }
-    }
-
-    const renewedDateMoment = moment.tz(
-      renewedDateText,
-      OLX_ENUMS.OLX_RENEWED_DATE_FORMAT,
-      DEFAULT_TIMEZONE
-    );
-
-    return renewedDateMoment.isValid() ? renewedDateMoment : undefined;
-  }
-
-  async sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-
-  async saveCrawledResults(results) {
-    const savers = this.savers;
-
-    // for (const saver of savers) {
-    //   await saver.save(results);
-    // }
-
-    //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
-    //so that we can use some sequelize options and information when data is inserted
-  }
-}
-
-module.exports = OlxCrawler;

app/crawler/specificCrawlers/prostor.js

@@ -1,252 +0,0 @@
-"use strict";
-
-const fetch = require("node-fetch");
-const cheerio = require("cheerio");
-
-const {
-  AD_TYPE,
-  AD_CATEGORY,
-  AD_AGENCY,
-  AD_STATUS,
-  CRAWLER_AD_TYPE
-} = require("../../common/enums");
-
-const { PRINT_CRAWLER_DEBUG } = require("../../config/appConfig");
-
-const PROSTOR_ENUMS = {
-  PROSTOR_AD_TYPE: {
-    [CRAWLER_AD_TYPE.ALL]: "&action=0",
-    [CRAWLER_AD_TYPE.ONLY_SELL]: "&action=1",
-    [CRAWLER_AD_TYPE.ONLY_RENT]: "&action=2"
-  },
-  PROSTOR_AD_CATEGORY: {
-    [AD_CATEGORY.ALL.id]: "",
-    [AD_CATEGORY.FLAT.id]: "&type=7",
-    [AD_CATEGORY.HOUSE.id]: "&type=8",
-    [AD_CATEGORY.LAND.id]: "&type=10",
-    [AD_CATEGORY.OFFICE.id]: "&type=9",
-    [AD_CATEGORY.APARTMENT.id]: "&type=11",
-    [AD_CATEGORY.GARAGE.id]: "&type=14"
-    //[AD_CATEGORY.COTTAGE.id]: ""
-  },
-  PROSTOR_PUBLISHED_DATE_FORMAT: "YYYY-MM-DD HH:mm:ss",
-  PROSTOR_RENEWED_DATE_FORMAT: "YYYY-MM-DD u HH:mm:ss"
-};
-
-class ProstorCrawler {
-  constructor(
-    savers = [],
-    crawlerAdTypes = CRAWLER_AD_TYPE.ALL,
-    crawlerAdCategories = [AD_CATEGORY.FLAT, AD_CATEGORY.HOUSE],
-    maxPages = 5000,
-    maxResultsPerPage = 5000,
-    ignoredUsernames = [],
-    delayBetweenPages = 1000
-  ) {
-    this.savers = savers;
-    this.baseUrl = "https://prostor.ba/pretraga";
-    this.crawlerAdTypes = crawlerAdTypes;
-    this.crawlerAdCategories = crawlerAdCategories;
-    this.maxResultsPerPage = maxResultsPerPage;
-  }
-
-  async crawl() {
-    const crawlAdCategories = this.crawlerAdCategories;
-    const newRealEstates = [];
-
-    if (crawlAdCategories) {
-      for (const adCategory of crawlAdCategories) {
-        const urlAdTypePart =
-          PROSTOR_ENUMS.PROSTOR_AD_TYPE[this.crawlerAdTypes];
-        const urlCategoryPart = PROSTOR_ENUMS.PROSTOR_AD_CATEGORY[adCategory];
-        if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
-          const urlPageToCrawl = `${this.baseUrl}?remove_sold=1${urlAdTypePart}${urlCategoryPart}`;
-          const singleCategoryResults = await this.extractRealEstates(
-            urlPageToCrawl
-          );
-
-          const resultsSubset = singleCategoryResults.slice(
-            0,
-            this.maxResultsPerPage
-          );
-
-          const saveResults = await this.saveCrawledResults(resultsSubset);
-          const { newRecords } = saveResults;
-          newRealEstates.push(...newRecords);
-        }
-      }
-    }
-    return newRealEstates;
-  }
-
-  async extractRealEstates(url) {
-    if (PRINT_CRAWLER_DEBUG) {
-      console.log("[PROSTOR] Index page : ", url);
-    }
-
-    try {
-      const res = await fetch(url);
-      const body = await res.text();
-      const $ = cheerio.load(body);
-
-      const scriptElement = $(
-        "body > div > div.container-fluid > script:nth-child(7)"
-      );
-
-      if (
-        scriptElement[0] &&
-        scriptElement[0].children &&
-        scriptElement[0].children[0] &&
-        scriptElement[0].children[0].data
-      ) {
-        const scriptData = scriptElement[0].children[0].data;
-
-        try {
-          // script element data contains JS code and we need to extract only data for realEstates
-          // data string starts with : var map; var markers = [{"r ...
-          // so we remove first 23 characters
-          //
-          // real estate JSON data ends with      ...}, ]; map = new...
-          // so we need to find index of that substring to know where to stop
-          // we will NOT include trailing comma because it breaks JSON parse, so we have to close ] bracket manually
-
-          const jsonEndIndex = scriptData.indexOf(", ]; map = new");
-          if (jsonEndIndex > -1) {
-            const jsonData = scriptData.substring(23, jsonEndIndex) + "]";
-            const realEstates = JSON.parse(jsonData);
-
-            const transformedRealEstates = [];
-
-            for (const realEstate of realEstates) {
-              const transformedRealEstate = ProstorCrawler.transformRealEstateData(
-                realEstate
-              );
-              if (transformedRealEstate) {
-                transformedRealEstates.push(transformedRealEstate);
-              }
-            }
-
-            return transformedRealEstates;
-          } else {
-            throw {
-              message: "Something is wrong with JSON data or data is moved"
-            };
-          }
-        } catch (e) {
-          console.log(e);
-          throw { message: "Can't find ad data JSON" };
-        }
-      }
-    } catch (e) {
-      console.error("[PROSTOR] Exception caught:", e.message);
-      return [];
-    }
-  }
-
-  static transformRealEstateData(realEstateData) {
-    try {
-      const { lat, lng, property_name, price, size, link } = realEstateData;
-
-      // link contains part of the URL in the format of : /prodaja/stan/stup/9556
-      // general form is : /actionType/realEstateType/location/realEstateID
-      // linkParts contains : ['', 'actionType', 'realEstateType', 'location', 'realEstateID']
-
-      const linkParts = link.split("/");
-
-      const adType = ProstorCrawler.getAdTypeId(linkParts[1]);
-      const realEstateType = ProstorCrawler.getAdCategoryId(linkParts[2]);
-      const prostorId = linkParts[4];
-      const url = `https://prostor.ba${link}`;
-
-      if (!adType || !realEstateType || !prostorId) {
-        return null;
-      }
-
-      const adStatus = AD_STATUS.STATUS_NORMAL;
-      const parsedPrice = parseFloat(price.replace(/\./g, "")) || null;
-      const parsedArea = parseFloat(size);
-
-      const data = {
-        url,
-        agencyObjectId: prostorId,
-        originAgencyName: AD_AGENCY.PROSTOR,
-        realEstateType,
-        adType,
-        title: property_name,
-        price: parsedPrice,
-        area: parsedArea,
-        gardenSize: null,
-        shortDescription: "",
-        longDescription: "",
-        streetNumber: 0,
-        streetName: "",
-        locality: "",
-        municipality: "",
-        city: "",
-        region: "",
-        entity: "",
-        country: "",
-        locationLat: lat,
-        locationLong: lng,
-        adStatus,
-        publishedDate: null,
-        renewedDate: null
-      };
-
-      return data;
-    } catch (e) {
-      console.error(
-        "[PROSTOR] Exception caught: " + e.message,
-        "\r\nURL:",
-        url
-      );
-      return null;
-    }
-  }
-
-  //======= HELPER FUNCTIONS =============
-
-  static getAdCategoryId(categoryText) {
-    switch (categoryText) {
-      case "stan":
-        return AD_CATEGORY.FLAT.id;
-      case "kuca":
-        return AD_CATEGORY.HOUSE.id;
-      case "apartman":
-        return AD_CATEGORY.APARTMENT.id;
-      case "poslovni-prostor":
-        return AD_CATEGORY.OFFICE.id;
-      case "garaza":
-        return AD_CATEGORY.GARAGE.id;
-      case "zemljiste":
-        return AD_CATEGORY.LAND.id;
-      default:
-        return undefined;
-    }
-  }
-
-  static getAdTypeId(adTypeText) {
-    switch (adTypeText) {
-      case "prodaja":
-        return AD_TYPE.AD_TYPE_SALE.stringId;
-      case "najam":
-        return AD_TYPE.AD_TYPE_RENT.stringId;
-      default:
-        return undefined;
-    }
-  }
-
-  async saveCrawledResults(results) {
-    const savers = this.savers;
-
-    // for (const saver of savers) {
-    //   await saver.save(results);
-    // }
-
-    //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
-    //so that we can use some sequelize options and information when data is inserted
-  }
-}
-
-module.exports = ProstorCrawler;

app/crawler/specificCrawlers/rental.js

@@ -1,370 +0,0 @@
-"use strict";
-
-const fetch = require("node-fetch");
-const cheerio = require("cheerio");
-const Promise = require("bluebird");
-const moment = require("moment-timezone");
-const htmlToText = require("html-to-text");
-
-const {
-  AD_TYPE,
-  AD_CATEGORY,
-  AD_AGENCY,
-  AD_STATUS,
-  CRAWLER_AD_TYPE
-} = require("../../common/enums");
-
-const {
-  DEFAULT_TIMEZONE,
-  PRINT_CRAWLER_DEBUG
-} = require("../../config/appConfig");
-
-const RENTAL_ENUMS = {
-  RENTAL_AD_TYPE: {
-    [CRAWLER_AD_TYPE.ALL]: "/prodaja-1/najam-2",
-    [CRAWLER_AD_TYPE.ONLY_SELL]: "/prodaja-1",
-    [CRAWLER_AD_TYPE.ONLY_RENT]: "/najam-2"
-  },
-  RENTAL_AD_CATEGORY: {
-    [AD_CATEGORY.ALL.id]: "",
-    [AD_CATEGORY.FLAT.id]: "/tip-2",
-    [AD_CATEGORY.HOUSE.id]: "/tip-1",
-    [AD_CATEGORY.LAND.id]: "/tip-5",
-    [AD_CATEGORY.OFFICE.id]: "/tip-4",
-    [AD_CATEGORY.APARTMENT.id]: "/tip-3",
-    [AD_CATEGORY.GARAGE.id]: "/tip-6"
-    //[AD_CATEGORY.COTTAGE.id]: ""
-  },
-  RENTAL_PUBLISHED_DATE_FORMAT: "YYYY-MM-DD HH:mm:ss",
-  RENTAL_RENEWED_DATE_FORMAT: "YYYY-MM-DD u HH:mm:ss"
-};
-
-const { RENTAL_FORCE_CRAWL } = require("../specificConfigs/rental");
-
-class RentalCrawler {
-  constructor(
-    savers = [],
-    crawlerAdTypes = CRAWLER_AD_TYPE.ALL,
-    crawlerAdCategories = [AD_CATEGORY.FLAT, AD_CATEGORY.HOUSE],
-    maxPages = 1000,
-    maxResultsPerPage = 100,
-    ignoredUsernames = [],
-    delayBetweenPages = 1000
-  ) {
-    this.savers = savers;
-    this.baseUrl = "https://www.rental.ba/pretraga/sortiraj-date_DESC";
-    this.crawlerAdTypes = crawlerAdTypes;
-    this.crawlerAdCategories = crawlerAdCategories;
-    this.maxPages = maxPages;
-    this.maxResultsPerPage = maxResultsPerPage;
-    this.delayBetweenPages = delayBetweenPages;
-  }
-
-  async crawl() {
-    const crawlAdCategories = this.crawlerAdCategories;
-
-    const newRealEstates = [];
-
-    if (crawlAdCategories) {
-      const indexGenerators = [];
-      for (const adCategory of crawlAdCategories) {
-        indexGenerators.push(this.categoryIndexer(adCategory));
-      }
-
-      let done = false;
-      while (!done) {
-        const categoryIndexerPromises = [];
-        const generatorsToRemove = [];
-        for (const indexGenerator of indexGenerators) {
-          categoryIndexerPromises.push(indexGenerator.next());
-          generatorsToRemove.push(false);
-        }
-
-        const singlePageResults = await Promise.all(categoryIndexerPromises);
-        const entries = singlePageResults.entries();
-
-        for (const [index, { value: singlePageResult }] of entries) {
-          if (singlePageResult) {
-            const saveResults = await this.saveCrawledResults(singlePageResult);
-            const { newRecords } = saveResults;
-
-            newRealEstates.push(...newRecords);
-
-            if (
-              Array.isArray(newRecords) &&
-              newRecords.length === 0 &&
-              !RENTAL_FORCE_CRAWL
-            ) {
-              generatorsToRemove[index] = true;
-            }
-          } else {
-            //Generator returned undefined, remove this generator from array
-            generatorsToRemove[index] = true;
-            // console.log("Generator ", index + 1, "has no more pages");
-          }
-        }
-
-        // console.log("Generators state : ", generatorsToRemove);
-        for (let i = generatorsToRemove.length - 1; i >= 0; i--) {
-          if (generatorsToRemove[i]) {
-            // console.log("\tRemove generator ", i + 1);
-            indexGenerators.splice(i, 1);
-          }
-        }
-        if (indexGenerators.length === 0) {
-          done = true;
-        }
-
-        await this.sleep(this.delayBetweenPages);
-      }
-    }
-    return newRealEstates;
-  }
-
-  async *categoryIndexer(adCategory) {
-    let pageToIndex = 1;
-
-    const urlAdTypePart = RENTAL_ENUMS.RENTAL_AD_TYPE[this.crawlerAdTypes];
-    const urlCategoryPart = RENTAL_ENUMS.RENTAL_AD_CATEGORY[adCategory];
-    if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
-      while (true) {
-        const urlPageToCrawl = `${this.baseUrl}${urlAdTypePart}${urlCategoryPart}/stranica-${pageToIndex}`;
-        const singlePageResults = await this.indexSinglePage(
-          urlPageToCrawl,
-          this.maxResultsPerPage
-        );
-
-        if (Array.isArray(singlePageResults) && singlePageResults.length > 0) {
-          yield singlePageResults;
-        } else {
-          return undefined;
-        }
-
-        ++pageToIndex;
-        if (pageToIndex === this.maxPages) {
-          return undefined;
-        }
-      }
-    } else {
-      return undefined;
-    }
-  }
-
-  async indexSinglePage(url, maxResultsPerPage) {
-    if (PRINT_CRAWLER_DEBUG) {
-      console.log("[RENTAL] Index page : ", url);
-    }
-
-    try {
-      const res = await fetch(url);
-      const body = await res.text();
-      const $ = cheerio.load(body);
-      let hrefs = [];
-
-      $(
-        "body > div > div.container > div.row > div.col-xs-12.col-sm-12.col-md-12.col-lg-9.content-main > div.row.box-items.group-grid-view"
-      )
-        .find(".pull-right")
-        .each((i, elem) => {
-          const href = $(elem)
-            .find("a")
-            .first()
-            .attr("href");
-          if (href) {
-            hrefs.push(href);
-          }
-        });
-
-      let actualNoOfResults =
-        hrefs.length <= maxResultsPerPage ? hrefs.length : maxResultsPerPage;
-
-      const asyncScraping = [];
-      for (let i = 0; i < actualNoOfResults; i++) {
-        asyncScraping.push(this.scrapeAd(hrefs[i]));
-      }
-
-      const scrapedData = await Promise.all(asyncScraping);
-      const filteredScrapedData = scrapedData.filter(adData => !!adData);
-      return filteredScrapedData;
-    } catch (e) {
-      console.error("[RENTAL] Exception caught:" + e);
-      return [];
-    }
-  }
-
-  async scrapeAd(url) {
-    console.log("[RENTAL] Scraping : ", url);
-    try {
-      const adPageSource = await fetch(url);
-      const body = await adPageSource.text();
-      const $ = cheerio.load(body);
-
-      const mapElementParent = $(".box-map").parent();
-      const scriptElement = $("script", mapElementParent);
-      if (
-        scriptElement[0] &&
-        scriptElement[0].children &&
-        scriptElement[0].children[0] &&
-        scriptElement[0].children[0].data
-      ) {
-        let extractedData;
-        try {
-          //data string starts with : var json_map_data = [{"r ...
-          //so we remove first 20 characters
-
-          const jsonData = scriptElement[0].children[0].data.substring(20);
-          const parsedJsonData = JSON.parse(jsonData);
-          extractedData = parsedJsonData[0];
-        } catch (e) {
-          throw { message: "Can't find ad data JSON" };
-        }
-
-        const rentalId = extractedData["re_realEstates_id"];
-        const adCategory = this.getKiviCategoryIdFromRentalId(
-          parseInt(extractedData["re_types_id"])
-        );
-        if (!adCategory) {
-          throw {
-            message: `Invalid category : ${extractedData["re_types_id"]}`
-          };
-        }
-        const adType = this.getKiviAdTypeFromRentalActionId(
-          parseInt(extractedData["re_action_id"])
-        );
-        if (!adType) {
-          throw {
-            message: `Invalid ad type : ${extractedData["re_action_id"]}`
-          };
-        }
-
-        const title = extractedData["re_realEstates_portalName"];
-        const extractedPrice = parseFloat(
-          extractedData["re_realEstates_price"]
-        );
-        const price = extractedPrice ? extractedPrice : null;
-        const area = parseFloat(extractedData["re_realEstates_area"]);
-        const gardenSize = parseFloat(
-          extractedData["re_realEstates_fieldArea"]
-        );
-        const longDescription = htmlToText.fromString(
-          extractedData["re_realEstates_description"]
-        );
-        const locationLong = extractedData["re_realEstates_longitude"];
-        const locationLat = extractedData["re_realEstates_latitude"];
-        const publishedDateMoment = moment.tz(
-          extractedData["re_realEstates_inserted"],
-          RENTAL_ENUMS.RENTAL_PUBLISHED_DATE_FORMAT,
-          DEFAULT_TIMEZONE
-        );
-        if (!publishedDateMoment.isValid()) {
-          throw {
-            message: `Invalid published date : ${
-              extractedData["re_realEstates_inserted"]
-            }`
-          };
-        }
-
-        const renewedDateMoment = moment.tz(
-          extractedData["re_realEstates_edited"],
-          RENTAL_ENUMS.RENTAL_RENEWED_DATE_FORMAT,
-          DEFAULT_TIMEZONE
-        );
-        if (!renewedDateMoment.isValid()) {
-          throw {
-            message: `Invalid renewed date : ${
-              extractedData["re_realEstates_edited"]
-            }`
-          };
-        }
-
-        const adStatus = AD_STATUS.STATUS_NORMAL;
-
-        const data = {
-          url,
-          agencyObjectId: rentalId,
-          originAgencyName: AD_AGENCY.RENTAL,
-          realEstateType: adCategory,
-          adType,
-          title,
-          price,
-          area,
-          gardenSize,
-          shortDescription: "",
-          longDescription: longDescription,
-          streetNumber: 0,
-          streetName: "",
-          locality: "",
-          municipality: "",
-          city: "",
-          region: "",
-          entity: "",
-          country: "",
-          locationLat,
-          locationLong,
-          adStatus,
-          publishedDate: publishedDateMoment.toISOString(),
-          renewedDate: renewedDateMoment.toISOString()
-        };
-
-        return data;
-      } else {
-        console.log("[RENTAL] No JSON data for this ad : ", url);
-        return null;
-      }
-    } catch (e) {
-      console.error("[RENTAL] Exception caught: " + e.message, "\r\nURL:", url);
-      return null;
-    }
-    return null;
-  }
-
-  //======= HELPER FUNCTIONS =============
-
-  getKiviCategoryIdFromRentalId(rentalCategoryId) {
-    switch (rentalCategoryId) {
-      case 1:
-        return AD_CATEGORY.HOUSE.id;
-      case 2:
-        return AD_CATEGORY.FLAT.id;
-      case 3:
-        return AD_CATEGORY.APARTMENT.id;
-      case 4:
-        return AD_CATEGORY.OFFICE.id;
-      case 5:
-        return AD_CATEGORY.LAND.id;
-      case 6:
-        return AD_CATEGORY.GARAGE.id;
-      default:
-        return undefined;
-    }
-  }
-
-  getKiviAdTypeFromRentalActionId(actionId) {
-    switch (actionId) {
-      case 1:
-        return AD_TYPE.AD_TYPE_SALE.stringId;
-      case 2:
-        return AD_TYPE.AD_TYPE_RENT.stringId;
-      default:
-        return undefined;
-    }
-  }
-
-  async sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-
-  async saveCrawledResults(results) {
-    const savers = this.savers;
-
-    // for (const saver of savers) {
-    //   await saver.save(results);
-    // }
-
-    //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
-    //so that we can use some sequelize options and information when data is inserted
-  }
-}
-
-module.exports = RentalCrawler;

app/helpers/awsEmail.js

@@ -0,0 +1,245 @@
+
+const dotenv = require('dotenv').config();
+const { getRealEstateTypeEnum } = require('./enums');
+const { getRegionName, getMunicipalityName } = require('./codes');
+const { allRERequestByUiid } = require('./db/dbHelper');
+var AWS = require('aws-sdk');
+const TEMPLATE_NAME = "MarketAlertTemplate"
+
+AWS.config.update({
+  region: process.env.AMAZON_REGION,
+  credentials:
+  {
+    accessKeyId: process.env.AMAZON_ACCES_KEY_ID,
+    secretAccessKey: process.env.AMAZON_SECRET_ACCESS_KEY
+  }
+});
+
+const sendTemplatedEmail = async (email, request) => {
+
+  const params = {
+    Destination: { /* required */
+      CcAddresses: [
+      ],
+      ToAddresses: [
+        email
+      ]
+    },
+    Message: { /* required */
+      Body: { /* required */
+        Html: {
+          Charset: "UTF-8",
+          Data: getGreetingsEmailHTML(request)
+        },
+        Text: {
+          Charset: "UTF-8",
+          Data: getGreetingsEmaiTextVersion(request)
+        }
+      },
+      Subject: {
+        Charset: 'UTF-8',
+        Data: `Javimi Potvrda: ${getSubject(request.realEstateType, request.region, request.municipality)}`
+      }
+    },
+    Source: process.env.SOURCE_EMAIL, /* required */
+    ReplyToAddresses: [
+      process.env.SOURCE_EMAIL,
+    ],
+  };
+
+  const sendEmailPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendEmail(params).promise();
+  await sendEmailPromise;
+}
+
+const getGreetingsEmailHTML = (realestateRequest) => {
+  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
+  const gardenSize = realEstateType.hasGardenSize ? `<div><strong>Kvadratura okućnice: Od ${realestateRequest.gardenSizeMin} do ${realestateRequest.gardenSizeMax} m2  </strong></div>` : ``
+
+  return `<h1> Zdravo, 
+  Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima. </h1>
+  <h2> Ovo je tražena nekretnina:  </h2> 
+  <div>
+  <div> <strong>Tip nekretnine: ${realEstateType.title} </strong></div>
+  <div><strong>Područje: ${getRegionName(realestateRequest.region)} </strong></div>
+  <div><strong>Mjesto: ${getMunicipalityName(realestateRequest.region, realestateRequest.municipality)} </strong></div>
+  <div><strong>Kvadratura nekretnine: Od ${realestateRequest.sizeMin} do ${realestateRequest.sizeMax} m2  </strong></div>
+  ${gardenSize}
+  <div><strong>Cijena: ${realestateRequest.priceMin} do ${realestateRequest.priceMax} KM  </strong></div>
+  </div>
+  <div> 
+
+  </div>
+  <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${process.env.APP_URL}/odjava/${realestateRequest.uniqueId} </strong></div>
+  <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${process.env.APP_URL}/pregled/${realestateRequest.uniqueId} </strong></div>
+<h4> Tvoj,
+Javimi tim.  
+</h4>`
+
+}
+
+const getGreetingsEmaiTextVersion = (realestateRequest) => {
+  const realEstateType = getRealEstateTypeEnum(realestateRequest.realEstateType);
+  const gardenSize = realEstateType.hasGardenSize ? "Kvadratura okućnice od " + realestateRequest.gardenSizeMin + " do " + realestateRequest.gardenSizeMax : ""
+
+  const text = "Zdravo, \n Naručio/la si da ti javimo ako se nekretnina pojavi u oglasima \n Ovo je tražena nekretnina: \n , Tip nekretnine: "
+    + realestateRequest.realEstateType + "\n Područje" + getRegionName(realestateRequest.region) + "\n Mjesto " + getMunicipalityName(realestateRequest.region, realestateRequest.municipality)
+    + "\n Kvadratura nekretnine Od " + realestateRequest.sizeMin + " do " + realestateRequest.sizeMaX +
+    + gardenSize
+  "\n Cijena od " + realestateRequest.priceMin + " do " + realestateRequest.priceMax +
+    "\n Ako želis prestati dobijati obavještenja za ovu pretragu klikni" + process.env.APP_URL + "/odjava/" + realestateRequest.uniqueId +
+    "\n Ako želiš promijeniti uslove pretrage klikni " + process.env.APP_URL + "/odpregled/" + realestateRequest.uniqueId +
+    "\n Tvoj,\n Javimi tim"
+
+  return text;
+}
+
+const sendBulkEmail = async (marketAlerts) => {
+
+  try {
+
+    destinations = []
+    groupedRERequests = [];
+
+
+    const RERequestUuidsMaped = marketAlerts.map(marketAlert => marketAlert.request);
+
+    const RERequestUuidsArray = Array.from(new Set(RERequestUuidsMaped));
+
+    const RERequestUuids = RERequestUuidsArray.map(marketAlert => {
+      return { uniqueId: marketAlert }
+    });
+
+    const RERequest = await allRERequestByUiid(RERequestUuids);
+    const requestDataValues = [];
+
+    RERequest.forEach(RERequest => {
+      var formatedRequest = {};
+      formatedRequest[RERequest.uniqueId] =
+        requestDataValues[RERequest.uniqueId] = {
+          realEstateType: RERequest.realEstateType,
+          region: RERequest.region,
+          municipality: RERequest.municipality
+        };
+    });
+
+    marketAlerts.forEach(marketAlert => {
+
+      const requestObject = {
+        email: marketAlert.email,
+        realEstateType: requestDataValues[marketAlert.request].realEstateType,
+        municipality: requestDataValues[marketAlert.request].municipality,
+        region: requestDataValues[marketAlert.request].region,
+      }
+
+      if (!groupedRERequests[marketAlert.request]) {
+        groupedRERequests[marketAlert.request] = {
+          requestObject: requestObject,
+          marketAlertArray: []
+        };
+      }
+
+      groupedRERequests[marketAlert.request].marketAlertArray.push({
+        url: marketAlert.url,
+        title: marketAlert.title,
+      });
+    });
+    for (request in groupedRERequests) {
+
+      const marketAlert = groupedRERequests[request];
+      let extractedData = toAWSArray(marketAlert.marketAlertArray);
+      const realEstateType = getRealEstateTypeEnum(marketAlert.requestObject.realEstateType).title;
+      const region = getRegionName(marketAlert.requestObject.region);
+      const municipality = getMunicipalityName(marketAlert.requestObject.region, marketAlert.requestObject.municipality);
+
+      let repData = `{ "marketAlertUrl":[${extractedData}], "realestateType":"${realEstateType}", "region":"${region}", "municipality":"${municipality}" }`
+
+      destinations.push({
+        Destination: {
+          ToAddresses: [
+            marketAlert.requestObject.email
+          ]
+        },
+        ReplacementTemplateData: repData
+      })
+
+    }
+    console.log("AWS EMAIL : Bulk email replacement data:");
+    console.log(destinations);
+
+    var params = {
+      Destinations:
+        destinations,
+      Source: process.env.SOURCE_EMAIL, /* required */
+      Template: TEMPLATE_NAME, /* required */
+      DefaultTemplateData: '{ \"REPLACEMENT_TAG_NAME\":\"REPLACEMENT_VALUE\" }',
+      ReplyToAddresses: [
+        process.env.SOURCE_EMAIL,
+      ]
+    };
+
+    // Create the promise and SES service object
+    const sendPromise = new AWS.SES({ apiVersion: '2010-12-01' }).sendBulkTemplatedEmail(params).promise();
+    const awsResult = await sendPromise;
+    console.log("AWS SES bulk email response");
+    console.log(awsResult);
+
+
+  } catch (e) {
+    console.log("Could not send bulk email", e)
+  }
+}
+
+const toAWSArray = (urlArray) => {
+
+  let arrayString = ""
+  urlArray.forEach(element => {
+    const formatetdTitle = element.title.replace(/"/g, "");
+    arrayString = arrayString + `{"url":"${element.url.trim()}" , "title":"${formatetdTitle}"},`
+  });
+  return arrayString.slice(0, -1);
+
+}
+
+const getNotificationEmailHtml = () => {
+  return `<h2> Zdravo, 
+  Pronašli smo nekretninu koju ste tražili. </h2>
+  <h3> Ovo su tražene nekretnine:  </h3> 
+  <div>
+  <div>{{#each marketAlertUrl}}<li><a href="{{url}}">{{title}}</a></li><br />{{/each}}<div/> 
+  <div/>
+  </div>`
+}
+
+const getNotificationEmailText = () => {
+  return ` Zdravo, 
+  Pronašli smo nekretninu koju ste tražili.  Ovo su tražene nekretnine: {{#each marketAlertUrl}} {{url}} {{title}} {{/each}}`
+}
+
+const createMarketAlertEmailTemplate = async () => {
+  const marketAlertTemplate = {
+    Template: {
+      TemplateName: TEMPLATE_NAME,
+      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
+
+  } catch (e) {
+    console.log("Could not create MarketAlertEmailTemplate", e);
+  }
+}
+
+const getSubject = (realEstateType, region, municipality) => {
+  return `${getRealEstateTypeEnum(realEstateType).title} ${getRegionName(region)}, ${getMunicipalityName(region, municipality)}`
+}
+
+module.exports = {
+  sendTemplatedEmail,
+  sendBulkEmail,
+  createMarketAlertEmailTemplate
+};

app/helpers/crawlers/olxClawler.js

@@ -0,0 +1,355 @@
+const fetch = require('node-fetch');
+const cheerio = require('cheerio');
+const { allRERequest, findPointInsideBoundingBox } = require('../db/dbHelper');
+const { getRealEstateTypeEnum } = require('../enums');
+const { getRegion, getMunicipality } = require('../codes')
+const Promise = require("bluebird");
+
+module.exports = class OlxCrawler {
+    //TODO figure best way to handle paging
+    constructor(fromPage = 0, toPage = 10, maxResults = 1000) {
+        this.fromPage = fromPage;
+        this.toPage = toPage;
+        this.maxResults = maxResults;
+    }
+
+    async indexPages(urls) {
+        const indexers = [];
+
+        urls.forEach(url => {
+            indexers.push(new Indexer(url));
+        });
+
+        return Promise.map(indexers, function (indexer) {
+            return indexer.indexWithPagination();
+        }).then(async (results) => {
+            return results
+        })
+    }
+
+    async crawl() {
+        console.log("OLX CRAWLER: start crawl");
+
+        const filteredResults = [];
+        const realestateRequests = await allRERequest();
+        console.log("OLX CRAWLER: found " + realestateRequests.length + "subscribed RealEstateRequests");
+        const urls = this.createRequestUrls(realestateRequests);
+        let results = await this.indexPages(urls, this.fromPage, this.toPage, this.maxResults);
+        console.log("Final crawler results");
+        if (results[0]) {
+            console.log(results[0].length);
+
+            for (const finalResult of results[0]) {
+
+                if (null !== finalResult) {
+                    if (finalResult.lat !== undefined && finalResult.lat !== null && finalResult.lat !== "") {
+                        const pointInsideBoundingBox = await findPointInsideBoundingBox([finalResult.lng, finalResult.lat], finalResult.email);
+
+                        if (pointInsideBoundingBox[0].length !== 0) {
+                            filteredResults.push(finalResult);
+                        }
+                    }
+                }
+            }
+
+            console.log("OLX CRAWLER: number of olx crawler results, after geo location filtering: " + filteredResults.length);
+            return filteredResults;
+        }
+        return []
+    }
+
+    createRequestUrls(realestateRequests) {
+        const urls = []
+
+        for (const request of realestateRequests) {
+            const realsestateType = "kategorija=" + getRealEstateTypeEnum(request.realEstateType).olxCategory;
+            const region = "kanton=" + getRegion(request.region).olxid;
+            const municipality = "grad%5B%5D=" + getMunicipality(request.region, request.municipality).olxid;
+            const sizeMin = "kvadrata_min=" + request.sizeMin;
+            const sizeMax = "kvadrata_max=" + request.sizeMax;
+            const priceMin = "od=" + request.priceMin;
+            const priceMax = "do=" + request.priceMax;
+
+            const olxUrl = {
+                url: `https://www.olx.ba/pretraga?${realsestateType}&id=2&stanje=0&vrstapregleda=tabela&sort_order=desc&${region}&${municipality}&${priceMin}&${priceMax}&vrsta=samoprodaja&${sizeMin}&${sizeMax}&stranica=`,
+                email: request.email,
+                uuid: request.uniqueId
+            }
+            console.log(olxUrl.url);
+            urls.push(olxUrl);
+        }
+
+        return urls;
+    }
+};
+
+
+class Indexer {
+
+    /**
+     * 
+     * @param {String|Array} olxUrl single or array of objects containing url email and uuid 
+     * @param {Array} hrefResutls array contaning urls from crawler results
+     */
+
+    constructor(olxUrl, hrefResutls) {
+        this.olxUrl = olxUrl;
+        this.hrefResutls = hrefResutls;
+    }
+
+    async indexWithPagination(pageNumber = 1) {
+
+        console.log("This is olxUrl:" + this.olxUrl.url);
+        const pageNr = this.olxUrl.url.match(/\d+$/);
+        const indexers = this.prepareIndexers(pageNumber ? [pageNumber] : pageNr);
+
+        try {
+
+            return Promise.map(indexers.indexers, function (indexer) {
+                return indexer.indexPage(pageNumber);
+            }).then(async (results) => {
+                let hasResults = false;
+
+                results.forEach(result => {
+                    if (!hasResults) {
+                        console.log("No results detected")
+                        hasResults = result.hasResults
+                    }
+                });
+
+                if (!hasResults) {
+                    console.log("HAS NO MORE RESULTS, stop the paging, there are some results and they should contain only HREFS");
+                    console.log(results.length);
+                    const singlePageIndexers = this.prepareHrefIndexers(results);
+                    if (singlePageIndexers.length === 0) {
+                        console.log("THERE IS NOT EVEN SINGLE RESULT");
+                        return []
+                    }
+
+                    return Promise.map(singlePageIndexers, function (indexer) {
+                        return indexer.indexSingle();
+                    }).then(async (results) => {
+                        console.log("SinglePageMethod in HAS NO RESULTS, MarketAralms");
+                        console.log(results.length);
+                        return results;
+                    });
+
+                } else {
+                    console.log("HAS MORE RESULTS, should only contain HREFS");
+                    console.log(results.length);
+                    const newResults = await this.indexWithPagination(results[0].pageNumber + 5);
+                    const singlePageIndexers = this.prepareHrefIndexers(results);
+
+                    const newerResults = await Promise.map(singlePageIndexers, function (indexer) {
+                        return indexer.indexSingle();
+                    }).then(async (results) => {
+                        console.log("SinglePageMethod HAS RESULTS, should contain MarketAlerts only");
+                        console.log(results.length);
+                        return results;
+                    });
+
+                    Array.prototype.push.apply(newResults, newerResults);
+                    return newResults;
+
+                }
+            });
+        } catch (e) {
+            console.error("Error has accured", e);
+        }
+
+    }
+
+    prepareIndexers(pageNr) {
+        console.log("Entering prepareIndexers : page nr - " + pageNr);
+        const indexers = [];
+        let lastPageNumber;
+        if (pageNr) {
+            for (let index = Number(pageNr[0]); index <= Number(pageNr[0]) + 5; index++) {
+                lastPageNumber = index;
+                const newOlxUrl = {
+                    url: this.olxUrl.url.replace(/\d+$/, "") + index,
+                    email: this.olxUrl.email,
+                    uuid: this.olxUrl.uuid
+                }
+                indexers.push(new Indexer(newOlxUrl));
+
+            }
+        } else {
+            for (let index = 1; index <= 5; index++) {
+                lastPageNumber = index;
+                const newOlxUrl = {
+                    url: this.olxUrl.url + index,
+                    email: this.olxUrl.email,
+                    uuid: this.olxUrl.uuid
+                }
+                indexers.push(new Indexer(newOlxUrl));
+            }
+        }
+        return {
+            indexers: indexers,
+            lastPageNumber: lastPageNumber
+        };
+    }
+
+    prepareHrefIndexers(results) {
+        const indexers = []
+
+        if (!Array.isArray(results)) {
+            results.hrefs.forEach(href => {
+                const newOlxUrl = {
+                    url: href,
+                    email: results.olxUrl.email,
+                    uuid: results.olxUrl.uuid
+                }
+
+                indexers.push(new Indexer(newOlxUrl));
+            });
+
+        } else {
+
+
+            results.forEach(result => {
+
+                if (result !== null && result.hasOwnProperty('hrefs')) {
+                    result.hrefs.forEach(href => {
+                        // console.log(href);
+                        const newOlxUrl = {
+                            url: href,
+                            email: result.olxUrl.email,
+                            uuid: result.olxUrl.uuid
+                        }
+
+                        indexers.push(new Indexer(newOlxUrl));
+                    })
+                }
+
+            });
+        }
+
+        return indexers;
+    }
+
+    async indexPage(pageNumber) {
+        console.log("Page number in index page, max page number :")
+        console.log(pageNumber);
+
+        try {
+
+            console.log("Indexing page: " + this.olxUrl.url);
+            const res = await fetch(this.olxUrl.url);
+            const body = await res.text();
+            const $ = cheerio.load(body);
+            const hrefs = [];
+            let hasResults = false
+
+            $('#rezultatipretrage').find('.listitem').each((i, elem) => {
+                hasResults = true
+                const href = $(elem).find('a').first().attr('href');
+                hrefs.push(href);
+            });
+
+            console.log("this is hrefs for olxUrl" + this.olxUrl.url);
+            console.log("NUMBER OF HREFS " + hrefs.length);
+
+            return {
+                hrefs: hrefs,
+                hasResults: hasResults,
+                pageNumber: pageNumber,
+                olxUrl: this.olxUrl
+            }
+        } catch (e) {
+            console.error('Exception caught:' + e);
+        }
+    }
+
+    async indexSingle() {
+        try {
+            console.log("Index single");
+            console.log(this.olxUrl.url);
+
+            if (this.olxUrl.url === undefined) {
+                return {}
+            }
+            const res = await fetch(this.olxUrl.url);
+            const body = await res.text();
+            const $ = cheerio.load(body);
+
+            const title = $('#naslovartikla').text().trim();
+            const realEstateType = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(3) > div > span:nth-child(3) > a > span').text();
+
+            const price = $('#pc > p:nth-child(2)').text();
+            const size = $('#dodatnapolja1 > div:nth-child(1) > div.df2').text();
+            const rooms = $('#dodatnapolja1 > div:nth-child(2) > div.df2').text();
+            const address = $('#dodatnapolja1 > div:nth-child(5) > div.df2').text();
+            const gardenSize = $('#dodatnapolja1 > div:nth-child(6) > div.df2').text();
+            const location = $('#artikal_glavni_div > div.artikal_lijevo > div.op.pop.mobile-lokacija').attr('data-content');
+
+            const time = $('time').attr('datetime');
+            const olxId = $('#artikal_glavni_div > div.artikal_lijevo > div:nth-child(15) > div:nth-child(4) > div.df2').text();
+
+            const descriptions = $('.artikal_detaljniopis_tekst');
+            const latLngRe = /LatLng\(([0-9]+\.[0-9]+)\,\s+([0-9]+\.[0-9]+)\)/g;
+            const imgRe = /href":("[^"]*")/g;
+            const matches = latLngRe.exec(body);
+            let lng = '',
+                lat = '';
+            const parsePrice = (price) => parseFloat(price.replace(".", ""))
+
+            if (matches && matches.length >= 3) {
+                lat = matches[1];
+                lng = matches[2];
+            }
+
+            const parsedPrice = parsePrice(price);
+
+            const locationArray = location.split(",");
+            const region = locationArray[0];
+            const municipality = locationArray[1];
+
+            const data = {
+                realEstateType: this.getCategoryId(realEstateType),
+                email: this.olxUrl.email,
+                uuid: this.olxUrl.uuid,
+                olxId: olxId,
+                url: this.olxUrl.url,
+                title,
+                price: isNaN(parsedPrice) ? 0 : parsedPrice,
+                size: parseFloat(size),
+                gardenSize: isNaN(parseFloat(gardenSize)) ? 0 : parseFloat(gardenSize),
+                address,
+                region,
+                municipality,
+                time,
+                shortDescription: descriptions.first().text(),
+                longDescription: descriptions.last().text(),
+                lat,
+                lng,
+                loc: [parseFloat(lat), parseFloat(lng)],
+            };
+
+            return data;
+        } catch (e) {
+            console.error('Exception caught: ' + e.message);
+        }
+
+        return null;
+    }
+
+    getCategoryId(category) {
+
+        switch (category) {
+            case 'Stanovi':
+                return 'stan';
+
+            case 'Vikendice':
+                return 'vikendica'
+
+            case 'Kuće':
+                return 'kuca';
+
+            default:
+                return '';
+        }
+    }
+}
+

app/helpers/db/dbHelper.js

@@ -0,0 +1,69 @@
+const db = require('../../models/index');
+
+/**
+ * Find all subscribed RealEstateRequests 
+ */
+const allRERequest = async () => {
+    return await db.RealEstateRequest.findAll({
+        where: {
+            subscribed: true
+        }
+      });
+}
+
+/**
+ * Find all subscribed RealEstateRequests by UUID
+ */
+const allRERequestByUiid = async (requestArray) => {
+
+  const Op = db.Sequelize.Op;
+  return await db.RealEstateRequest.findAll({
+      where: {
+          subscribed: true,
+          [Op.or]: requestArray
+      }
+    });
+}
+
+/**
+ * Find all , or all depending on notified bolean marketalerts, 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
+        }
+    }
+
+    return await db.MarketAlert.findAll(queryObject);
+  }
+  
+/**
+ * Find all unnotified marketalerts 
+ *  @param latLng array
+ *  @param email string
+ * 
+ * @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]})'))`);
+}
+
+module.exports = {
+  allRERequest,
+  allMarketAlerts,
+  allRERequestByUiid,
+  findPointInsideBoundingBox
+};

app/helpers/db/realEstate.js

@@ -1,111 +0,0 @@
-"use strict";
-const db = require("../../models/index");
-const sequelize = require("sequelize");
-const Op = sequelize.Op;
-
-const bulkUpsertRealEstates = async realEstateData => {
-  try {
-    const fieldsToUpdateIfDuplicate = [
-      "realEstateType",
-      "adType",
-      "price",
-      "area",
-      "streetNumber",
-      "streetName",
-      "locality",
-      "municipality",
-      "city",
-      "region",
-      "entity",
-      "country",
-      "locationLat",
-      "locationLong",
-      "title",
-      "shortDescription",
-      "longDescription",
-      "gardenSize",
-      "adStatus",
-      "updatedAt",
-      "renewedDate"
-    ];
-    const order = [["updatedAt", "desc"]];
-
-    return await db.RealEstate.bulkCreate(realEstateData, {
-      updateOnDuplicate: fieldsToUpdateIfDuplicate,
-      returning: true,
-      order
-    });
-  } catch (e) {
-    console.log("Error bulk upserting realEstates : ", e);
-  }
-};
-
-const getRealEstateById = async id => {
-  return db.RealEstate.findByPk(id);
-};
-
-const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
-  const {
-    priceMin,
-    priceMax,
-    sizeMin,
-    sizeMax,
-    adType,
-    realEstateType,
-    areaToSearch
-  } = searchRequest;
-
-  const longitudeColumn = sequelize.col("locationLong");
-  const latitudeColumn = sequelize.col("locationLat");
-
-  const pointGeometry = sequelize.fn(
-    "ST_Point",
-    longitudeColumn,
-    latitudeColumn
-  );
-  const pointWithSRID = sequelize.fn("ST_SetSRID", pointGeometry, 4326);
-  const areaToSearchAsGeometry = sequelize.fn(
-    "ST_GeomFromGeoJSON",
-    JSON.stringify(areaToSearch)
-  );
-  const areaToSearchWithSRID = sequelize.fn(
-    "ST_SetSRID",
-    areaToSearchAsGeometry,
-    4326
-  );
-  const contains = sequelize.fn(
-    "ST_Contains",
-    areaToSearchWithSRID,
-    pointWithSRID
-  );
-
-  const geoSearchQueryPart = sequelize.where(contains, true);
-
-  const query = {
-    adType,
-    realEstateType,
-    price: {
-      [Op.lte]: priceMax,
-      [Op.gte]: priceMin
-    },
-    area: {
-      [Op.lte]: sizeMax,
-      [Op.gte]: sizeMin
-    },
-    [Op.and]: geoSearchQueryPart
-  };
-
-  const order = [["updatedAt", "desc"]];
-
-  return await db.RealEstate.findAll({
-    where: query,
-    limit: maxResults,
-    order
-  });
-};
-
-module.exports = {
-  bulkUpsertRealEstates,
-  getRealEstateById,
-  findRealEstatesForSearchRequest
-};

app/helpers/db/searchRequest.js

@@ -1,74 +0,0 @@
-"use strict";
-const db = require("../../models/index");
-const sequelize = require("sequelize");
-const Op = sequelize.Op;
-
-const getSearchRequest = async searchRequestId => {
-  try {
-    return await db.SearchRequest.findByPk(searchRequestId);
-  } catch (error) {
-    return null;
-  }
-};
-
-const createSearchRequest = async (searchRequestFields = {}) => {
-  return await db.SearchRequest.create(searchRequestFields);
-};
-
-const findSearchRequestsForRealEstate = async realEstate => {
-  const {
-    price,
-    area,
-    adType,
-    realEstateType,
-    locationLat,
-    locationLong
-  } = realEstate;
-
-  if (!locationLat || !locationLong) {
-    return [];
-  }
-
-  const stGeometry = sequelize.fn(
-    "ST_GEOMFROMTEXT",
-    `POINT (${locationLong} ${locationLat})`,
-    4326
-  );
-  const areaToSearchColumn = sequelize.col("areaToSearch");
-  const contains = sequelize.fn("ST_Contains", areaToSearchColumn, stGeometry);
-
-  const geoSearchQueryPart = sequelize.where(contains, true);
-
-  const query = {
-    adType,
-    realEstateType,
-    subscribed: true,
-    [Op.and]: geoSearchQueryPart
-  };
-
-  if (price) {
-    query.priceMin = {
-      [Op.lte]: price
-    };
-    query.priceMax = {
-      [Op.gte]: price
-    };
-  }
-
-  if (area) {
-    query.sizeMin = {
-      [Op.lte]: area
-    };
-    query.sizeMax = {
-      [Op.gte]: area
-    };
-  }
-
-  return await db.SearchRequest.findAll({ where: query });
-};
-
-module.exports = {
-  getSearchRequest,
-  createSearchRequest,
-  findSearchRequestsForRealEstate
-};

app/helpers/db/searchRequestMatch.js

@@ -1,36 +0,0 @@
-"use strict";
-const db = require("../../models/index");
-
-const findRealEstatesForSearchRequest = async searchRequestId => {
-  const query = {
-    searchRequestId
-  };
-
-  const realEstatesModel = { model: db.RealEstate, as: "realEstates" };
-  const order = [[realEstatesModel, "updatedAt", "desc"]];
-  const include = [realEstatesModel];
-
-  const matches = await db.SearchRequestMatch.findAll({
-    where: query,
-    include,
-    order
-  });
-
-  const matchingRealEstates = [];
-  for (const match of matches) {
-    matchingRealEstates.push(...match.realEstates);
-  }
-
-  return matchingRealEstates;
-};
-
-const addMatches = async matchingRecords => {
-  return await db.SearchRequestMatch.bulkCreate(matchingRecords, {
-    ignoreDuplicates: true
-  });
-};
-
-module.exports = {
-  findRealEstatesForSearchRequest,
-  addMatches
-};

app/helpers/email.js

@@ -1,6 +1,7 @@
-const isValidEmail = email => {
+
-  const simpleEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+const isValidEmail = (email) => {
-  return email && email.length < 250 && simpleEmailRegex.test(email);
+  const simpleEmailRegex = /^.+@.+\..+$/;
+  return (email && email.length < 250 && simpleEmailRegex.test(email));
 };
 
 module.exports = {

app/helpers/emailContentGenerator.js

@@ -1,112 +0,0 @@
-"use strict";
-
-const { MAX_REAL_ESTATES_IN_EMAIL, APP_URL } = require("../config/appConfig");
-const { AD_CATEGORY } = require("../common/enums");
-
-const generateEmailFooter = searchRequestId => {
-  return `<div>Ako želite prestati dobijati obavještenja za ovu pretragu, <a href="${APP_URL}/odjava/${searchRequestId}">odjavite ovdje</a></div>
-     <div>Ako želite pogledati ili promijeniti uslove za ovu pretragu, <a href="${APP_URL}/pregled/${searchRequestId}">pogledajte ovdje</a></div>
-     <br/> 
-     <strong>Vaš,<br/>Kivi tim</strong>`;
-};
-
-const generateRealEstateLinks = realEstates => {
-  let realEstateLinks = "";
-  for (const realEstate of realEstates) {
-    const { id: realEstateId, title } = realEstate;
-
-    realEstateLinks += `<li><a href="${APP_URL}/redirect/${realEstateId}">${title}</a></li>`;
-  }
-  return realEstateLinks;
-};
-
-const generateNotificationEmail = (realEstates, searchRequestId) => {
-  const truncateList = realEstates.length > MAX_REAL_ESTATES_IN_EMAIL;
-  const realEstatesToShow = truncateList
-    ? realEstates.slice(0, MAX_REAL_ESTATES_IN_EMAIL)
-    : realEstates;
-
-  const allRealEstatesLink = `${APP_URL}/nekretnine/${searchRequestId}`;
-  const realEstateLinks = generateRealEstateLinks(realEstatesToShow);
-  const moreRealEstates = `<div>Kompletan spisak nekretnina možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
-  const emailFooter = generateEmailFooter(searchRequestId);
-
-  return `<h3>Zdravo</h3>
-  <h4>Pronašli smo nekretnine koje odgovaraju Vašoj pretrazi</h4>
-  <div>
-  ${realEstateLinks}
-  <div/>
-  ${moreRealEstates}
-  </div>
-  <br/>
-  ${emailFooter}`;
-};
-
-const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
-  const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
-  const {
-    id,
-    gardenSizeMin,
-    gardenSizeMax,
-    sizeMin,
-    sizeMax,
-    priceMin,
-    priceMax
-  } = searchRequest;
-
-  const realEstateLinks = generateRealEstateLinks(matchingRealEstates);
-  const instantRealEstatesText = `<br/>
-       <div>
-        U međuvremenu pogledajte neke od nedavno objavljenih nekretnina koje odgovaraju Vašim uslovima pretrage :<br/>
-        ${realEstateLinks}
-       </div>`;
-
-  const gardenSize = realEstateType.hasGardenSize
-    ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
-    : ``;
-
-  const emailFooter = generateEmailFooter(id);
-
-  return `<h3>Zdravo</h3>
-  <div>Naručili ste da Vam javimo ako se nekretnina sa navedenim uslovima pojavi u oglasima:</div>
-  <br/>
-  <div>
-    <div><strong>Tip nekretnine: </strong>${realEstateType.title}</div>
-    <div><strong>Kvadratura nekretnine:</strong> Od ${sizeMin} do ${sizeMax} m2</div>
-    ${gardenSize}
-    <div><strong>Cijena:</strong> ${priceMin} do ${priceMax} KM</div>
-  </div>
-  ${matchingRealEstates.length > 0 ? instantRealEstatesText : ""}
-  <br/>
-  ${emailFooter}`;
-};
-
-const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
-  if (numberOfRealEstates === 1) {
-    return `Kivi: ${singleRealEstateTitle}`;
-  }
-
-  const leastSignificantDigit = numberOfRealEstates % 10;
-  const numberWithoutLastDigit = Math.floor(numberOfRealEstates / 10);
-  const secondLeastSignificantDigit = numberWithoutLastDigit % 10;
-
-  if (leastSignificantDigit === 1 && secondLeastSignificantDigit !== 1) {
-    return `Kivi : ${numberOfRealEstates} nova nekretnina`;
-  }
-
-  if (
-    leastSignificantDigit >= 2 &&
-    leastSignificantDigit <= 4 &&
-    secondLeastSignificantDigit !== 1
-  ) {
-    return `Kivi: ${numberOfRealEstates} nove nekretnine`;
-  }
-
-  return `Kivi: ${numberOfRealEstates} novih nekretnina`;
-};
-
-module.exports = {
-  generateNotificationEmail,
-  generateNewSearchRequestEmail,
-  generateEmailSubject
-};

app/helpers/enums.js

@@ -0,0 +1,57 @@
+const realEstateTypes = [
+    { title: "Kuća", id: "kuca", hasGardenSize: true, olxCategory: 24 },
+    { title: "Stan", id: "stan", hasGardenSize: false, olxCategory: 23},
+    { title: "Vikendica", id: "vikendica", hasGardenSize: true, olxCategory: 26 }
+];
+
+const sizes = [
+    { title: "do 50 m2", id: "50m2" },
+    { title: "do 75 m2", id: "75m2" },
+    { title: "do 100 m2", id: "100m2" },
+    { title: "do 150 m2", id: "150m2" },
+    { title: "do 200 m2", id: "200m2" },
+    { title: "preko 200 m2", id: "moreThan200m2" }
+];
+
+const gardenSizes = [
+    { title: "do 100 m2", id: "100m2" },
+    { title: "do 500 m2", id: "500m2" },
+    { title: "do 1 dunum", id: "1000m2" },
+    { title: "do 2 dunuma", id: "2000m2" },
+    { title: "do 3 dunuma", id: "3000m2" },
+    { title: "preko 3 dunuma", id: "moreThan3000m2" }
+];
+
+const prices = [
+    { title: "do 50 000 KM", id: "50kKM" },
+    { title: "do 100 000 KM", id: "100kKM" },
+    { title: "do 150 000 KM", id: "150kKM" },
+    { title: "do 200 000 KM", id: "200kKM" },
+    { title: "do 250 000 KM", id: "250kKM" },
+    { title: "preko 250 000 KM", id: "moreThan250kKM" }
+];
+
+const getEnumObject = (enumType, enumId) => {
+    return enumType.find(enumValue => enumValue.id === enumId);
+};
+
+const getRealEstateTypeEnum = (enumId) => {
+    return getEnumObject(realEstateTypes, enumId) || null;
+}
+
+const getEnumTypeTitle = (enumType, enumId) => {
+    const enumObject = getEnumObject(enumType, enumId);
+    if (!enumObject){
+        return null;
+    }
+    return enumObject.title;
+};
+
+module.exports = {
+    realEstateTypes,
+    sizes,
+    gardenSizes,
+    prices,
+    getRealEstateTypeEnum,
+    getEnumTypeTitle,
+};

app/helpers/forceSSL.js

@@ -1,25 +0,0 @@
-/**
- * Force load with https on production environment
- * https://devcenter.heroku.com/articles/http-routing#heroku-headers
- */
-module.exports = function(environments, status) {
-  environments = environments || ["production"];
-  status = status || 301;
-  // console.log("New force SSL ");
-  // console.log("\tenvs : ", environments);
-  // console.log("\tstatus: ", status);
-  // console.log("\tENV : ", process.env.NODE_ENV);
-  return function(req, res, next) {
-    if (environments.indexOf(process.env.NODE_ENV) >= 0) {
-      if (req.headers["x-forwarded-proto"] !== "https") {
-        const urlToRedirectTo = `https://${req.hostname}${req.originalUrl}`;
-        // console.log("\tRedirect :", urlToRedirectTo);
-        res.redirect(status, urlToRedirectTo);
-      } else {
-        next();
-      }
-    } else {
-      next();
-    }
-  };
-};

app/helpers/url.js

@@ -1,12 +1,12 @@
-const { getSearchRequest } = require("./db/searchRequest");
+const db = require('../models/index');
 
-const currentSearchRequest = async req => {
+const currentRERequest = async (req) => {
-  const searchRequestId =
+  const uniqueId = req.params['request_id'];
-    req && req.params ? req.params["searchRequestId"] : null;
+  if(!uniqueId) return null;
-  if (!searchRequestId) return null;
 
-  return await getSearchRequest(searchRequestId);
+  const request = await db.RealEstateRequest.findOne({ where: {uniqueId} });
+  return request;
 };
 module.exports = {
-  currentSearchRequest
+  currentRERequest,
 };

app/lib/areThereAnyNewItems.js

@@ -0,0 +1,10 @@
+const convertToDate = require("./convertToDate");
+
+function areThereAnyNewItems(lastItemDate, controlDate) {
+  if (!lastItemDate) {
+    return true;
+  }
+  return new Date(controlDate) < convertToDate(lastItemDate);
+}
+
+module.exports = areThereAnyNewItems;

app/lib/convertToDate.js

@@ -0,0 +1,13 @@
+function convertToDate(date) {
+  const [dan, mjesec, godina] = date
+    .split(". u ")[0]
+    .split(".")
+    .map(el => Number(el));
+  const [sati, minute] = date
+    .split(". u ")[1]
+    .split(":")
+    .map(el => Number(el));
+  return new Date(godina, mjesec, dan, sati, minute);
+}
+
+module.exports = convertToDate;

app/lib/scrapTheItems.js

@@ -0,0 +1,42 @@
+let fetch = require("node-fetch");
+let cheerio = require("cheerio");
+const areThereAnyNewItems = require("./areThereAnyNewItems");
+
+async function scrapTheItems(url, controlDate, noNewItems = false) {
+  let items = [];
+  let response = await fetch(url);
+  const body = await response.text();
+  const $ = cheerio.load(body);
+  $("#rezultatipretrage")
+    .find(".listitem")
+    .each(async (index, elem) => {
+      if (noNewItems) return;
+      const itemDate = $(elem)
+        .find(".cijena > .datum > div")
+        .first()
+        .attr("data-cijelidatum");
+
+      if (controlDate && !areThereAnyNewItems(itemDate, controlDate)) {
+        noNewItems = true;
+        return;
+      }
+
+      const id = $(elem)
+        .find("a")
+        .first()
+        .attr("href");
+      const cijena = $(elem)
+        .find(".cijena > .datum > span")
+        .first()
+        .text();
+      const image = $(elem)
+        .find("a > .slika > img")
+        .first()
+        .attr("src");
+
+      items.push({ url: id, price: cijena, image, date: itemDate });
+    });
+  return items;
+}
+
+module.exports = scrapTheItems;

app/lib/sendNotification.js

@@ -0,0 +1,58 @@
+const scrapTheItems = require("./scrapTheItems");
+const convertToDate = require("./convertToDate");
+const AWS = require('aws-sdk');
+// AWS.config.update({region: 'eu-central-1'});
+
+
+async function sendNotification(marketAlert) {
+  const { id, email, olx_url } = marketAlert;
+  let url =
+    "https://www.olx.ba/pretraga?" + olx_url + "&sort_order=desc&sort_po=datum";
+  let newItems = await scrapTheItems(url);
+  let lastDate = newItems.length && newItems[0].date;
+  let message =
+    newItems.length &&
+    newItems.reduce(
+      (mes, item) => mes + `<strong>${item.url} i  ${item.price}</strong>`,
+      ""
+    );
+
+  // Create sendEmail params
+  const params = {
+    Destination: { /* required */
+      CcAddresses: [
+      ],
+      ToAddresses: [
+        email
+      ]
+    },
+    Message: { /* required */
+      Body: { /* required */
+        Html: {
+         Charset: "UTF-8",
+         Data: message
+        },
+        Text: {
+         Charset: "UTF-8",
+         Data: message // TODO: convert to text
+        }
+       },
+     Subject: {
+      Charset: 'UTF-8',
+      Data: 'Javimi alert'
+     }
+    },
+    Source: 'info@saburly.com', /* required */
+    ReplyToAddresses: [
+       'info@saburly.com',
+    ],
+  };
+
+  if (message) {
+    const sendPromise = new AWS.SES({apiVersion: '2010-12-01'}).sendEmail(params).promise();
+    await sendPromise;
+    return { id, date: String(convertToDate(lastDate)) };
+  }
+}
+
+module.exports = sendNotification;

app/migrations/20190417035319-create-market-alert.js

@@ -1,7 +1,7 @@
-"use strict";
+'use strict';
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.createTable("MarketAlerts", {
+    return queryInterface.createTable('MarketAlerts', {
       id: {
         allowNull: false,
         autoIncrement: true,
@@ -29,6 +29,6 @@ module.exports = {
     });
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable("MarketAlerts");
+    return queryInterface.dropTable('MarketAlerts');
   }
 };

app/migrations/20190417035707-create-real-estate-request.js

@@ -1,7 +1,7 @@
-"use strict";
+'use strict';
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.createTable("RealEstateRequests", {
+    return queryInterface.createTable('RealEstateRequests', {
       id: {
         allowNull: false,
         autoIncrement: true,
@@ -28,6 +28,6 @@ module.exports = {
     });
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable("RealEstateRequests");
+    return queryInterface.dropTable('RealEstateRequests');
   }
 };

app/migrations/20190427043621-add_city_to_real_estate_request.js

@@ -1,15 +1,18 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.addColumn(
-      "RealEstateRequests",
+      'RealEstateRequests',
-      "city",
+      'city',
-      Sequelize.STRING
+     Sequelize.STRING
     );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "city");
+    return queryInterface.removeColumn(
+      'RealEstateRequests',
+      'city'
+    );
   }
 };

app/migrations/20190429050222-add_place_to_real_estate_request.js

@@ -1,15 +1,18 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.addColumn(
-      "RealEstateRequests",
+      'RealEstateRequests',
-      "place",
+      'place',
-      Sequelize.STRING
+     Sequelize.STRING
     );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "place");
+    return queryInterface.removeColumn(
+      'RealEstateRequests',
+      'place'
+    );
   }
 };

app/migrations/20190516180226-rename-place-column.js

@@ -1,19 +1,19 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.renameColumn(
-      "RealEstateRequests",
+        'RealEstateRequests',
-      "place",
+        'place',
-      "municipality"
+        'municipality'
     );
   },
 
   down: (queryInterface, Sequelize) => {
     return queryInterface.renameColumn(
-      "RealEstateRequests",
+        'RealEstateRequests',
-      "municipality",
+        'municipality',
-      "place"
+        'place'
     );
   }
 };

app/migrations/20190516222240-rename-city-column.js

@@ -1,11 +1,19 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.renameColumn("RealEstateRequests", "city", "region");
+    return queryInterface.renameColumn(
+        'RealEstateRequests',
+        'city',
+        'region'
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.renameColumn("RealEstateRequests", "region", "city");
+    return queryInterface.renameColumn(
+        'RealEstateRequests',
+        'region',
+        'city'
+    );
   }
 };

app/migrations/20190517072957-add-size-to-real-estate-request.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstateRequests", "size", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'RealEstateRequests',
-    });
+        'size',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "size");
+    return queryInterface.removeColumn(
+        'RealEstateRequests',
+        'size'
+    );
   }
 };

app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstateRequests", "gardenSize", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'RealEstateRequests',
-    });
+        'gardenSize',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "gardenSize");
+    return queryInterface.removeColumn(
+        'RealEstateRequests',
+        'gardenSize'
+    );
   }
 };

app/migrations/20190517092716-add-price-to-real-estate-request.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstateRequests", "price", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'RealEstateRequests',
-    });
+        'price',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "price");
+    return queryInterface.removeColumn(
+        'RealEstateRequests',
+        'price'
+    );
   }
 };

app/migrations/20190523144812-activate-postgis.js

@@ -1,19 +1,15 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize
+    return queryInterface.sequelize.query("CREATE EXTENSION postgis").then(([results, metadata]) => {
-      .query("CREATE EXTENSION postgis")
+       /// No result
-      .then(([results, metadata]) => {
+      })
-        /// No result
-      });
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize
+    return queryInterface.sequelize.query("DROP EXTENSION IF EXISTS postgis").then(([results, metadata]) => {
-      .query("DROP EXTENSION IF EXISTS postgis")
-      .then(([results, metadata]) => {
         /// No result
-      });
+       })
   }
 };

app/migrations/20190523151420-add-bounding-box-column.js

@@ -1,21 +1,17 @@
-"use strict";
+'use strict';
 
 module.exports = {
+
   up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize
+
-      .query(
+    return queryInterface.sequelize.query("ALTER TABLE \"RealEstateRequests\" ADD COLUMN bounding_box geometry(Polygon);").then(([results, metadata]) => {
-        'ALTER TABLE "RealEstateRequests" ADD COLUMN bounding_box geometry(Polygon);'
+      /// No result
-      )
+    })
-      .then(([results, metadata]) => {
-        /// No result
-      });
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize
+    return queryInterface.sequelize.query("ALTER TABLE \"RealEstateRequests\" DROP COLUMN bounding_box").then(([results, metadata]) => {
-      .query('ALTER TABLE "RealEstateRequests" DROP COLUMN bounding_box')
+      /// No result
-      .then(([results, metadata]) => {
+    })
-        /// No result
-      });
   }
-};
+};

app/migrations/20190529093410-slider-fields.js

@@ -1,48 +1,27 @@
 module.exports = {
-  up: (queryInterface, Sequelize) => {
+    up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.addColumn(
+                queryInterface.addColumn('RealEstateRequests', 'sizeRange', {
-          "RealEstateRequests",
+                    type: Sequelize.STRING
-          "sizeRange",
+                }, { transaction: t }),
-          {
+                queryInterface.addColumn('RealEstateRequests', 'gardenSizeRange', {
-            type: Sequelize.STRING
+                    type: Sequelize.STRING,
-          },
+                }, { transaction: t }),
-          { transaction: t }
+                queryInterface.addColumn('RealEstateRequests', 'priceRange', {
-        ),
+                    type: Sequelize.STRING,
-        queryInterface.addColumn(
+                }, { transaction: t })
-          "RealEstateRequests",
+            ])
-          "gardenSizeRange",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "priceRange",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
-      return Promise.all([
-        queryInterface.removeColumn("RealEstateRequests", "sizeRange", {
-          transaction: t
-        }),
-        queryInterface.removeColumn("RealEstateRequests", "gardenSizeRange", {
-          transaction: t
-        }),
-        queryInterface.removeColumn("RealEstateRequests", "priceRange", {
-          transaction: t
         })
-      ]);
+    },
-    });
+
-  }
+    down: (queryInterface, Sequelize) => {
-};
+        return queryInterface.sequelize.transaction((t) => {
+            return Promise.all([
+                queryInterface.removeColumn('RealEstateRequests', 'sizeRange', { transaction: t }),
+                queryInterface.removeColumn('RealEstateRequests', 'gardenSizeRange', { transaction: t }),
+                queryInterface.removeColumn('RealEstateRequests', 'priceRange', { transaction: t })
+            ])
+        })
+    }
+};

app/migrations/20190530101945-range-fields.js

@@ -1,147 +1,63 @@
 module.exports = {
-  up: (queryInterface, Sequelize) => {
+    up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.removeColumn("RealEstateRequests", "sizeRange", {
+                queryInterface.removeColumn('RealEstateRequests', 'sizeRange', { transaction: t }),
-          transaction: t
+                queryInterface.removeColumn('RealEstateRequests', 'gardenSizeRange', { transaction: t }),
-        }),
+                queryInterface.removeColumn('RealEstateRequests', 'priceRange', { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "gardenSizeRange", {
+                queryInterface.removeColumn('RealEstateRequests', 'size', { transaction: t }),
-          transaction: t
+                queryInterface.removeColumn('RealEstateRequests', 'gardenSize', { transaction: t }),
-        }),
+                queryInterface.removeColumn('RealEstateRequests', 'price', { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "priceRange", {
+                queryInterface.addColumn('RealEstateRequests', 'gardenSizeMin', {
-          transaction: t
+                    type: Sequelize.INTEGER,
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "size", {
+                queryInterface.addColumn('RealEstateRequests', 'gardenSizeMax', {
-          transaction: t
+                    type: Sequelize.INTEGER,
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "gardenSize", {
+                queryInterface.addColumn('RealEstateRequests', 'sizeMin', {
-          transaction: t
+                    type: Sequelize.INTEGER
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "price", {
+                queryInterface.addColumn('RealEstateRequests', 'sizeMax', {
-          transaction: t
+                    type: Sequelize.INTEGER,
-        }),
+                }, { transaction: t }),
-        queryInterface.addColumn(
+                queryInterface.addColumn('RealEstateRequests', 'priceMin', {
-          "RealEstateRequests",
+                    type: Sequelize.INTEGER,
-          "gardenSizeMin",
+                }, { transaction: t }),
-          {
+                queryInterface.addColumn('RealEstateRequests', 'priceMax', {
-            type: Sequelize.INTEGER
+                    type: Sequelize.INTEGER
-          },
+                }, { transaction: t })
-          { transaction: t }
+            ])
-        ),
+        })
-        queryInterface.addColumn(
+    },
-          "RealEstateRequests",
-          "gardenSizeMax",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "sizeMin",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "sizeMax",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "priceMin",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "priceMax",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  },
 
-  down: (queryInterface, Sequelize) => {
+    down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.removeColumn("RealEstateRequests", "gardenSizeMin", {
+                queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMin', { transaction: t }),
-          transaction: t
+                queryInterface.removeColumn('RealEstateRequests', 'gardenSizeMax', { transaction: t }),
-        }),
+                queryInterface.removeColumn('RealEstateRequests', 'sizeMin', { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "gardenSizeMax", {
+                queryInterface.removeColumn('RealEstateRequests', 'sizeMax', { transaction: t }),
-          transaction: t
+                queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
-        }),
+                queryInterface.removeColumn('RealEstateRequests', 'priceMin', { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "sizeMin", {
+                queryInterface.addColumn('RealEstateRequests', 'priceMax', {
-          transaction: t
+                    type: Sequelize.STRING
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "sizeMax", {
+                queryInterface.addColumn('RealEstateRequests', 'gardenSizeRange', {
-          transaction: t
+                    type: Sequelize.STRING,
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "priceMin", {
+                queryInterface.addColumn('RealEstateRequests', 'priceRange', {
-          transaction: t
+                    type: Sequelize.STRING,
-        }),
+                }, { transaction: t }),
-        queryInterface.removeColumn("RealEstateRequests", "priceMin", {
+                queryInterface.addColumn('RealEstateRequests', 'size', {
-          transaction: t
+                    type: Sequelize.STRING
-        }),
+                }, { transaction: t }),
-        queryInterface.addColumn(
+                queryInterface.addColumn('RealEstateRequests', 'gardenSize', {
-          "RealEstateRequests",
+                    type: Sequelize.STRING,
-          "priceMax",
+                }, { transaction: t }),
-          {
+                queryInterface.addColumn('RealEstateRequests', 'price', {
-            type: Sequelize.STRING
+                    type: Sequelize.STRING,
-          },
+                }, { transaction: t })
-          { transaction: t }
+            ])
-        ),
+        })
-        queryInterface.addColumn(
+    }
-          "RealEstateRequests",
+};
-          "gardenSizeRange",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "priceRange",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "size",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "gardenSize",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "RealEstateRequests",
-          "price",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  }
-};

app/migrations/20190531111232-subscribed-boolean.js

@@ -1,15 +1,18 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.addColumn(
-      "RealEstateRequests",
+      'RealEstateRequests',
-      "subscribed",
+      'subscribed',
-      Sequelize.BOOLEAN
+     Sequelize.BOOLEAN
     );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "subscribed");
+    return queryInterface.removeColumn(
+      'RealEstateRequests',
+      'subscribed'
+    );
   }
 };

app/migrations/20190618103020-expand-maketalert.js

@@ -1,70 +1,37 @@
-"use strict";
+'use strict';
 
 module.exports = {
-  up: (queryInterface, Sequelize) => {
+    up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.addColumn(
+                queryInterface.addColumn('MarketAlerts', 'size', {
-          "MarketAlerts",
+                    type: Sequelize.INTEGER,
-          "size",
+                }, { transaction: t }),
-          {
+                queryInterface.addColumn('MarketAlerts', 'gardenSize', {
-            type: Sequelize.INTEGER
+                    type: Sequelize.INTEGER,
-          },
+                }, { transaction: t }),
-          { transaction: t }
+                queryInterface.addColumn('MarketAlerts', 'price', {
-        ),
+                    type: Sequelize.INTEGER,
-        queryInterface.addColumn(
+                }, { transaction: t }),
-          "MarketAlerts",
+                queryInterface.addColumn('MarketAlerts', 'municipality', {
-          "gardenSize",
+                    type: Sequelize.STRING,
-          {
+                }, { transaction: t }),
-            type: Sequelize.INTEGER
+                queryInterface.addColumn('MarketAlerts', 'region', {
-          },
+                    type: Sequelize.STRING,
-          { transaction: t }
+                }, { transaction: t })
-        ),
+            ])
-        queryInterface.addColumn(
-          "MarketAlerts",
-          "price",
-          {
-            type: Sequelize.INTEGER
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "MarketAlerts",
-          "municipality",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "MarketAlerts",
-          "region",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
-      return Promise.all([
-        queryInterface.removeColumn("MarketAlerts", "size", { transaction: t }),
-        queryInterface.removeColumn("MarketAlerts", "gardenSize", {
-          transaction: t
-        }),
-        queryInterface.removeColumn("MarketAlerts", "price", {
-          transaction: t
-        }),
-        queryInterface.removeColumn("MarketAlerts", "municipality", {
-          transaction: t
-        }),
-        queryInterface.removeColumn("MarketAlerts", "region", {
-          transaction: t
         })
-      ]);
+    },
-    });
+
-  }
+    down: (queryInterface, Sequelize) => {
+        return queryInterface.sequelize.transaction((t) => {
+            return Promise.all([
+                queryInterface.removeColumn('MarketAlerts', 'size', { transaction: t }),
+                queryInterface.removeColumn('MarketAlerts', 'gardenSize', { transaction: t }),
+                queryInterface.removeColumn('MarketAlerts', 'price', { transaction: t }),
+                queryInterface.removeColumn('MarketAlerts', 'municipality', { transaction: t }),
+                queryInterface.removeColumn('MarketAlerts', 'region', { transaction: t })
+            ])
+        })
+    }
 };

app/migrations/20190618124522-marketalerts-additional-info.js

@@ -1,59 +1,33 @@
-"use strict";
+'use strict';
 
 module.exports = {
-  up: (queryInterface, Sequelize) => {
+    up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.removeColumn("MarketAlerts", "olxUrl", {
+                queryInterface.removeColumn('MarketAlerts', 'olxUrl', { transaction: t }),
-          transaction: t
+                queryInterface.addColumn('MarketAlerts', 'url', {
-        }),
+                    type: Sequelize.STRING,
-        queryInterface.addColumn(
+                }, { transaction: t }),
-          "MarketAlerts",
+                queryInterface.addColumn('MarketAlerts', 'realestateOrigin', {
-          "url",
+                    type: Sequelize.STRING,
-          {
+                }, { transaction: t }),
-            type: Sequelize.STRING
+                queryInterface.addColumn('MarketAlerts', 'originId', {
-          },
+                    type: Sequelize.STRING,
-          { transaction: t }
+                }, { transaction: t })
-        ),
+            ])
-        queryInterface.addColumn(
+        })
-          "MarketAlerts",
+    },
-          "realestateOrigin",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        ),
-        queryInterface.addColumn(
-          "MarketAlerts",
-          "originId",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  },
 
-  down: (queryInterface, Sequelize) => {
+    down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.transaction(t => {
+        return queryInterface.sequelize.transaction((t) => {
-      return Promise.all([
+            return Promise.all([
-        queryInterface.removeColumn("MarketAlerts", "url", { transaction: t }),
+                queryInterface.removeColumn('MarketAlerts', 'url', { transaction: t }),
-        queryInterface.removeColumn("MarketAlerts", "realestateOrigin", {
+                queryInterface.removeColumn('MarketAlerts', 'realestateOrigin', { transaction: t }),
-          transaction: t
+                queryInterface.removeColumn('MarketAlerts', 'originId', { transaction: t }),
-        }),
+                queryInterface.addColumn('MarketAlerts', 'olxUrl', {
-        queryInterface.removeColumn("MarketAlerts", "originId", {
+                    type: Sequelize.STRING
-          transaction: t
+                }, { transaction: t })
-        }),
+            ])
-        queryInterface.addColumn(
+        })
-          "MarketAlerts",
+    }
-          "olxUrl",
-          {
-            type: Sequelize.STRING
-          },
-          { transaction: t }
-        )
-      ]);
-    });
-  }
 };

app/migrations/20190621162321-add-category-to-marketalert.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("MarketAlerts", "realEstateType", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'MarketAlerts',
-    });
+        'realEstateType',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("MarketAlerts", "realEstateType");
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'realEstateType'
+    );
   }
 };

app/migrations/20190625120813-add-notification-sent-boolean-marketalerts.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("MarketAlerts", "notified", {
+    return queryInterface.addColumn(
-      type: Sequelize.BOOLEAN
+        'MarketAlerts',
-    });
+        'notified',
+        {
+          type: Sequelize.BOOLEAN
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("MarketAlerts", "notified");
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'notified'
+    );
   }
 };

app/migrations/20190628165512-add-title-to-marketalerts.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("MarketAlerts", "title", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'MarketAlerts',
-    });
+        'title',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("MarketAlerts", "title");
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'title'
+    );
   }
 };

app/migrations/20190702132143-add-RREquet-uuid-to-marketalerts.js

@@ -1,13 +1,20 @@
-"use strict";
+'use strict';
 
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("MarketAlerts", "request", {
+    return queryInterface.addColumn(
-      type: Sequelize.STRING
+        'MarketAlerts',
-    });
+        'request',
+        {
+          type: Sequelize.STRING
+        }
+    );
   },
 
   down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("MarketAlerts", "request");
+    return queryInterface.removeColumn(
+        'MarketAlerts',
+        'request'
+    );
   }
 };

app/migrations/20190710141356-add-has-location-to-marketalerts.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("MarketAlerts", "hasLocation", {
-      type: Sequelize.BOOLEAN
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("MarketAlerts", "hasLocation");
-  }
-};

app/migrations/20190909110623-add-location-input-to-real-estate-request.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstateRequests", "locationInput", {
-      type: Sequelize.STRING
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstateRequests", "locationInput");
-  }
-};

app/migrations/20190910033923-change-bounding-box-from-snake-case-to-camel-case.js

@@ -1,19 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.renameColumn(
-      "RealEstateRequests",
-      "bounding_box",
-      "boundingBox"
-    );
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.renameColumn(
-      "RealEstateRequests",
-      "boundingBox",
-      "bounding_box"
-    );
-  }
-};

app/migrations/20190912191829-add-realEstates-table.js

@@ -1,72 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    const tableFields = {
-      id: {
-        type: Sequelize.BIGINT,
-        autoIncrement: true,
-        allowNull: false,
-        primaryKey: true
-      },
-      url: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      agencyObjectId: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      originAgencyName: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      realEstateType: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      adType: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      price: Sequelize.REAL,
-      area: Sequelize.REAL,
-      gardenSize: Sequelize.REAL,
-      streetNumber: Sequelize.INTEGER,
-      streetName: Sequelize.TEXT,
-      locality: Sequelize.TEXT,
-      municipality: Sequelize.TEXT,
-      city: Sequelize.TEXT,
-      region: Sequelize.TEXT,
-      entity: Sequelize.TEXT,
-      country: Sequelize.TEXT,
-      locationLat: Sequelize.REAL,
-      locationLong: Sequelize.REAL,
-      lastTimeCrawled: {
-        type: Sequelize.DATE,
-        allowNull: false
-      },
-      deleted: {
-        type: Sequelize.BOOLEAN,
-        allowNull: false
-      },
-      sold: {
-        type: Sequelize.BOOLEAN,
-        allowNull: false
-      },
-      createdAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      },
-      updatedAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      }
-    };
-    return queryInterface.createTable("RealEstates", tableFields);
-  },
-
-  down: queryInterface => {
-    return queryInterface.dropTable("RealEstates", {});
-  }
-};

app/migrations/20190912215313-add-searchRequests-table.js

@@ -1,79 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    const tableFields = {
-      id: {
-        type: Sequelize.UUID,
-        defaultValue: Sequelize.UUIDV4,
-        allowNull: false,
-        primaryKey: true
-      },
-      areaToSearch: {
-        type: Sequelize.GEOMETRY("POLYGON", 4326),
-        allowNull: false,
-        defaultValue: {
-          type: "Polygon",
-          coordinates: [[[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]],
-          crs: { type: "name", properties: { name: "EPSG:4326" } }
-        }
-      },
-      realEstateType: {
-        type: Sequelize.TEXT,
-        allowNull: false
-      },
-      adType: {
-        type: Sequelize.TEXT,
-        allowNull: false,
-        defaultValue: "sell"
-      },
-      email: Sequelize.TEXT,
-      locality: Sequelize.TEXT,
-      municipality: Sequelize.TEXT,
-      city: Sequelize.TEXT,
-      region: Sequelize.TEXT,
-      entity: Sequelize.TEXT,
-      country: Sequelize.TEXT,
-      sizeMin: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        defaultValue: 0
-      },
-      sizeMax: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        defaultValue: 0
-      },
-      priceMin: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        defaultValue: 0
-      },
-      priceMax: {
-        type: Sequelize.INTEGER,
-        allowNull: false,
-        defaultValue: 0
-      },
-      gardenSizeMin: Sequelize.INTEGER,
-      gardenSizeMax: Sequelize.INTEGER,
-      subscribed: {
-        type: Sequelize.BOOLEAN,
-        allowNull: false,
-        defaultValue: false
-      },
-      createdAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      },
-      updatedAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      }
-    };
-    return queryInterface.createTable("SearchRequests", tableFields);
-  },
-
-  down: queryInterface => {
-    return queryInterface.dropTable("SearchRequests", {});
-  }
-};

app/migrations/20190912215556-add-searchRequestMatches-table.js

@@ -1,53 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    const tableFields = {
-      id: {
-        type: Sequelize.BIGINT,
-        autoIncrement: true,
-        allowNull: false
-      },
-      searchRequestId: {
-        type: Sequelize.UUID,
-        allowNull: false,
-        primaryKey: true,
-        references: {
-          model: "SearchRequests",
-          key: "id"
-        },
-        onUpdate: "CASCADE",
-        onDelete: "SET NULL"
-      },
-      realEstateId: {
-        type: Sequelize.BIGINT,
-        allowNull: false,
-        primaryKey: true,
-        references: {
-          model: "RealEstates",
-          key: "id"
-        },
-        onUpdate: "CASCADE",
-        onDelete: "SET NULL"
-      },
-      notified: {
-        type: Sequelize.BOOLEAN,
-        allowNull: false,
-        defaultValue: false
-      },
-      createdAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      },
-      updatedAt: {
-        type: Sequelize.DATE,
-        defaultValue: Sequelize.literal("NOW()")
-      }
-    };
-    return queryInterface.createTable("SearchRequestMatches", tableFields);
-  },
-
-  down: queryInterface => {
-    return queryInterface.dropTable("SearchRequestMatches", {});
-  }
-};

app/migrations/20190916160603-add-title-column-to-realEstates.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstates", "title", {
-      type: Sequelize.STRING
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstates", "title");
-  }
-};

app/migrations/20190916230229-add-description-columns-to-realEstates.js

@@ -1,21 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.addColumn("RealEstates", "shortDescription", {
-        type: Sequelize.STRING
-      }),
-      queryInterface.addColumn("RealEstates", "longDescription", {
-        type: Sequelize.STRING
-      })
-    ]);
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.removeColumn("RealEstates", "shortDescription"),
-      queryInterface.removeColumn("RealEstates", "longDescription")
-    ]);
-  }
-};

app/migrations/20190916231241-add-status-column-to-realEstates.js

@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstates", "adStatus", {
-      type: Sequelize.INTEGER
-    });
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstates", "adStatus");
-  }
-};

app/migrations/20190917090318-add-composite-key-to-realEstates.js

@@ -1,21 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.addConstraint(
-      "RealEstates",
-      ["originAgencyName", "agencyObjectId"],
-      {
-        type: "unique",
-        name: "agencyNameObjectIdUniqueKey"
-      }
-    );
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.removeConstraint(
-      "RealEstates",
-      "agencyNameObjectIdUniqueKey"
-    );
-  }
-};

app/migrations/20190917101052-remove-lastTimeCrawled-column-from-realEstates.js

@@ -1,14 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.removeColumn("RealEstates", "lastTimeCrawled");
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.addColumn("RealEstates", "lastTimeCrawled", {
-      type: Sequelize.DATE,
-      notNull: true
-    });
-  }
-};

app/migrations/20190917102437-remove-deleted-sold-columns-from-realEstates.js

@@ -1,23 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.removeColumn("RealEstates", "deleted"),
-      queryInterface.removeColumn("RealEstates", "sold")
-    ]);
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.addColumn("RealEstates", "deleted", {
-        type: Sequelize.BOOLEAN,
-        notNull: true
-      }),
-      queryInterface.addColumn("RealEstates", "sold", {
-        type: Sequelize.BOOLEAN,
-        notNull: true
-      })
-    ]);
-  }
-};

app/migrations/20190917115804-change-title-short-long-description-columns-in-realEstates.js

@@ -1,21 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.changeColumn("RealEstates", "shortDescription", {
-        type: Sequelize.TEXT
-      }),
-      queryInterface.changeColumn("RealEstates", "longDescription", {
-        type: Sequelize.TEXT
-      }),
-      queryInterface.changeColumn("RealEstates", "title", {
-        type: Sequelize.TEXT
-      })
-    ]);
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return Promise.all([]);
-  }
-};

app/migrations/20190923185802-add-published-renewed-dates-to-realEstates.js

@@ -1,21 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.addColumn("RealEstates", "publishedDate", {
-        type: Sequelize.DATE
-      }),
-      queryInterface.addColumn("RealEstates", "renewedDate", {
-        type: Sequelize.DATE
-      })
-    ]);
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.removeColumn("RealEstates", "renewedDate"),
-      queryInterface.removeColumn("RealEstates", "publishedDate")
-    ]);
-  }
-};

app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js

@@ -1,15 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.query(
-      `UPDATE "SearchRequests" SET "adType" = 'SALE' WHERE "adType" = 'sell';`
-    );
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return queryInterface.sequelize.query(
-      `UPDATE "SearchRequests" SET "adType" = 'sell' WHERE "adType" = 'SALE';`
-    );
-  }
-};

app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js

@@ -1,31 +0,0 @@
-"use strict";
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'HOUSE' WHERE "realEstateType" = 'kuca';`
-      ),
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'FLAT' WHERE "realEstateType" = 'stan';`
-      ),
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'COTTAGE' WHERE "realEstateType" = 'vikendica';`
-      )
-    ]);
-  },
-
-  down: (queryInterface, Sequelize) => {
-    return Promise.all([
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'kuca' WHERE "realEstateType" = 'HOUSE';`
-      ),
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'stan' WHERE "realEstateType" = 'FLAT';`
-      ),
-      queryInterface.sequelize.query(
-        `UPDATE "SearchRequests" SET "realEstateType" = 'vikendica' WHERE "realEstateType" = 'COTTAGE';`
-      )
-    ]);
-  }
-};

app/models/index.js

@@ -1,39 +1,27 @@
-"use strict";
+'use strict';
 
-const fs = require("fs");
+const fs = require('fs');
-const path = require("path");
+const path = require('path');
-const Sequelize = require("sequelize");
+const Sequelize = require('sequelize');
 const basename = path.basename(__filename);
-const env = process.env.NODE_ENV || "development";
+const env = process.env.NODE_ENV || 'development';
-const config = require(__dirname + "/../config/config.json")[env];
+const config = require(__dirname + '/../config/config.json')[env];
 const db = {};
 
-config.username = process.env.DB_USERNAME || config.username;
-config.password = process.env.DB_PASSWORD || config.password;
-config.database = process.env.DB_NAME || config.database;
-config.port = process.env.DB_PORT || config.port;
-config.logging = parseInt(process.env.SEQUELIZE_LOGGING) ? console.log : false;
-
 let sequelize;
 if (config.use_env_variable) {
   sequelize = new Sequelize(process.env[config.use_env_variable], config);
 } else {
-  sequelize = new Sequelize(
+  sequelize = new Sequelize(config.database, config.username, config.password, config);
-    config.database,
-    config.username,
-    config.password,
-    config
-  );
 }
 
-fs.readdirSync(__dirname)
+fs
+  .readdirSync(__dirname)
   .filter(file => {
-    return (
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
-      file.indexOf(".") !== 0 && file !== basename && file.slice(-3) === ".js"
-    );
   })
   .forEach(file => {
-    const model = sequelize["import"](path.join(__dirname, file));
+    const model = sequelize['import'](path.join(__dirname, file));
     db[model.name] = model;
   });
 

app/models/marketalert.js

@@ -0,0 +1,27 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const MarketAlert = sequelize.define('MarketAlert', {
+    url: DataTypes.STRING,
+    realestateOrigin: DataTypes.STRING,
+    originId: DataTypes.STRING,
+    lastDate: DataTypes.STRING,
+    size : DataTypes.INTEGER,
+    gardenSize : DataTypes.INTEGER,
+    price : DataTypes.INTEGER,
+    municipality : DataTypes.STRING,
+    region : DataTypes.STRING,
+    realEstateType : DataTypes.STRING,
+    notified : DataTypes.BOOLEAN,
+    title : DataTypes.STRING,
+    request: DataTypes.STRING,
+    
+    email: { 
+      type: DataTypes.STRING,
+      allowNul: false
+    }
+  }, {});
+  MarketAlert.associate = function(models) {
+    // associations can be defined here
+  };
+  return MarketAlert;
+};

app/models/realEstate.js

@@ -1,55 +0,0 @@
-"use strict";
-
-module.exports = (sequelize, DataTypes) => {
-  const RealEstate = sequelize.define("RealEstate", {
-    id: {
-      type: DataTypes.BIGINT,
-      autoIncrement: true,
-      allowNull: false,
-      primaryKey: true
-    },
-    url: {
-      type: DataTypes.TEXT,
-      allowNull: false
-    },
-    originAgencyName: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      unique: true
-    },
-    agencyObjectId: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      unique: true
-    },
-    realEstateType: {
-      type: DataTypes.TEXT,
-      allowNull: false
-    },
-    adType: {
-      type: DataTypes.TEXT,
-      allowNull: false
-    },
-    price: DataTypes.REAL,
-    area: DataTypes.REAL,
-    gardenSize: DataTypes.REAL,
-    streetNumber: DataTypes.INTEGER,
-    streetName: DataTypes.TEXT,
-    locality: DataTypes.TEXT,
-    municipality: DataTypes.TEXT,
-    city: DataTypes.TEXT,
-    region: DataTypes.TEXT,
-    entity: DataTypes.TEXT,
-    country: DataTypes.TEXT,
-    locationLat: DataTypes.REAL,
-    locationLong: DataTypes.REAL,
-    title: DataTypes.TEXT,
-    shortDescription: DataTypes.TEXT,
-    longDescription: DataTypes.TEXT,
-    adStatus: DataTypes.INTEGER,
-    publishedDate: DataTypes.DATE,
-    renewedDate: DataTypes.DATE
-  });
-
-  return RealEstate;
-};

app/models/realestaterequest.js

@@ -0,0 +1,28 @@
+'use strict';
+
+module.exports = (sequelize, DataTypes) => {
+
+  const RealEstateRequest = sequelize.define('RealEstateRequest', {
+    uniqueId: {
+      type: DataTypes.UUID,
+      defaultValue: DataTypes.UUIDV4,
+      allowNull: false
+    },
+    realEstateType: DataTypes.STRING,
+    email: DataTypes.STRING,
+    region: DataTypes.STRING,
+    municipality: DataTypes.STRING,
+    sizeMin: DataTypes.INTEGER,
+    sizeMax: DataTypes.INTEGER,
+    gardenSizeMin: DataTypes.INTEGER,
+    gardenSizeMax: DataTypes.INTEGER,
+    priceMin: DataTypes.INTEGER,
+    priceMax: DataTypes.INTEGER,
+    bounding_box: DataTypes.GEOMETRY('POINT', 4326),
+    subscribed: DataTypes.BOOLEAN
+  }, {});
+  RealEstateRequest.associate = function(models) {
+    // associations can be defined here
+  };
+  return RealEstateRequest;
+};

app/models/searchRequest.js

@@ -1,68 +0,0 @@
-"use strict";
-
-const { AD_TYPE } = require("../common/enums");
-
-module.exports = (sequelize, DataTypes) => {
-  const SearchRequest = sequelize.define("SearchRequest", {
-    id: {
-      type: DataTypes.UUID,
-      defaultValue: DataTypes.UUIDV4,
-      allowNull: false,
-      primaryKey: true
-    },
-    areaToSearch: {
-      type: DataTypes.GEOMETRY("POLYGON", 4326),
-      allowNull: false,
-      defaultValue: {
-        type: "Polygon",
-        coordinates: [[[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]],
-        crs: { type: "name", properties: { name: "EPSG:4326" } }
-      }
-    },
-    realEstateType: {
-      type: DataTypes.TEXT,
-      allowNull: false
-    },
-    adType: {
-      type: DataTypes.TEXT,
-      allowNull: false,
-      defaultValue: AD_TYPE.AD_TYPE_SALE.stringId
-    },
-    email: DataTypes.TEXT,
-    locality: DataTypes.TEXT,
-    municipality: DataTypes.TEXT,
-    city: DataTypes.TEXT,
-    region: DataTypes.TEXT,
-    entity: DataTypes.TEXT,
-    country: DataTypes.TEXT,
-    sizeMin: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0
-    },
-    sizeMax: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0
-    },
-    priceMin: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0
-    },
-    priceMax: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      defaultValue: 0
-    },
-    gardenSizeMin: DataTypes.INTEGER,
-    gardenSizeMax: DataTypes.INTEGER,
-    subscribed: {
-      type: DataTypes.BOOLEAN,
-      defaultValue: false,
-      allowNull: false
-    }
-  });
-
-  return SearchRequest;
-};

app/models/searchRequestMatch.js

@@ -1,54 +0,0 @@
-"use strict";
-
-module.exports = (sequelize, DataTypes) => {
-  const SearchRequestMatch = sequelize.define(
-    "SearchRequestMatch",
-    {
-      id: {
-        type: DataTypes.BIGINT,
-        autoIncrement: true,
-        allowNull: false
-      },
-      realEstateId: {
-        type: DataTypes.BIGINT,
-        allowNull: false,
-        primaryKey: true,
-        references: {
-          model: "RealEstate",
-          key: "id"
-        },
-        onUpdate: "CASCADE",
-        onDelete: "SET NULL"
-      },
-      searchRequestId: {
-        type: DataTypes.UUID,
-        allowNull: false,
-        primaryKey: true,
-        references: {
-          model: "SearchRequest",
-          key: "id"
-        }
-      },
-      notified: {
-        type: DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false
-      }
-    },
-    {
-      name: {
-        singular: "searchRequestMatch",
-        plural: "searchRequestMatches"
-      }
-    }
-  );
-
-  SearchRequestMatch.associate = models => {
-    SearchRequestMatch.hasMany(models.RealEstate, {
-      foreignKey: "id",
-      as: "realEstates"
-    });
-  };
-
-  return SearchRequestMatch;
-};

app/oldModels/marketalert.js

@@ -1,32 +0,0 @@
-"use strict";
-module.exports = (sequelize, DataTypes) => {
-  const MarketAlert = sequelize.define(
-    "MarketAlert",
-    {
-      url: DataTypes.STRING,
-      realestateOrigin: DataTypes.STRING,
-      originId: DataTypes.STRING,
-      lastDate: DataTypes.STRING,
-      size: DataTypes.INTEGER,
-      gardenSize: DataTypes.INTEGER,
-      price: DataTypes.INTEGER,
-      municipality: DataTypes.STRING,
-      region: DataTypes.STRING,
-      realEstateType: DataTypes.STRING,
-      notified: DataTypes.BOOLEAN,
-      title: DataTypes.STRING,
-      request: DataTypes.STRING,
-      hasLocation: DataTypes.BOOLEAN,
-
-      email: {
-        type: DataTypes.STRING,
-        allowNul: false
-      }
-    },
-    {}
-  );
-  MarketAlert.associate = function(models) {
-    // associations can be defined here
-  };
-  return MarketAlert;
-};

app/oldModels/realestaterequest.js

@@ -1,32 +0,0 @@
-"use strict";
-
-module.exports = (sequelize, DataTypes) => {
-  const RealEstateRequest = sequelize.define(
-    "RealEstateRequest",
-    {
-      uniqueId: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
-        allowNull: false
-      },
-      realEstateType: DataTypes.STRING,
-      email: DataTypes.STRING,
-      region: DataTypes.STRING,
-      municipality: DataTypes.STRING,
-      sizeMin: DataTypes.INTEGER,
-      sizeMax: DataTypes.INTEGER,
-      gardenSizeMin: DataTypes.INTEGER,
-      gardenSizeMax: DataTypes.INTEGER,
-      priceMin: DataTypes.INTEGER,
-      priceMax: DataTypes.INTEGER,
-      boundingBox: DataTypes.GEOMETRY("POINT", 4326),
-      subscribed: DataTypes.BOOLEAN,
-      locationInput: DataTypes.STRING
-    },
-    {}
-  );
-  RealEstateRequest.associate = function(models) {
-    // associations can be defined here
-  };
-  return RealEstateRequest;
-};

app/public/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>