Add ssl to sequelize

Improve olx scrapper

See merge request saburly/marketalarm/web!113

.gitignore

@@ -1,3 +1,5 @@
 node_modules/
 .env
 .idea/
+.eslintrc
+.vscode/

.prettierignore

@@ -0,0 +1 @@
+*.ejs

Dockerfile

@@ -3,6 +3,7 @@ FROM postgres:11.3
 ENV POSTGIS_MAJOR 2.4
 
 RUN apt-get update \
+      && apt-get --assume-yes install postgresql-11-postgis-2.5-scripts\
       && apt-get --assume-yes install software-properties-common postgis\
       && rm -rf /var/lib/apt/lists/
 

README.md

@@ -4,6 +4,8 @@ The purpose of this project is to build a web application that enables subscribi
 
 ## Setup
 
+* Before setup please confirm that Docker is installed `docker --version`. If not install it from official site. 
+
 ### Setup with npm commands
 
 1. Install packages  
@@ -24,7 +26,7 @@ this will create and run postgres image and then execute migrations
 `docker build -t marketalerts .`
 
 2. Run postgres image with  
-`docker run --name pg_marketalerts -d -p 5432:5432 marketalerts`
+`docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts`
 
 3. Install packages  
 `npm install`
@@ -41,3 +43,4 @@ this will create and run postgres image and then execute migrations
     - AWS SES credentials are handled with env vratiables
     - Notification emails are sent in batches of 50, by using SES templates
     - Make sure that you are using different templates for different envirorments
+

app/common/enums.js

@@ -7,7 +7,42 @@ const PRICE_SLIDER_OPTIONS_SALE = {
   step: 1000,
   connect: true
 };
-
+const FLAT_PRICE_SLIDER_OPTIONS_SALE = {
+  start: [50000, 150000],
+  range: {
+    min: [0],
+    max: [800000]
+  },
+  step: 5000,
+  connect: true
+};
+const HOUSE_PRICE_SLIDER_OPTIONS_SALE = {
+  start: [50000, 150000],
+  range: {
+    min: [0],
+    max: [1500000]
+  },
+  step: 10000,
+  connect: true
+};
+const OFFICE_PRICE_SLIDER_OPTIONS_SALE = {
+  start: [15000, 50000],
+  range: {
+    min: [0],
+    max: [2000000]
+  },
+  step: 2000,
+  connect: true
+};
+const LAND_PRICE_SLIDER_OPTIONS_SALE = {
+  start: [40000, 80000],
+  range: {
+    min: [0],
+    max: [2000000]
+  },
+  step: 10000,
+  connect: true
+};
 const PRICE_SLIDER_OPTIONS_RENT = {
   start: [300, 500],
   range: {
@@ -17,18 +52,62 @@ const PRICE_SLIDER_OPTIONS_RENT = {
   step: 50,
   connect: true
 };
-
+const FLAT_PRICE_SLIDER_OPTIONS_RENT = {
+  start: [300, 600],
+  range: {
+    min: [0],
+    max: [4000]
+  },
+  step: 100,
+  connect: true
+};
+const HOUSE_PRICE_SLIDER_OPTIONS_RENT = {
+  start: [500, 1000],
+  range: {
+    min: [0],
+    max: [10000]
+  },
+  step: 100,
+  connect: true
+};
+const OFFICE_PRICE_SLIDER_OPTIONS_RENT = {
+  start: [200, 1000],
+  range: {
+    min: [0],
+    max: [20000]
+  },
+  step: 100,
+  connect: true
+};
+const LAND_PRICE_SLIDER_OPTIONS_RENT = {
+  start: [500, 1000],
+  range: {
+    min: [0],
+    max: [20000]
+  },
+  step: 100,
+  connect: true
+};
 //This will be used for Flats, Apartments, Houses
 const HOME_SIZE_SLIDER_OPTIONS = {
   start: [30, 75],
   range: {
     min: [0],
-    max: [400]
+    max: [500]
   },
   step: 5,
   connect: true
 };
 
+const OFFICE_SIZE_SLIDER_OPTIONS = {
+  start: [30, 150],
+  range: {
+    min: [0],
+    max: [1200]
+  },
+  step: 10,
+  connect: true
+};
 const GARDEN_SIZE_SLIDER_OPTIONS = {
   start: [100, 1000],
   range: {
@@ -58,13 +137,23 @@ const GARAGE_SIZE_SLIDER_OPTIONS = {
   connect: true
 };
 
-const GARAGE_PRICE_SLIDER_OPTIONS = {
+const GARAGE_PRICE_SLIDER_OPTIONS_SALE = {
   start: [2000, 10000],
   range: {
     min: [0],
-    max: [100000]
+    max: [60000]
   },
-  step: 500,
+  step: 200,
+  connect: true
+};
+
+const GARAGE_PRICE_SLIDER_OPTIONS_RENT = {
+  start: [50, 150],
+  range: {
+    min: [0],
+    max: [1000]
+  },
+  step: 10,
   connect: true
 };
 
@@ -72,12 +161,12 @@ const AD_TYPE = {
   AD_TYPE_SALE: {
     id: 1,
     stringId: "SALE",
-    title: "Prodaja"
+    title: "Kupi"
   },
   AD_TYPE_RENT: {
     id: 2,
     stringId: "RENT",
-    title: "Najam"
+    title: "Unajmi"
   },
   AD_TYPE_REQUEST: {
     id: 3,
@@ -94,16 +183,30 @@ const AD_CATEGORY = {
     id: "FLAT",
     title: "Stan",
     hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
+    priceSliderOptionsSale: FLAT_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: FLAT_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,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: false,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: true,
+    hasFloorProp: false,
+    priceSliderOptionsSale: HOUSE_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: HOUSE_PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
     gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
   },
@@ -111,40 +214,75 @@ const AD_CATEGORY = {
     id: "OFFICE",
     title: "Kancelarija",
     hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
-    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
+    priceSliderOptionsSale: OFFICE_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: OFFICE_PRICE_SLIDER_OPTIONS_RENT,
+    sizeSliderOptions: OFFICE_SIZE_SLIDER_OPTIONS
   },
   LAND: {
     id: "LAND",
     title: "Zemljište",
     hasGardenSize: false,
-    priceSliderOptionsSale: PRICE_SLIDER_OPTIONS_SALE,
-    priceSliderOptionsRent: PRICE_SLIDER_OPTIONS_RENT,
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: false,
+    hasElevatorProp: false,
+    hasNumberOfRoom: false,
+    hasNumberOfFloors: false,
+    hasFloorProp: false,
+    priceSliderOptionsSale: LAND_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: LAND_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,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: true,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: false,
+    hasFloorProp: true,
+    priceSliderOptionsSale: FLAT_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: FLAT_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,
+    hasAccesRoadType: true,
+    hasBalconyProp: false,
+    hasNewBuildingProp: false,
+    hasElevatorProp: false,
+    hasNumberOfRoom: false,
+    hasNumberOfFloors: false,
+    hasFloorProp: false,
+    priceSliderOptionsSale: GARAGE_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: GARAGE_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,
+    hasAccesRoadType: true,
+    hasBalconyProp: true,
+    hasNewBuildingProp: true,
+    hasElevatorProp: false,
+    hasNumberOfRoom: true,
+    hasNumberOfFloors: true,
+    hasFloorProp: false,
+    priceSliderOptionsSale: HOUSE_PRICE_SLIDER_OPTIONS_SALE,
+    priceSliderOptionsRent: HOUSE_PRICE_SLIDER_OPTIONS_RENT,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
     gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
   }
@@ -156,14 +294,17 @@ const AD_STATUS = {
   STATUS_SOLD: 3,
   STATUS_DELETED: 4,
   STATUS_URGENT: 5,
-  STATUS_DISCOUNTED: 6
+  STATUS_DISCOUNTED: 6,
+  STATUS_RENTED: 7,
+  STATUS_VIP: 8
 };
 
 const AD_AGENCY = {
   OLX: "OLX",
   RENTAL: "RENTAL",
   PROSTOR: "PROSTOR",
-  AKTIDO: "AKTIDO"
+  AKTIDO: "AKTIDO",
+  SALJIC: "SALJIC"
 };
 
 const CRAWLER_AD_TYPE = {
@@ -187,11 +328,95 @@ const EMAIL_FREQUENCY = {
   }
 };
 
+const HEATING_TYPE = {
+  ANY: {
+    id: "ANY",
+    title: "Svi"
+  },
+  NO_HEATING: {
+    id: "NO_HEATING",
+    title: "Nije uvedeno"
+  },
+  ELECTRICITY: {
+    id: "ELECTRICITY",
+    title: "Struja"
+  },
+  GAS: {
+    id: "GAS",
+    title: "Plin"
+  },
+  WOOD: {
+    id: "WOOD",
+    title: "Drva"
+  },
+  CENTRAL_CITY: {
+    id: "CENTRAL_CITY",
+    title: "Centralno (gradsko)"
+  },
+  CENTRAL_BOILER: {
+    id: "CENTRAL_BOILER",
+    title: "Centralno (kotlovnica)"
+  },
+  CENTRAL_GAS: {
+    id: "CENTRAL_GAS",
+    title: "Centralno (plin)"
+  },
+  HEAT_PUMP: {
+    id: "HEAT_PUMP",
+    title: "Toplotna pumpa"
+  },
+  OTHER: {
+    id: "OTHER",
+    title: "Drugo"
+  }
+};
+
+const ACCESS_ROAD_TYPE = {
+  ANY: {
+    id: "ANY",
+    title: "Svi"
+  },
+  ASPHALT: {
+    id: "ASPHALT",
+    title: "Asfalt"
+  },
+  CONCRETE: {
+    id: "CONCRETE",
+    title: "Beton"
+  },
+  MACADAM: {
+    id: "MACADAM",
+    title: "Makadam"
+  },
+  OTHER: {
+    id: "OTHER",
+    title: "Drugo"
+  }
+};
+
+const FURNISHING_TYPE = {
+  NOT_FURNISHED: {
+    id: "NOT_FURNISHED",
+    title: "Nenamješten"
+  },
+  HALF_FURNISHED: {
+    id: "HALF_FURNISHED",
+    title: "Polunamješten"
+  },
+  FURNISHED: {
+    id: "FURNISHED",
+    title: "Namješten"
+  }
+};
+
 module.exports = {
   AD_TYPE,
   AD_CATEGORY,
   AD_STATUS,
   AD_AGENCY,
   CRAWLER_AD_TYPE,
-  EMAIL_FREQUENCY
+  EMAIL_FREQUENCY,
+  HEATING_TYPE,
+  ACCESS_ROAD_TYPE,
+  FURNISHING_TYPE
 };

app/common/filterEnums.js

@@ -0,0 +1,110 @@
+const { AD_CATEGORY, ACCESS_ROAD_TYPE, HEATING_TYPE } = require("./enums");
+
+const ADVANCED_BOOLEAN_FILTERS = [
+  {
+    dbField: "balcony",
+    title: "Balkon",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE
+    ]
+  },
+  {
+    dbField: "elevator",
+    title: "Lift",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.OFFICE
+    ]
+  },
+  {
+    dbField: "newBuilding",
+    title: "Novogradnja",
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE
+    ]
+  }
+];
+
+const ADVANCED_SEGMENT_SELECT_FILTERS = [
+  {
+    dbField: "accessRoadType",
+    title: "Pristupni put",
+    values: Object.keys(ACCESS_ROAD_TYPE).map(key => ACCESS_ROAD_TYPE[key]),
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE,
+      AD_CATEGORY.LAND,
+      AD_CATEGORY.GARAGE
+    ]
+  }
+  // {
+  //   dbField: "heatingType",
+  //   title: "Vrsta grijanja",
+  //   values: Object.keys(HEATING_TYPE).map(key => HEATING_TYPE[key]),
+  //   categoriesToShow: [
+  //     AD_CATEGORY.FLAT,
+  //     AD_CATEGORY.HOUSE,
+  //     AD_CATEGORY.APARTMENT,
+  //     AD_CATEGORY.COTTAGE,
+  //     AD_CATEGORY.OFFICE
+  //   ]
+  // }
+];
+
+const ADVANCED_RANGE_FILTERS = [
+  {
+    id: "numberOfFloors",
+    title: "Broj spratova",
+    dbFieldMin: "numberOfFloorsMin",
+    dbFieldMax: "numberOfFloorsMax",
+    validValueMin: -1,
+    validValueMax: 50,
+    categoriesToShow: [AD_CATEGORY.HOUSE, AD_CATEGORY.COTTAGE]
+  },
+  {
+    id: "floor",
+    title: "Sprat",
+    dbFieldMin: "floorMin",
+    dbFieldMax: "floorMax",
+    validValueMin: -10,
+    validValueMax: 50,
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.OFFICE
+    ]
+  },
+  {
+    id: "numberOfRooms",
+    title: "Broj soba",
+    dbFieldMin: "numberOfRoomsMin",
+    dbFieldMax: "numberOfRoomsMax",
+    decimalPlaces: 1,
+    validValueMin: 0,
+    validValueMax: 200,
+    categoriesToShow: [
+      AD_CATEGORY.FLAT,
+      AD_CATEGORY.HOUSE,
+      AD_CATEGORY.APARTMENT,
+      AD_CATEGORY.COTTAGE,
+      AD_CATEGORY.OFFICE
+    ]
+  }
+];
+
+module.exports = {
+  ADVANCED_BOOLEAN_FILTERS,
+  ADVANCED_SEGMENT_SELECT_FILTERS,
+  ADVANCED_RANGE_FILTERS
+};

app/config/appConfig.js

@@ -9,11 +9,15 @@ const APP_URL =
     ? process.env.APP_URL || "http://market-alarm"
     : process.env.APP_URL || `${APP_BASE_URL}:${APP_PORT}`;
 
+const STAGING = process.env.ENVIRONMENT !== "production";
+
 const DEFAULT_TIMEZONE = "Europe/Sarajevo";
 
 const CRAWLER_INTERVAL = parseInt(process.env.CRAWLER_INTERVAL) || 60;
 const STOP_CRAWLER = !!parseInt(process.env.STOP_CRAWLER);
 
+const CHECK_UP_DAYS = parseInt(process.env.CHECK_UP_DAYS) || 10;
+
 const AWS_EMAIL_CONFIG = {
   REGION: process.env.AWS_REGION || "",
   CREDENTIALS: {
@@ -30,6 +34,22 @@ const MAX_REAL_ESTATES_IN_FIRST_EMAIL =
 
 const PRINT_CRAWLER_DEBUG = process.env.PRINT_CRAWLER_DEBUG_INFO || 0;
 
+const API_MAP_KEY = process.env.API_MAP_KEY || "";
+
+const PROSTOR_LOGIN = {
+  EMAIL: process.env.PROSTOR_LOGIN_EMAIL,
+  PASSWORD: process.env.PROSTOR_LOGIN_PASS
+};
+
+const USER_AGENT =
+  process.env.USER_AGENT ||
+  "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36";
+
+const USE_SCRAPER_API = process.env.USE_SCRAPER_API === undefined ? 1 : parseInt(process.env.USE_SCRAPER_API);
+const SCRAPER_API_KEY = process.env.SCRAPER_API_KEY || "";
+const SCRAPER_API_BASE_URL = process.env.SCRAPER_API_BASE_URL || "";
+const NODE_FETCH_TIMEOUT_MS = parseInt(process.env.NODE_FETCH_TIMEOUT_MS) || 60000
+
 module.exports = {
   APP_PORT,
   APP_URL,
@@ -39,5 +59,14 @@ module.exports = {
   AWS_EMAIL_CONFIG,
   MAX_REAL_ESTATES_IN_EMAIL,
   MAX_REAL_ESTATES_IN_FIRST_EMAIL,
-  PRINT_CRAWLER_DEBUG
+  PRINT_CRAWLER_DEBUG,
+  API_MAP_KEY,
+  STAGING,
+  CHECK_UP_DAYS,
+  PROSTOR_LOGIN,
+  USER_AGENT,
+  USE_SCRAPER_API,
+  SCRAPER_API_KEY,
+  SCRAPER_API_BASE_URL,
+  NODE_FETCH_TIMEOUT_MS
 };

app/controllers/location.js

@@ -4,9 +4,37 @@ const getLocation = async (req, res) => {
   const title = "Odaberite lokaciju";
   const nextStep = req.query.nextStep || "/";
 
+  //Check if location data already exists (active request)
+  //If it does then  get location is called through edit field query
+  //and map should show already selected location not initial map
+  let selectedLatLngBounds = {};
+  let boundsSelected = false;
+
+  const searchRequest = await currentSearchRequest(req);
+
+  if (!searchRequest || !searchRequest.dataValues) {
+    res.render("notFound", { title: " " });
+    return;
+  }
+  const selectedArea = searchRequest.areaToSearch;
+  const sw = selectedArea.coordinates[0][3];
+  const ne = selectedArea.coordinates[0][1];
+
+  if (sw[0] && ne[0]) {
+    selectedLatLngBounds = {
+      swLat: sw[1],
+      swLng: sw[0],
+      neLat: ne[1],
+      neLng: ne[0]
+    };
+    boundsSelected = true;
+  }
+
   res.render("location", {
     nextStep,
-    title
+    title,
+    boundsSelected,
+    selectedLatLngBounds
   });
 };
 

app/controllers/realEstateFilters.js

@@ -1,5 +1,10 @@
 const { currentSearchRequest } = require("../helpers/url");
-const { AD_CATEGORY, AD_TYPE } = require("../common/enums");
+const { AD_CATEGORY, AD_TYPE, ACCESS_ROAD_TYPE } = require("../common/enums");
+const {
+  ADVANCED_BOOLEAN_FILTERS,
+  ADVANCED_SEGMENT_SELECT_FILTERS,
+  ADVANCED_RANGE_FILTERS
+} = require("../common/filterEnums");
 
 const getFilters = async (req, res) => {
   const searchRequest = await currentSearchRequest(req);
@@ -19,7 +24,19 @@ const getFilters = async (req, res) => {
     sizeMin,
     sizeMax,
     gardenSizeMin,
-    gardenSizeMax
+    gardenSizeMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    floorMin,
+    floorMax,
+    includeIncompleteAds,
+    balcony,
+    elevator,
+    newBuilding,
+    accessRoadType,
+    includeWithoutPrice
   } = searchRequest;
   const category = AD_CATEGORY[realEstateType] || AD_CATEGORY.FLAT;
 
@@ -41,6 +58,40 @@ const getFilters = async (req, res) => {
     return;
   }
 
+  // TODO: Maybe this is slow, pay attention to this
+  const filterFilters = filterObject => {
+    const filterCategories = filterObject.categoriesToShow;
+    return filterCategories.indexOf(category) !== -1;
+  };
+
+  const advancedBooleanFilterObjects = ADVANCED_BOOLEAN_FILTERS.filter(
+    filterFilters
+  );
+  const advancedSegmentSelectFilterObjects = ADVANCED_SEGMENT_SELECT_FILTERS.filter(
+    filterFilters
+  );
+  const advancedRangeFilterObjects = ADVANCED_RANGE_FILTERS.filter(
+    filterFilters
+  );
+
+  const advancedBooleanFilterValues = {
+    includeIncompleteAds,
+    balcony,
+    elevator,
+    newBuilding
+  };
+  const advancedSegmentSelectFilterValues = {
+    accessRoadType
+  };
+  const advancedRangeFilterValues = {
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    floorMin,
+    floorMax
+  };
+
   if (priceMin || priceMax) {
     priceSliderOptions.start = [priceMin, priceMax];
   }
@@ -58,7 +109,15 @@ const getFilters = async (req, res) => {
     hasGardenSize,
     priceSliderOptions: JSON.stringify(priceSliderOptions),
     sizeSliderOptions: JSON.stringify(sizeSliderOptions),
-    gardenSizeSliderOptions: JSON.stringify(gardenSizeSliderOptions)
+    gardenSizeSliderOptions: JSON.stringify(gardenSizeSliderOptions),
+    advancedBooleanFilterObjects,
+    advancedBooleanFilterValues,
+    advancedSegmentSelectFilterObjects,
+    advancedSegmentSelectFilterValues,
+    advancedRangeFilterObjects,
+    advancedRangeFilterValues,
+    includeIncompleteAds,
+    includeWithoutPrice
   });
 };
 
@@ -78,13 +137,93 @@ const postFilters = async (req, res) => {
   const sizeMin = parseInt(req.body.sizeMin) || 0;
   const sizeMax = parseInt(req.body.sizeMax) || 0;
 
-  //TODO: Filter validation
+  const advancedRangeFilters = {};
 
+  ADVANCED_RANGE_FILTERS.forEach(filter => {
+    let parsingFunction = parseInt;
+    if (filter.decimalPlaces) {
+      parsingFunction = parseFloat;
+    }
+
+    advancedRangeFilters[filter.dbFieldMin] = parsingFunction(
+      req.body[filter.dbFieldMin]
+    );
+    advancedRangeFilters[filter.dbFieldMax] = parsingFunction(
+      req.body[filter.dbFieldMax]
+    );
+
+    advancedRangeFilters[filter.dbFieldMin] = isNaN(
+      advancedRangeFilters[filter.dbFieldMin]
+    )
+      ? null
+      : advancedRangeFilters[filter.dbFieldMin];
+    advancedRangeFilters[filter.dbFieldMax] = isNaN(
+      advancedRangeFilters[filter.dbFieldMax]
+    )
+      ? null
+      : advancedRangeFilters[filter.dbFieldMax];
+
+    try {
+      if (filter.decimalPlaces) {
+        advancedRangeFilters[filter.dbFieldMin] = advancedRangeFilters[
+          filter.dbFieldMin
+        ].toFixed(filter.decimalPlaces);
+        advancedRangeFilters[filter.dbFieldMax] = advancedRangeFilters[
+          filter.dbFieldMax
+        ].toFixed(filter.decimalPlaces);
+      }
+    } catch (e) {
+      advancedRangeFilters[filter.dbFieldMin] = null;
+      advancedRangeFilters[filter.dbFieldMax] = null;
+    }
+
+    if (
+      advancedRangeFilters[filter.dbFieldMin] < filter.validValueMin ||
+      advancedRangeFilters[filter.dbFieldMin] > filter.validValueMax
+    ) {
+      advancedRangeFilters[filter.dbFieldMin] = filter.validValueMin;
+    }
+
+    if (
+      advancedRangeFilters[filter.dbFieldMax] < filter.validValueMin ||
+      advancedRangeFilters[filter.dbFieldMax] > filter.validValueMax
+    ) {
+      advancedRangeFilters[filter.dbFieldMax] = filter.validValueMax;
+    }
+  });
+
+  const includeIncompleteAds = req.body.includeIncompleteAds === "on";
+  const includeWithoutPrice = req.body.includeWithoutPrice === "on";
+
+  const balcony = req.body.balcony === "on";
+  const elevator = req.body.elevator === "on";
+  const newBuilding = req.body.newBuilding === "on";
+
+  const accessRoadType = req.body.accessRoadType;
+  if (!ACCESS_ROAD_TYPE[accessRoadType]) {
+    res.render("notFound", { title: " Greška !" });
+    return;
+  }
+
+  //TODO: Filter validation
   searchRequest.priceMin = priceMin;
   searchRequest.priceMax = priceMax;
   searchRequest.sizeMin = sizeMin;
   searchRequest.sizeMax = sizeMax;
 
+  for (const filter of Object.keys(advancedRangeFilters)) {
+    searchRequest[filter] = advancedRangeFilters[filter];
+  }
+
+  searchRequest.balcony = balcony;
+  searchRequest.elevator = elevator;
+  searchRequest.newBuilding = newBuilding;
+
+  searchRequest.includeIncompleteAds = includeIncompleteAds;
+  searchRequest.includeWithoutPrice = includeWithoutPrice;
+
+  searchRequest.accessRoadType = accessRoadType;
+
   if (
     req.body.gardenSizeMin !== undefined &&
     req.body.gardenSizeMax !== undefined
@@ -97,7 +236,6 @@ const postFilters = async (req, res) => {
     searchRequest.gardenSizeMin = gardenSizeMin;
     searchRequest.gardenSizeMax = gardenSizeMax;
   }
-
   await searchRequest.save();
 
   res.redirect(nextStepUrl);

app/controllers/realEstates.js

@@ -2,13 +2,14 @@
 const {
   findRealEstatesForSearchRequest
 } = require("../helpers/db/searchRequestMatch");
+const { AD_STATUS } = require("../common/enums");
 
 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 });
+  res.render("realEstates", { realEstates, title, AD_STATUS });
 };
 
 module.exports = {

app/controllers/redirect.js

@@ -1,9 +1,11 @@
 const { getRealEstateById } = require("../helpers/db/realEstate");
+const { AD_STATUS } = require("../common/enums");
 
 const getRedirect = async (req, res) => {
   const id = req.params.id || null;
   let error = false;
   let redirectUrl = undefined;
+  let vipAd = undefined;
   if (!id) {
     error = true;
   } else {
@@ -13,6 +15,7 @@ const getRedirect = async (req, res) => {
         error = true;
       } else {
         redirectUrl = realEstate.url;
+        vipAd = realEstate.adStatus === AD_STATUS.STATUS_VIP;
       }
     } catch (e) {
       error = true;
@@ -24,7 +27,7 @@ const getRedirect = async (req, res) => {
     res.render("notFound", { title });
   } else {
     const title = "Preusmjeravanje";
-    res.render("redirect", { title, redirectUrl });
+    res.render("redirect", { title, redirectUrl, vipAd });
   }
 };
 

app/controllers/welcome.js

@@ -1,7 +1,42 @@
+const { createSearchRequest } = require("../helpers/db/searchRequest");
+
+const { AD_TYPE, AD_CATEGORY } = require("../common/enums");
+
 const getWelcome = (req, res) => {
-  res.render("welcome", { nextStep: "/vrstanekretnine", title: false });
+  res.render("welcome", {
+    title: false,
+    AD_TYPE
+  });
+};
+
+const postWelcome = async (req, res) => {
+  const adType = parseInt(req.body.adType);
+
+  const adTypeStringIds = {
+    [AD_TYPE.AD_TYPE_SALE.id]: AD_TYPE.AD_TYPE_SALE.stringId,
+    [AD_TYPE.AD_TYPE_RENT.id]: AD_TYPE.AD_TYPE_RENT.stringId
+  };
+
+  const adTypeStringId =
+    adTypeStringIds[adType] || AD_TYPE.AD_TYPE_SALE.stringId;
+
+  let nextStepUrl = "";
+  try {
+    const newSearchRequest = await createSearchRequest({
+      adType: adTypeStringId,
+      realEstateType: AD_CATEGORY.FLAT.id
+    });
+
+    nextStepUrl = `/vrstanekretnine/${newSearchRequest.id}`;
+  } catch (error) {
+    console.log(error);
+    nextStepUrl = `/`;
+  }
+
+  res.redirect(nextStepUrl);
 };
 
 module.exports = {
-  getWelcome
+  getWelcome,
+  postWelcome
 };

app/crawler/crawl.js

@@ -9,12 +9,15 @@ const OlxCrawler = require("./specificCrawlers/olx");
 const RentalCrawler = require("./specificCrawlers/rental");
 const ProstorCrawler = require("./specificCrawlers/prostor");
 const AktidoCrawler = require("./specificCrawlers/aktido");
+const SaljicCrawler = require("./specificCrawlers/saljic");
+const { logDebug } = require("../helpers/log");
 
 const {
   OLX_CONFIG,
   RENTAL_CONFIG,
   PROSTOR_CONFIG,
-  AKTIDO_CONFIG
+  AKTIDO_CONFIG,
+  SALJIC_CONFIG
 } = require("./crawlerConfig");
 const PostgresSaver = require("./savers/postgres");
 
@@ -57,6 +60,15 @@ async function crawlAll() {
       AKTIDO_CONFIG.AKTIDO_MAX_RESULTS_PER_PAGE,
       AKTIDO_CONFIG.AKTIDO_IGNORED_USERNAMES,
       AKTIDO_CONFIG.AKTIDO_DELAY_BETWEEN_PAGES
+    ),
+    new SaljicCrawler(
+      [postgresSaver],
+      SALJIC_CONFIG.SALJIC_CRAWLER_AD_TYPE,
+      SALJIC_CONFIG.SALJIC_CRAWLER_AD_CATEGORIES,
+      SALJIC_CONFIG.SALJIC_MAX_PAGES,
+      SALJIC_CONFIG.SALJIC_MAX_RESULTS_PER_PAGE,
+      SALJIC_CONFIG.SALJIC_IGNORED_USERNAMES,
+      SALJIC_CONFIG.SALJIC_DELAY_BETWEEN_PAGES
     )
   ];
 
@@ -64,7 +76,9 @@ async function crawlAll() {
 
   for (const crawler of crawlers) {
     try {
+      logDebug('Starting crawler: ', crawler);
       const newRealEstatesFromSingleCrawler = await crawler.crawl();
+      logDebug('Crawler done: ', crawler);
       if (Array.isArray(newRealEstatesFromSingleCrawler)) {
         newRealEstates.push(...newRealEstatesFromSingleCrawler);
       }

app/crawler/crawlerConfig.js

@@ -5,10 +5,12 @@ const OLX_CONFIG = require("./specificConfigs/olx");
 const RENTAL_CONFIG = require("./specificConfigs/rental");
 const PROSTOR_CONFIG = require("./specificConfigs/prostor");
 const AKTIDO_CONFIG = require("./specificConfigs/aktido");
+const SALJIC_CONFIG = require("./specificConfigs/saljic");
 
 module.exports = {
   OLX_CONFIG,
   RENTAL_CONFIG,
   PROSTOR_CONFIG,
-  AKTIDO_CONFIG
+  AKTIDO_CONFIG,
+  SALJIC_CONFIG
 };

app/crawler/savers/postgres.js

@@ -1,6 +1,7 @@
 const moment = require("moment");
 
 const { bulkUpsertRealEstates } = require("../../helpers/db/realEstate");
+const { bulkUpsertPriceHistory } = require("../../helpers/db/priceHistory");
 
 class PostgresSaver {
   connect() {
@@ -11,6 +12,21 @@ class PostgresSaver {
 
   async save(results) {
     const savedRecords = await bulkUpsertRealEstates(results);
+    //Extruding data for price history table
+    const resultPrices = savedRecords.map(realEstate => {
+      //Null values canot be recognized by ignore duplicates in sequalize
+      //Value price = 0 indicates 'cijena na upit'
+      const priceTmp =
+        realEstate.dataValues.price === null ? 0 : realEstate.dataValues.price;
+
+      return {
+        realEstateId: realEstate.dataValues.id,
+        price: priceTmp,
+        createdAt: realEstate.dataValues.createdAt,
+        updatedAt: realEstate.dataValues.updatedAt
+      };
+    });
+    const savedPrices = await bulkUpsertPriceHistory(resultPrices);
 
     if (Array.isArray(savedRecords)) {
       const newRealEstates = [];

app/crawler/specificConfigs/prostor.js

@@ -29,5 +29,6 @@ module.exports = {
   PROSTOR_CRAWLER_AD_CATEGORIES: transformedProstorCrawlerAdCategories,
   PROSTOR_IGNORED_USERNAMES: prostorIgnoredUsernames || [],
   PROSTOR_DELAY_BETWEEN_PAGES:
-    parseInt(process.env.PROSTOR_DELAY_BETWEEN_PAGES) || 1000
+    parseInt(process.env.PROSTOR_DELAY_BETWEEN_PAGES) || 1000,
+  PROSTOR_FORCE_CRAWL: !!parseInt(process.env.PROSTOR_FORCE_CRAWL)
 };

app/crawler/specificConfigs/saljic.js

@@ -0,0 +1,34 @@
+"use strict";
+const { CRAWLER_AD_TYPE, AD_CATEGORY } = require("../../common/enums");
+
+const saljicCrawlerAdType =
+  process.env.SALJIC_CRAWLER_AD_TYPE !== undefined
+    ? CRAWLER_AD_TYPE[process.env.SALJIC_CRAWLER_AD_TYPE]
+    : null;
+
+const saljicParsedCrawlerAdCategories =
+  process.env.SALJIC_CRAWLER_AD_CATEGORIES !== undefined
+    ? process.env.SALJIC_CRAWLER_AD_CATEGORIES.split(",").map(category =>
+        category.trim()
+      )
+    : ["FLAT", "HOUSE"];
+
+const saljicIgnoredUsernames = [];
+
+const transformedSaljicCrawlerAdCategories = saljicParsedCrawlerAdCategories
+  .map(categoryName =>
+    AD_CATEGORY[categoryName] ? AD_CATEGORY[categoryName].id : undefined
+  )
+  .filter(category => !!category);
+
+module.exports = {
+  SALJIC_MAX_PAGES: parseInt(process.env.SALJIC_MAX_PAGES) || 100,
+  SALJIC_MAX_RESULTS_PER_PAGE:
+    parseInt(process.env.SALJIC_MAX_RESULTS_PER_PAGE) || 5000,
+  SALJIC_CRAWLER_AD_TYPE: saljicCrawlerAdType || CRAWLER_AD_TYPE.NONE,
+  SALJIC_CRAWLER_AD_CATEGORIES: transformedSaljicCrawlerAdCategories,
+  SALJIC_IGNORED_USERNAMES: saljicIgnoredUsernames || [],
+  SALJIC_DELAY_BETWEEN_PAGES:
+    parseInt(process.env.SALJIC_DELAY_BETWEEN_PAGES) || 1000,
+  SALJIC_FORCE_CRAWL: !!parseInt(process.env.SALJIC_FORCE_CRAWL)
+};

app/crawler/specificCrawlers/aktido.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const fetch = require("node-fetch");
+const fetch = require("../../helpers/fetchWrapper");
 const cheerio = require("cheerio");
 const Promise = require("bluebird");
 const moment = require("moment-timezone");
@@ -11,7 +11,10 @@ const {
   AD_CATEGORY,
   AD_AGENCY,
   AD_STATUS,
-  CRAWLER_AD_TYPE
+  CRAWLER_AD_TYPE,
+  HEATING_TYPE,
+  ACCESS_ROAD_TYPE,
+  FURNISHING_TYPE
 } = require("../../common/enums");
 
 const {
@@ -156,7 +159,7 @@ class AktidoCrawler {
     }
 
     try {
-      const res = await fetch(url);
+      const res = await fetch(url, {}, false);
       const body = await res.text();
       const $ = cheerio.load(body);
       let hrefs = [];
@@ -199,6 +202,10 @@ class AktidoCrawler {
       const body = await adPageSource.text();
       const $ = cheerio.load(body);
 
+      if (body.indexOf('<html') === -1) {
+        throw { message: 'Failed to fetch page !' }
+      }
+
       const mapElementParent = $(".box-map").parent();
       const scriptElement = $("script", mapElementParent);
       if (
@@ -219,6 +226,7 @@ class AktidoCrawler {
           throw { message: "Can't find ad data JSON" };
         }
 
+        let adStatus = AD_STATUS.STATUS_NORMAL;
         const aktidoId = extractedData["re_realEstates_id"];
         const adCategory = this.getKiviCategoryIdFromAktidoId(
           parseInt(extractedData["re_types_id"])
@@ -237,6 +245,181 @@ class AktidoCrawler {
           };
         }
 
+        const descriptionIds = extractedData["re_descriptions_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(descriptionIds)) {
+          throw {
+            message:
+              'Expected array od descriptions but "re_descriptions_id" not found !'
+          };
+        }
+
+        const spaceIds = extractedData["re_spaces_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(spaceIds)) {
+          throw {
+            message: 'Expected array od spaces but "re_spaces_id" not found !'
+          };
+        }
+
+        const infrastructureIds = extractedData["re_infrastructure_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(infrastructureIds)) {
+          throw {
+            message:
+              'Expected array od infrastructures but "re_infrastructure_id" not found !'
+          };
+        }
+
+        const floorNoIds = extractedData["re_floorNO_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(floorNoIds)) {
+          throw {
+            message:
+              'Expected array od infrastructures but "re_floorNO_id" not found !'
+          };
+        }
+
+        // counting floor enums
+        // for (let i = 1; i < 10; i++) {
+        //   const floorEnumsTitle = $(
+        //     `body > div.container-fluid > div.container > div:nth-child(2) > div.col-xs-12.col-sm-12.col-md-12.col-lg-9.content-main > div:nth-child(1) > div > div > div.col-xs-12.col-sm-4.box-details > div.body > p:nth-child(${i}) > span:nth-child(1)`
+        //   )
+        //     .text()
+        //     .trim();
+        //   if (floorEnumsTitle === "Spratnost:") {
+        //     const floorEnumsValue = $(
+        //       `body > div.container-fluid > div.container > div:nth-child(2) > div.col-xs-12.col-sm-12.col-md-12.col-lg-9.content-main > div:nth-child(1) > div > div > div.col-xs-12.col-sm-4.box-details > div.body > p:nth-child(${i}) > span:nth-child(2)`
+        //     )
+        //       .text()
+        //       .trim()
+        //       .split(",");
+        //
+        //     console.log("==========");
+        //     floorNoIds.forEach((id, index) => {
+        //       console.log("\t", id, " = ", floorEnumsValue[index]);
+        //     });
+        //     break;
+        //   }
+        // }
+
+        // enumerating infrastructure - relation between id and infrastructure title
+        // let found = false;
+        // let infrastructureDescriptions = {};
+        // for (let i = 1; i < 5; i++) {
+        //   found = false;
+        //   for (let j = 1; j < 10; j++) {
+        //     const infrastructureTitle = $(
+        //       `#b2 > div > div:nth-child(${i}) > div > ul > li:nth-child(${j}) > strong`
+        //     )
+        //       .text()
+        //       .trim();
+        //     if (infrastructureTitle === "Osnovna infrastruktura:") {
+        //       found = true;
+        //
+        //       const infrastructureValues = $(
+        //         `#b2 > div > div:nth-child(${i}) > div > ul > li:nth-child(${j}) > div`
+        //       )
+        //         .text()
+        //         .trim()
+        //         .split(",");
+        //
+        //       infrastructureIds.forEach((id, index) => {
+        //         infrastructureDescriptions[id] = infrastructureValues[index];
+        //       });
+        //     }
+        //   }
+        //   if (found) {
+        //     break;
+        //   }
+        // }
+
+        const realEstatePropertiesFromDescriptions = this.getPropertiesFromDescriptions(
+          descriptionIds
+        );
+        const realEstatePropertiesFromSpaces = this.getPropertiesFromSpaces(
+          spaceIds
+        );
+
+        const realEstatePropertiesFromInfrastructure = this.getPropertiesFromInfrastructure(
+          infrastructureIds
+        );
+
+        if (extractedData["adm_realEstates_discount"] === "1") {
+          adStatus = AD_STATUS.STATUS_DISCOUNTED;
+        }
+
+        let numberOfRooms =
+            parseInt(extractedData["re_realEstates_roomsNO"]) +
+              parseInt(extractedData["re_realEstates_bedroomNO"]) || null,
+          numberOfFloors =
+            parseInt(extractedData["re_realEstates_floorsNO"]) ||
+            this.getNumberOfFloorsFromFloorId(extractedData["re_floorNO_id"]),
+          floor =
+            parseInt(extractedData["re_realEstates_floorNO"]) ||
+            this.getFloorNumberFromFloorId(extractedData["re_floorNO_id"]),
+          accessRoadType = realEstatePropertiesFromDescriptions.accessRoadType,
+          heatingType =
+            this.getHeatingTypeId(extractedData["re_heating_id"]) || null,
+          furnishingType = realEstatePropertiesFromDescriptions.furnishingType,
+          balcony =
+            realEstatePropertiesFromDescriptions.balcony ||
+            realEstatePropertiesFromSpaces.balcony,
+          newBuilding = extractedData["op_realEstates_newBuilding"]
+            ? extractedData["op_realEstates_newBuilding"] === "1"
+            : null,
+          elevator = realEstatePropertiesFromDescriptions.elevator,
+          water =
+            realEstatePropertiesFromDescriptions.water ||
+            realEstatePropertiesFromInfrastructure.water,
+          electricity =
+            realEstatePropertiesFromDescriptions.electricity ||
+            realEstatePropertiesFromInfrastructure.electricity,
+          drainageSystem =
+            realEstatePropertiesFromInfrastructure.drainageSystem,
+          registeredInZkBooks =
+            extractedData["op_realEstates_ownerPermit"] === 1 || null,
+          recentlyAdapted = null,
+          parking =
+            realEstatePropertiesFromDescriptions.parking ||
+            realEstatePropertiesFromSpaces.parking,
+          garage = realEstatePropertiesFromSpaces.garage,
+          gas = realEstatePropertiesFromInfrastructure.gas,
+          antiTheftDoor = realEstatePropertiesFromDescriptions.antiTheftDoor,
+          airCondition = realEstatePropertiesFromDescriptions.airCondition,
+          phoneConnection =
+            realEstatePropertiesFromInfrastructure.phoneConnection,
+          cableTV = realEstatePropertiesFromInfrastructure.cableTV,
+          internet = realEstatePropertiesFromInfrastructure.internet,
+          basementAttic = realEstatePropertiesFromSpaces.basementAttic,
+          storeRoom = realEstatePropertiesFromSpaces.storeRoom,
+          videoSurveillance =
+            realEstatePropertiesFromDescriptions.videoSurveillance ||
+            realEstatePropertiesFromInfrastructure.videoSurveillance,
+          alarm = realEstatePropertiesFromDescriptions.alarm,
+          suitableForStudents = null,
+          includingBills =
+            extractedData["op_realEstates_utilitiesIncluded"] === "1" || null,
+          animalsAllowed = null,
+          pool = realEstatePropertiesFromDescriptions.pool,
+          urbanPlanPermit =
+            extractedData["op_realEstates_locationPermit"] === "1" ||
+            realEstatePropertiesFromDescriptions.urbanPlanPermit,
+          buildingPermit =
+            extractedData["op_realEstates_buildingPermit"] === "1" || null,
+          utilityConnection =
+            realEstatePropertiesFromDescriptions.utilityConnection,
+          distanceToRiver = null,
+          numberOfViewsAgency = null;
+
         const title = extractedData["re_realEstates_portalName"];
         const extractedPrice = parseFloat(
           extractedData["re_realEstates_price"]
@@ -277,8 +460,6 @@ class AktidoCrawler {
           };
         }
 
-        const adStatus = AD_STATUS.STATUS_NORMAL;
-
         const data = {
           url,
           agencyObjectId: aktidoId,
@@ -303,7 +484,42 @@ class AktidoCrawler {
           locationLong,
           adStatus,
           publishedDate: publishedDateMoment.toISOString(),
-          renewedDate: renewedDateMoment.toISOString()
+          renewedDate: renewedDateMoment.toISOString(),
+          numberOfRooms,
+          numberOfFloors,
+          floor,
+          accessRoadType,
+          heatingType,
+          furnishingType,
+          balcony,
+          newBuilding,
+          elevator,
+          water,
+          electricity,
+          drainageSystem,
+          registeredInZkBooks,
+          recentlyAdapted,
+          parking,
+          garage,
+          gas,
+          antiTheftDoor,
+          airCondition,
+          phoneConnection,
+          cableTV,
+          internet,
+          basementAttic,
+          storeRoom,
+          videoSurveillance,
+          alarm,
+          suitableForStudents,
+          includingBills,
+          animalsAllowed,
+          pool,
+          urbanPlanPermit,
+          buildingPermit,
+          utilityConnection,
+          distanceToRiver,
+          numberOfViewsAgency
         };
 
         return data;
@@ -350,6 +566,270 @@ class AktidoCrawler {
     }
   }
 
+  getPropertiesFromDescriptions(descriptionIds) {
+    const result = {
+      accessRoadType: null,
+      furnishingType: null,
+      balcony: null,
+      elevator: null,
+      parking: null,
+      antiTheftDoor: null,
+      airCondition: null,
+      videoSurveillance: null,
+      alarm: null,
+      pool: null,
+      urbanPlanPermit: null,
+      utilityConnection: null,
+      water: null,
+      electricity: null
+    };
+
+    for (const descriptionId of descriptionIds) {
+      switch (descriptionId) {
+        case 16:
+          result.furnishingType = FURNISHING_TYPE.NOT_FURNISHED.id;
+          break;
+        case 17:
+          result.furnishingType = FURNISHING_TYPE.HALF_FURNISHED.id;
+          break;
+        case 1:
+        case 28:
+          result.furnishingType = FURNISHING_TYPE.FURNISHED.id;
+          break;
+        case 14:
+          result.elevator = true;
+          break;
+        case 39:
+          result.electricity = true;
+          break;
+        case 40:
+          result.water = true;
+          break;
+        case 41:
+        case 58:
+          result.accessRoadType = ACCESS_ROAD_TYPE.ASPHALT.id;
+          break;
+        case 26:
+          result.balcony = true;
+          break;
+        case 62:
+          result.parking = true;
+          break;
+        case 3:
+          result.antiTheftDoor = true;
+          break;
+        case 2:
+        case 21:
+          result.airCondition = true;
+          break;
+        case 4:
+          result.alarm = true;
+          break;
+        case 55:
+          result.videoSurveillance = true;
+          break;
+        case 9:
+          result.pool = true;
+          break;
+        case 60:
+          result.urbanPlanPermit = true;
+          break;
+        case 38:
+          result.utilityConnection = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getPropertiesFromSpaces(spaceIds) {
+    const result = {
+      balcony: null,
+      parking: null,
+      garage: null,
+      basementAttic: null,
+      storeRoom: null
+    };
+
+    for (const spaceId of spaceIds) {
+      switch (spaceId) {
+        case 36:
+        case 12:
+          result.parking = true;
+          break;
+        case 1:
+        case 2:
+        case 3:
+          result.balcony = true;
+          break;
+        case 4:
+        case 30:
+          result.garage = true;
+          break;
+        case 9:
+        case 10:
+          result.storeRoom = true;
+          break;
+        case 18:
+        case 34:
+        case 37:
+        case 27:
+          result.basementAttic = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getHeatingTypeId(heatingRentalId) {
+    // heatingRentalId can have multiple values, like: "1, 2, 3", parseInt will take first integer value
+    const heatingId = parseInt(heatingRentalId);
+    switch (heatingId) {
+      case 27:
+      case 16:
+        return HEATING_TYPE.GAS.id;
+      case 4:
+        return HEATING_TYPE.CENTRAL_GAS.id;
+      case 3:
+      case 23:
+      case 6:
+      case 7:
+      case 8:
+      case 9:
+      case 10:
+        return HEATING_TYPE.CENTRAL_BOILER.id;
+      case 2:
+      case 13:
+      case 30:
+      case 17:
+      case 29:
+      case 31:
+        return HEATING_TYPE.ELECTRICITY.id;
+      case 24:
+      case 25:
+      case 12:
+        return HEATING_TYPE.CENTRAL_CITY.id;
+      case 26:
+      case 21:
+      case 20:
+        return HEATING_TYPE.WOOD.id;
+      case 28:
+      case 19:
+        return HEATING_TYPE.HEAT_PUMP.id;
+      case 14:
+      case 32:
+        return HEATING_TYPE.OTHER.id;
+      default:
+        return null;
+    }
+  }
+
+  getPropertiesFromInfrastructure(infrastructureIds) {
+    const result = {
+      electricity: null,
+      water: null,
+      gas: null,
+      drainageSystem: null,
+      phoneConnection: null,
+      internet: null,
+      videoSurveillance: null,
+      cableTV: null
+    };
+
+    for (const infrastructureId of infrastructureIds) {
+      switch (infrastructureId) {
+        case 1:
+          result.electricity = true;
+          break;
+        case 2:
+          result.water = true;
+          break;
+        case 4:
+          result.gas = true;
+          break;
+        case 5:
+          result.drainageSystem = true;
+          break;
+        case 7:
+        case 8:
+          result.phoneConnection = true;
+          break;
+        case 10:
+          result.internet = true;
+          break;
+        case 11:
+          result.cableTV = true;
+          break;
+        case 16:
+        case 17:
+          result.videoSurveillance = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getFloorNumberFromFloorId(floorsIdText) {
+    // floorIdText can be array of numbers, separated by comma or number
+    // just extracting floor number from first element
+
+    const floorsId = floorsIdText.split(",");
+    if (floorsId.length === 0) {
+      return null;
+    }
+
+    const firstFloorId = parseInt(floorsId[0]);
+
+    // 1 pod
+    // 2 sut
+    // 3 raz
+    // 4 pri
+    // 5 vpri
+    // 6 prv
+    // 7 dru
+    // 8 tre
+    // 9 čet
+    // 10 man
+    // 11
+    // 12 pot
+    // 13 vpot
+    // 14 tav
+    // 15 pet
+    const floorNumber = [
+      -1,
+      -1,
+      0,
+      0,
+      1,
+      1,
+      2,
+      3,
+      4,
+      null,
+      null,
+      null,
+      null,
+      null,
+      5
+    ];
+
+    return floorNumber[firstFloorId - 1] || null;
+  }
+
+  getNumberOfFloorsFromFloorId(floorsIdText) {
+    // floorIdText can be array of numbers, separated by comma or number
+
+    const floorIds = floorsIdText.split(",");
+    if (floorIds.length === 0) {
+      return null;
+    }
+
+    return floorIds.length;
+  }
+
   async sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
   }
@@ -362,7 +842,7 @@ class AktidoCrawler {
     // }
 
     //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
+    return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
 }

app/crawler/specificCrawlers/olx.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const fetch = require("node-fetch");
+const fetch = require("../../helpers/fetchWrapper");
+const { logDebug } = require("../../helpers/log");
 const cheerio = require("cheerio");
 const Promise = require("bluebird");
 const moment = require("moment-timezone");
@@ -10,7 +11,10 @@ const {
   AD_CATEGORY,
   AD_AGENCY,
   AD_STATUS,
-  CRAWLER_AD_TYPE
+  CRAWLER_AD_TYPE,
+  HEATING_TYPE,
+  FURNISHING_TYPE,
+  ACCESS_ROAD_TYPE
 } = require("../../common/enums");
 
 const {
@@ -41,6 +45,16 @@ const OLX_ENUMS = {
 
 const { OLX_FORCE_CRAWL } = require("../specificConfigs/olx");
 
+const chunk = (array, size = 10) => {
+  let i, j ,temparray;
+  const result = []
+  for (i=0,j=array.length; i<j; i+=size) {
+    temparray = array.slice(i,i+size);
+    result.push(temparray);
+  }
+  return result;
+}
+
 class OlxCrawler {
   constructor(
     savers = [],
@@ -49,7 +63,7 @@ class OlxCrawler {
     maxPages = 1000,
     maxResultsPerPage = 100,
     ignoredUsernames = [],
-    delayBetweenPages = 1000
+    delayBetweenPages = 500
   ) {
     this.savers = savers;
     this.baseUrl = "https://www.olx.ba/pretraga?sort_order=desc&sort_po=datum";
@@ -62,6 +76,7 @@ class OlxCrawler {
   }
 
   async crawl() {
+    logDebug("Starting OLX crawl");
     const crawlAdCategories = this.crawlerAdCategories;
 
     const newRealEstates = [];
@@ -85,14 +100,32 @@ class OlxCrawler {
         const entries = singlePageResults.entries();
 
         for (const [index, { value: singlePageResult }] of entries) {
+          if (PRINT_CRAWLER_DEBUG) {
+            console.log("================================");
+            console.log("Category Indexer index : ", index);
+          }
+
           if (singlePageResult) {
+            console.log("\tTotal entries          : ", singlePageResult.length)
             const saveResults = await this.saveCrawledResults(singlePageResult);
             const { newRecords, existingRecords } = saveResults;
 
+            if (PRINT_CRAWLER_DEBUG) {
+              console.log("--------------------------");
+              console.log("\tNew record URLs [", newRecords.length, "] :");
+
+              for(const newRecord of newRecords) {
+                console.log("\t\t",newRecord.url);
+              }
+
+              console.log("\t-------------------------");
+              console.log("\tExisting record URLs [", existingRecords.length, "] :");
+            }
+
             newRealEstates.push(...newRecords);
 
             for (const existingRecord of existingRecords) {
-              const { publishedDate, renewedDate } = existingRecord;
+              const { publishedDate, renewedDate, url } = existingRecord;
 
               const publishedDateMoment = moment.utc(publishedDate);
               const renewedDateMoment = moment.utc(renewedDate);
@@ -102,13 +135,25 @@ class OlxCrawler {
                 "minute"
               );
 
+              if (PRINT_CRAWLER_DEBUG) {
+                console.log("\t\t", url);
+                console.log("\t\t\tPublished date         : ", publishedDate);
+                console.log("\t\t\tRenewed date           : ", renewedDate);
+                console.log("\t\t\tIs same (up to minute) : ", stopCrawlingThisCategory);
+              }
+
               if (stopCrawlingThisCategory && !OLX_FORCE_CRAWL) {
                 generatorsToRemove[index] = true;
-                // console.log("\tGenerator ", index + 1, "has no more new ads");
+                if (PRINT_CRAWLER_DEBUG) {
+                  console.log("\t\t\tStopping this category indexer");
+                }
                 break;
               }
             }
           } else {
+            if (PRINT_CRAWLER_DEBUG) {
+              console.log("\tNo more entries in this category, stopping!");
+            }
             //Generator returned undefined, remove this generator from array
             generatorsToRemove[index] = true;
             // console.log("Generator ", index + 1, "has no more pages");
@@ -133,31 +178,36 @@ class OlxCrawler {
   }
 
   async *categoryIndexer(adCategory) {
-    let pageToIndex = 1;
+    try {
+      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
-        );
+      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;
+          await this.sleep(this.delayBetweenPages);
+          if (Array.isArray(singlePageResults) && singlePageResults.length > 0) {
+            yield singlePageResults;
+          } else {
+            return undefined;
+          }
+
+          ++pageToIndex;
+          if (pageToIndex === this.maxPages) {
+            return undefined;
+          }
         }
+      } else {
+        return undefined;
       }
-    } else {
-      return undefined;
+    } catch (e) {
+      console.log('Error inside generator: ', e);
     }
   }
 
@@ -167,8 +217,10 @@ class OlxCrawler {
     }
 
     try {
-      const res = await fetch(url);
+      const res = await fetch(url, {}, false);
+      logDebug("Got category results for: ", url);
       const body = await res.text();
+      logDebug("Got category results text for: ", url);
       const $ = cheerio.load(body);
       let hrefs = [];
 
@@ -189,26 +241,44 @@ class OlxCrawler {
 
       const asyncScraping = [];
       for (let i = 0; i < actualNoOfResults; i++) {
-        asyncScraping.push(this.scrapeAd(hrefs[i]));
+        asyncScraping.push(hrefs[i]);
       }
 
-      const scrapedData = await Promise.all(asyncScraping);
-      const filteredScrapedData = scrapedData.filter(adData => !!adData);
+      const allChunks = chunk(asyncScraping, 2);
+      const dataResults = []
+      for (let i = 0; i < allChunks.length; i++) {
+        const singleChunk = allChunks[i];
+        const promises = singleChunk.map(c => this.scrapeAd(c))
+        const chunkResults = await Promise.all(promises);
+        await this.sleep(this.delayBetweenPages);
+        dataResults.push(...chunkResults);
+        logDebug("Chunk results len:", chunkResults.length);
+      }
+
+
+      const filteredScrapedData = dataResults.filter(adData => !!adData);
+      logDebug("Filtered scraped data length: ", filteredScrapedData.length);
+
       return filteredScrapedData;
     } catch (e) {
-      console.error("Exception caught:" + e);
+      console.error("Exception caught, index single page: " + e);
       return [];
     }
   }
 
   async scrapeAd(url) {
-    // console.log("Scraping : ", url);
+    logDebug("Scraping : ", url);
     try {
       const adPageSource = await fetch(url);
       const body = await adPageSource.text();
       const $ = cheerio.load(body);
       let status = AD_STATUS.STATUS_NORMAL;
 
+      if (body.indexOf('<html') === -1) {
+        console.error("This is the body: ", body);
+        throw { message: 'Failed to fetch page !' }
+      }
+
       const propertySelectors = {
         username:
           "#lg > div.desno2.profil > div:nth-child(2) > div.vrsta1.vrsta_desno > a > div.username > span",
@@ -235,46 +305,35 @@ class OlxCrawler {
 
       //====== 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 ?)"
-        };
+      const priceHeader = $("#pc > p.n").text().trim();
+      const priceValue = $("#pc > p:nth-child(2)").text().trim();
+      price = priceValue;
+
+      if (priceHeader.indexOf('Hitn') !== -1) {
+        // Urgent price
+        status = AD_STATUS.STATUS_URGENT;
+      }
+
+      const discountPriceTag = $("#artikal_glavni_div > div.artikal_lijevo > p:nth-child(4)").text().trim();
+      if (discountPriceTag.indexOf('Akcij') !== -1) {
+        status = AD_STATUS.STATUS_DISCOUNTED;
+        const discountPriceValues = $("#artikal_glavni_div > div.artikal_lijevo > div:nth-child(5) > p").text().trim();
+        // discountPriceValues contain string like "10.000 KM 7.500 KM"
+        // First price is regular, second is currently active (discounted) price
+        const bothPrices = discountPriceValues.split('KM');
+        // Now, currently active price is second element of bothPrices array
+        price = bothPrices[1] ? bothPrices[1].trim() : null;
       }
 
       //====== OTHER AD INFORMATION ===============
       let adType = null;
       let olxId = null;
+      let numberOfViewsAgency = null;
 
       let otherInformationDivId;
       //We need to locate DIV ID where other information are stored
-      for (let possibleId = 10; possibleId <= 20; possibleId++) {
+      for (let possibleId = 1; possibleId <= 30; possibleId++) {
         const adTypeFieldTitle = $(
           `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${possibleId}) > div:nth-child(2) > div.df1`
         )
@@ -293,6 +352,7 @@ class OlxCrawler {
 
       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 numberOfViewsAgencyValueSelector = `#artikal_glavni_div > div.artikal_lijevo > div:nth-child(${otherInformationDivId}) > div:nth-child(6) > div.df2`;
       const renewedDateFullValueSelector = `#artikal_glavni_div > div.artikal_lijevo > div.op.ob.pop`;
 
       const publishedDate = $(publishedDateValueSelector)
@@ -331,60 +391,7 @@ class OlxCrawler {
       )
         .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}]` };
@@ -395,6 +402,221 @@ class OlxCrawler {
         throw { message: "Unknown ad type" };
       }
 
+      const olxIdFieldTitle = $(`${olxIdFieldSelector} > div.df1`)
+        .text()
+        .trim();
+      olxId = $(`${olxIdFieldSelector} > div.df2`)
+        .text()
+        .trim();
+      numberOfViewsAgency = parseInt(
+        $(numberOfViewsAgencyValueSelector)
+          .text()
+          .trim()
+      );
+
+      if (olxIdFieldTitle !== "OLX ID") {
+        throw { message: "Cannot find correct OLX ID" };
+      }
+      //===========================================
+
+      //====== DETAIL INFORMATION FIELDS ==========
+      let area,
+        gardenSize,
+        numberOfRooms = null,
+        numberOfFloors = null,
+        floor = null,
+        accessRoadType = null,
+        heatingType = null,
+        furnishingType = null,
+        balcony = null,
+        newBuilding = null,
+        elevator = null,
+        water = null,
+        electricity = null,
+        drainageSystem = null,
+        registeredInZkBooks = null,
+        recentlyAdapted = null,
+        parking = null,
+        garage = null,
+        gas = null,
+        antiTheftDoor = null,
+        airCondition = null,
+        phoneConnection = null,
+        cableTV = null,
+        internet = null,
+        basementAttic = null,
+        storeRoom = null,
+        videoSurveillance = null,
+        alarm = null,
+        suitableForStudents = null,
+        includingBills = null,
+        animalsAllowed = null,
+        pool = null,
+        urbanPlanPermit = null,
+        buildingPermit = null,
+        utilityConnection = null,
+        distanceToRiver = 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()
+          .toLowerCase();
+        const fieldValue = $(fieldValueSelector)
+          .text()
+          .trim()
+          .toLowerCase();
+
+        switch (fieldTitle) {
+          case "kvadrata":
+            area = fieldValue;
+            break;
+          case "okućnica (kvadratura)":
+            gardenSize = fieldValue;
+            break;
+          case "broj soba":
+            numberOfRooms = this.parseNumberOfRooms(fieldValue, parsedCategory);
+            break;
+          case "broj prostorija":
+            numberOfRooms = this.parseNumberOfRooms(fieldValue, parsedCategory);
+            break;
+          case "broj spratova":
+            numberOfFloors = this.parseNumberOfFloors(
+              fieldValue,
+              parsedCategory
+            );
+            break;
+          case "sprat":
+            floor = this.parseFloorNumber(fieldValue, parsedCategory);
+            break;
+          case "vrsta grijanja":
+            heatingType = this.getHeatingTypeId(fieldValue);
+            break;
+          case "namješten?":
+            furnishingType = this.getFurnishingTypeId(fieldValue);
+            break;
+          case "namješten":
+            furnishingType = FURNISHING_TYPE.FURNISHED.id;
+            break;
+          case "namještena":
+            furnishingType = FURNISHING_TYPE.FURNISHED.id;
+            break;
+          case "voda":
+            water = true;
+            break;
+          case "struja":
+            electricity = true;
+            break;
+          case "kanalizacija":
+            drainageSystem = fieldValue !== "nema";
+            break;
+          case "godina izgradnje":
+            newBuilding = newBuilding || fieldValue === "novogradnja";
+            break;
+          case "kućni ljubimci":
+            animalsAllowed = fieldValue === "da";
+            break;
+          case "uknjiženo / zk":
+            registeredInZkBooks = true;
+            break;
+          case "uknjiženo (zk)":
+            registeredInZkBooks = true;
+            break;
+          case "novogradnja":
+            newBuilding = true;
+            break;
+          case "nedavno adaptiran":
+            recentlyAdapted = true;
+            break;
+          case "nedavno adaptirana":
+            recentlyAdapted = true;
+            break;
+          case "balkon":
+            balcony = true;
+            break;
+          case "lift":
+            elevator = true;
+            break;
+          case "parking":
+            parking = true;
+            break;
+          case "garaža":
+            garage = true;
+            break;
+          case "plin":
+            gas = true;
+            break;
+          case "blindirana vrata":
+            antiTheftDoor = true;
+            break;
+          case "klima":
+            airCondition = true;
+            break;
+          case "telefonski priključak":
+            phoneConnection = true;
+            break;
+          case "kablovska tv":
+            cableTV = true;
+            break;
+          case "internet":
+            internet = true;
+            break;
+          case "podrum/tavan":
+            basementAttic = true;
+            break;
+          case "ostava/špajz":
+            storeRoom = true;
+            break;
+          case "video nadzor":
+            videoSurveillance = true;
+            break;
+          case "alarm":
+            alarm = true;
+            break;
+          case "za studente":
+            suitableForStudents = true;
+            break;
+          case "uključen trošak režija":
+            includingBills = true;
+            break;
+          case "građevinska dozvola":
+            buildingPermit = true;
+            break;
+          case "komunalni priključak":
+            utilityConnection = true;
+            break;
+          case "urbanistička dozvola":
+            urbanPlanPermit = true;
+            break;
+          case "udaljenost od rijeke (m)":
+            distanceToRiver = parseInt(fieldValue) || null;
+            break;
+          case "prilaz":
+            accessRoadType = this.getAccessRoadTypeId(fieldValue);
+            break;
+          case "bazen":
+            pool = true;
+            break;
+          case "iznajmljeno":
+            status = AD_STATUS.STATUS_RENTED;
+            break;
+          default:
+            // console.log(fieldTitle, " = ", fieldValue);
+            break;
+        }
+
+        if (++fieldIndex === OLX_ENUMS.MAX_DETAIL_FIELDS || fieldTitle === "") {
+          break;
+        }
+      } while (true);
+      //===========================================
+
+      //=========================================
       const parsedArea = this.parseArea(area) || null;
       const parsedGardenSize = this.parseArea(gardenSize) || null;
       const parsedPrice = this.parsePrice(price) || null;
@@ -409,6 +631,13 @@ class OlxCrawler {
         locationLong = parseFloat(locationLatLngMatches[2]) || null;
       }
 
+      if (
+        title.indexOf("[PRODANO]") !== -1 ||
+        title.indexOf("[ZAVRŠENO]") !== -1
+      ) {
+        status = AD_STATUS.STATUS_SOLD;
+      }
+
       const data = {
         url,
         agencyObjectId: olxId,
@@ -439,12 +668,49 @@ class OlxCrawler {
         locationLong,
         adStatus: status,
         publishedDate: publishedDateMoment.toISOString(),
-        renewedDate: renewedDateMoment.toISOString()
+        renewedDate: renewedDateMoment.toISOString(),
+        numberOfRooms,
+        numberOfFloors,
+        floor,
+        accessRoadType,
+        heatingType,
+        furnishingType,
+        balcony,
+        newBuilding,
+        elevator,
+        water,
+        electricity,
+        drainageSystem,
+        registeredInZkBooks,
+        recentlyAdapted,
+        parking,
+        garage,
+        gas,
+        antiTheftDoor,
+        airCondition,
+        phoneConnection,
+        cableTV,
+        internet,
+        basementAttic,
+        storeRoom,
+        videoSurveillance,
+        alarm,
+        suitableForStudents,
+        includingBills,
+        animalsAllowed,
+        pool,
+        urbanPlanPermit,
+        buildingPermit,
+        utilityConnection,
+        distanceToRiver,
+        numberOfViewsAgency
       };
+      //
+      //console.log("Scraped data:", data);
 
       return data;
     } catch (e) {
-      console.error("Exception caught: " + e.message, "\r\nURL:", url);
+      console.error("Exception caught scrapeAd : " + e.message, "\r\nURL:", url);
     }
     return null;
   }
@@ -485,6 +751,64 @@ class OlxCrawler {
     }
   }
 
+  getHeatingTypeId(heatingTypeText) {
+    switch (heatingTypeText) {
+      case "struja":
+        return HEATING_TYPE.ELECTRICITY.id;
+      case "plin":
+        return HEATING_TYPE.GAS.id;
+      case "drva":
+        return HEATING_TYPE.WOOD.id;
+      case "centralno (gradsko)":
+        return HEATING_TYPE.CENTRAL_CITY.id;
+      case "centralno (kotlovnica)":
+        return HEATING_TYPE.CENTRAL_BOILER.id;
+      case "centralno (plin)":
+        return HEATING_TYPE.CENTRAL_GAS.id;
+      case "nije uvedeno":
+        return HEATING_TYPE.NO_HEATING.id;
+      case "ostalo":
+        return HEATING_TYPE.OTHER.id;
+      case "drugo":
+        return HEATING_TYPE.OTHER.id;
+      default:
+        console.log("grijanje = NEPOZNATO [", heatingTypeText, "]");
+        return null;
+    }
+  }
+
+  getFurnishingTypeId(furnishingTypeText) {
+    switch (furnishingTypeText) {
+      case "namješten":
+        return FURNISHING_TYPE.FURNISHED.id;
+      case "polunamješten":
+        return FURNISHING_TYPE.HALF_FURNISHED.id;
+      case "nenamješten":
+        return FURNISHING_TYPE.NOT_FURNISHED.id;
+      case "":
+        return FURNISHING_TYPE.FURNISHED.id;
+      default:
+        console.log("namješten = NEPOZNATO [", furnishingTypeText, "]");
+        return null;
+    }
+  }
+
+  getAccessRoadTypeId(accessRoadTypeText) {
+    switch (accessRoadTypeText) {
+      case "asfalt":
+        return ACCESS_ROAD_TYPE.ASPHALT.id;
+      case "beton":
+        return ACCESS_ROAD_TYPE.CONCRETE.id;
+      case "makadam":
+        return ACCESS_ROAD_TYPE.MACADAM.id;
+      case "ostalo":
+        return ACCESS_ROAD_TYPE.OTHER.id;
+      default:
+        console.log("pristup = NEPOZNATO [", accessRoadTypeText, "]");
+        return null;
+    }
+  }
+
   parseArea(areaText) {
     if (!areaText) {
       return NaN;
@@ -501,60 +825,107 @@ class OlxCrawler {
     if (!priceText) {
       return NaN;
     }
+    if (priceText === "Po dogovoru") {
+      return null;
+    }
     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;
+  parseNumberOfRooms(numberOfRoomsText, categoryId) {
+    if (categoryId === AD_CATEGORY.FLAT.id) {
+      switch (numberOfRoomsText) {
+        case "garsonjera":
+          return 0;
+        case "jednosoban (1)":
+          return 1;
+        case "jednoiposoban (1.5)":
+          return 1.5;
+        case "dvosoban (2)":
+          return 2;
+        case "trosoban (3)":
+          return 3;
+        case "četverosoban (4)":
+          return 4;
+        case "petosoban i više":
+          return 5;
+        default:
+          console.log(
+            "broj soba [stan] = NEPOZNATO [",
+            numberOfRoomsText,
+            ", ",
+            categoryId,
+            "]"
+          );
+          return null;
       }
     }
 
-    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");
+    if (
+      categoryId === AD_CATEGORY.HOUSE.id ||
+      categoryId === AD_CATEGORY.COTTAGE.id ||
+      categoryId === AD_CATEGORY.APARTMENT.id ||
+      categoryId === AD_CATEGORY.OFFICE.id
+    ) {
+      return parseInt(numberOfRoomsText) || null;
     }
 
-    const todayVariations = ["min", "sekund", "maloprije"];
-    for (const todayVariation of todayVariations) {
-      if (renewedDateText.includes(todayVariation)) {
-        return currentMoment;
-      }
+    console.log("broj soba = NEPOZNATO [", numberOfRoomsText, "]");
+    return null;
+  }
+
+  parseNumberOfFloors(numberOfFloorsText, categoryId) {
+    if (
+      categoryId === AD_CATEGORY.HOUSE.id ||
+      categoryId === AD_CATEGORY.COTTAGE.id
+    ) {
+      return parseInt(numberOfFloorsText) || null;
     }
 
-    const renewedDateMoment = moment.tz(
-      renewedDateText,
-      OLX_ENUMS.OLX_RENEWED_DATE_FORMAT,
-      DEFAULT_TIMEZONE
-    );
+    if (categoryId === AD_CATEGORY.OFFICE.id) {
+      if (
+        numberOfFloorsText === "suteren" ||
+        numberOfFloorsText === "prizemlje"
+      ) {
+        return 0;
+      }
+      if (numberOfFloorsText === "6+") {
+        return 7;
+      }
+      return parseInt(numberOfFloorsText) || null;
+    }
 
-    return renewedDateMoment.isValid() ? renewedDateMoment : undefined;
+    console.log("broj spratova = NEPOZNATO [", numberOfFloorsText, "]");
+    return null;
+  }
+
+  parseFloorNumber(floorText, categoryId) {
+    if (
+      categoryId === AD_CATEGORY.FLAT.id ||
+      categoryId === AD_CATEGORY.APARTMENT.id
+    ) {
+      if (
+        floorText === "suteren" ||
+        floorText === "prizemlje" ||
+        floorText === "visoko prizemlje"
+      ) {
+        return 0;
+      }
+      return parseInt(floorText) || null;
+    }
+
+    if (categoryId === AD_CATEGORY.OFFICE.id) {
+      if (floorText === "zaseban objekat") {
+        return null;
+      }
+      if (floorText === "prizemlje" || floorText === "visoko prizemlje") {
+        return 0;
+      }
+      return parseInt(floorText) || null;
+    }
+
+    console.log("sprat = NEPOZNATO [", floorText, "]");
+    return null;
   }
 
   async sleep(ms) {
@@ -569,7 +940,7 @@ class OlxCrawler {
     // }
 
     //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
+    return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
 }

app/crawler/specificCrawlers/prostor.js

@@ -1,17 +1,27 @@
 "use strict";
 
-const fetch = require("node-fetch");
+const fetch = require("../../helpers/fetchWrapper");
 const cheerio = require("cheerio");
+const moment = require("moment-timezone");
+const FormData = require("form-data");
+const nodeFetch = require("node-fetch");
 
 const {
   AD_TYPE,
   AD_CATEGORY,
   AD_AGENCY,
   AD_STATUS,
-  CRAWLER_AD_TYPE
+  CRAWLER_AD_TYPE,
+  FURNISHING_TYPE,
+  HEATING_TYPE
 } = require("../../common/enums");
 
-const { PRINT_CRAWLER_DEBUG } = require("../../config/appConfig");
+const {
+  PRINT_CRAWLER_DEBUG,
+  DEFAULT_TIMEZONE,
+  PROSTOR_LOGIN
+} = require("../../config/appConfig");
+const { PROSTOR_FORCE_CRAWL } = require("../specificConfigs/prostor");
 
 const PROSTOR_ENUMS = {
   PROSTOR_AD_TYPE: {
@@ -48,49 +58,399 @@ class ProstorCrawler {
     this.crawlerAdTypes = crawlerAdTypes;
     this.crawlerAdCategories = crawlerAdCategories;
     this.maxResultsPerPage = maxResultsPerPage;
+    this.delayBetweenPages = delayBetweenPages;
   }
 
   async crawl() {
     const crawlAdCategories = this.crawlerAdCategories;
+    const crawlAdTypes = this.crawlerAdTypes;
+    if (!crawlAdCategories || !crawlAdTypes) {
+      return []
+    }
+
     const newRealEstates = [];
+    //We need session cookie to use login privileges
+    const prostorCookie = await this.getCookies();
+    //New tag to check if crawler logged in
+    const login = await this.loginForScraping(PROSTOR_LOGIN, prostorCookie);
 
-    if (crawlAdCategories) {
+    //Crawl only if login was successful
+    if (login) {
+      const indexGenerators = [];
       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
-          );
+        indexGenerators.push(this.categoryIndexer(adCategory, prostorCookie));
+      }
 
-          const resultsSubset = singleCategoryResults.slice(
-            0,
-            this.maxResultsPerPage
-          );
-
-          const saveResults = await this.saveCrawledResults(resultsSubset);
-          const { newRecords } = saveResults;
-          newRealEstates.push(...newRecords);
+      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 &&
+              !PROSTOR_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 extractRealEstates(url) {
+  async *categoryIndexer(adCategory, prostorCookie) {
+    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=0${urlAdTypePart}${urlCategoryPart}`;
+      const listOfAllRealEstates = await this.extractRealEstates(
+        urlPageToCrawl,
+        prostorCookie
+      );
+
+      if (!Array.isArray(listOfAllRealEstates)){
+        console.log('[PROSTOR] Could not find real estate JSON data, check selector !');
+        return undefined;
+      }
+
+      let elementToStartIndexFrom = 0;
+      while (true) {
+        const realEstatesForSinglePage = listOfAllRealEstates.slice(
+          elementToStartIndexFrom,
+          elementToStartIndexFrom + this.maxResultsPerPage
+        );
+
+        if (realEstatesForSinglePage.length > 0) {
+          elementToStartIndexFrom += realEstatesForSinglePage.length;
+
+          const singlePageResults = await this.indexSinglePage(
+            realEstatesForSinglePage,
+            prostorCookie
+          );
+
+          const filteredSinglePageResults = singlePageResults.filter(
+            singleResult => !!singleResult
+          );
+
+          if (
+            Array.isArray(filteredSinglePageResults) &&
+            filteredSinglePageResults.length > 0
+          ) {
+            yield filteredSinglePageResults;
+          } else {
+            return undefined;
+          }
+        } else {
+          return undefined;
+        }
+      }
+    } else {
+      return undefined;
+    }
+  }
+
+  async indexSinglePage(realEstatesList, prostorCookie) {
+    const asyncActions = [];
+    for (const realEstate of realEstatesList) {
+      asyncActions.push(this.scrapeAd(realEstate, prostorCookie));
+    }
+
+    try {
+      return await Promise.all(asyncActions);
+    } catch (e) {
+      console.log(
+        "[PROSTOR] Error crawling ads : ",
+        e.message || "UNKNOWN ERROR"
+      );
+      return [];
+    }
+  }
+
+  async scrapeAd(realEstate, prostorCookie) {
+    const { lat, lng, property_name, price, size, link, status } = realEstate;
+
+    //Status information is given already in realestate list
+    const adStatus = ProstorCrawler.getStatusId(status);
+
+    const url = `https://prostor.ba${link}`;
+
+    // console.log("[PROSTOR] Scraping : ", url);
+    try {
+      const adPageSource = await nodeFetch(url, {
+        headers: { Cookie: prostorCookie }
+      });
+      const body = await adPageSource.text();
+      const $ = cheerio.load(body);
+
+      if (body.indexOf('<html') === -1) {
+        throw { message: 'Failed to fetch page !' }
+      }
+
+      // 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];
+
+      if (!adType || !realEstateType || !prostorId) {
+        return null;
+      }
+
+      const allDataSelector =
+        "body > div > div.container-fluid > div > div.column-right > table > tbody";
+
+      const realEstateProperties = {};
+
+      $(allDataSelector)
+        .find("p")
+        .each((i, element) => {
+          const propertyElement = $(element)
+            .text()
+            .split(":")
+            .map(text => text.trim().toLowerCase());
+
+          const propertyTitle = propertyElement[0];
+          realEstateProperties[propertyTitle] = propertyElement[1];
+        });
+
+      $(allDataSelector)
+        .find("div.mb-2")
+        .each((i, element) => {
+          const propertyElement = $(element)
+            .text()
+            .trim()
+            .toLowerCase();
+
+          realEstateProperties[propertyElement] = true;
+        });
+
+      if (JSON.stringify(realEstateProperties) === JSON.stringify({})) {
+        return null;
+      }
+
+      let numberOfRooms =
+          parseFloat(realEstateProperties["broj soba"]) +
+            parseFloat(realEstateProperties["broj spavaćih soba"]) || null,
+        numberOfFloors = null,
+        floor = null,
+        accessRoadType = null,
+        heatingType = ProstorCrawler.getHeatingTypeId(realEstateProperties),
+        furnishingType = null,
+        balcony =
+          realEstateProperties["balkon"] ||
+          realEstateProperties["terasa"] ||
+          realEstateProperties["lođa"] ||
+          null,
+        newBuilding = linkParts[1] === "novogradnja",
+        elevator = realEstateProperties["lift"] || null,
+        water = realEstateProperties["voda"] || null,
+        electricity = realEstateProperties["električna energija"] || null,
+        drainageSystem = realEstateProperties["kanalizacija"] || null,
+        registeredInZkBooks = null,
+        recentlyAdapted = null,
+        parking = realEstateProperties["parking"] || null,
+        garage = realEstateProperties["garaža"] || null,
+        gas = realEstateProperties["plin"] || null,
+        antiTheftDoor = realEstateProperties["blindo vrata"] || null,
+        airCondition = realEstateProperties["klima"] || null,
+        phoneConnection = realEstateProperties["telefon"] || null,
+        cableTV = realEstateProperties["kablovksa tv"] || null,
+        internet =
+          realEstateProperties["internet"] ||
+          realEstateProperties["adsl"] ||
+          null,
+        basementAttic = realEstateProperties["podrum"] || null,
+        storeRoom = realEstateProperties["ostava"] || null,
+        videoSurveillance = realEstateProperties["video nadzor"],
+        alarm = realEstateProperties["alarm"] || null,
+        suitableForStudents = null,
+        includingBills = null,
+        animalsAllowed = null,
+        pool = realEstateProperties["bazen"] || null,
+        urbanPlanPermit = null,
+        buildingPermit = null,
+        utilityConnection = null,
+        distanceToRiver = null,
+        numberOfViewsAgency = null;
+
+      // Floor versions (there are possibly more versions) :
+      // Sprat: 3/3
+      // Sprat: 1 - 2/2
+      // Sprat: Pr - 7/7
+      // Sprat: -2/0
+      // If there are two parts, that represents more real estates are sold
+      // numberOfFloors is contained in second part, after / sign
+
+      const floorsArray = realEstateProperties["sprat"].split(" - ");
+      let floorText = "";
+      if (floorsArray.length === 1) {
+        const floorDescription = floorsArray[0].split("/");
+        numberOfFloors = parseInt(floorDescription[1]) || null;
+        floorText = floorDescription[0];
+        floor = Math.round(parseFloat(floorText));
+      } else if (floorsArray.length === 2) {
+        const floorDescription = floorsArray[1].split("/");
+        numberOfFloors = parseInt(floorDescription[1]) || null;
+        floorText = floorsArray[0];
+        floor = Math.round(parseFloat(floorText));
+      } else {
+        // This is something strange
+      }
+
+      if (isNaN(floor)) {
+        // It was textual representation of floor, like "Pr", "Su" or similar
+        switch (floorText) {
+          case "pr":
+            floor = 0;
+            break;
+          case "su":
+            floor = -1;
+            break;
+          default:
+            console.log(
+              "[PROSTOR] Unknown textual representation of floor : ",
+              floorText
+            );
+            floor = null;
+        }
+      }
+
+      if (realEstateProperties["namješteno"]) {
+        furnishingType = FURNISHING_TYPE.FURNISHED.id;
+      } else if (realEstateProperties["polunamješteno"]) {
+        furnishingType = FURNISHING_TYPE.HALF_FURNISHED.id;
+      } else {
+        furnishingType = FURNISHING_TYPE.NOT_FURNISHED.id;
+      }
+
+      const title = property_name;
+      const parsedPrice = parseFloat(price.replace(/\./g, "")) || null;
+      const parsedArea = parseFloat(size);
+      const gardenSize = null;
+      const longDescription = null;
+
+      const data = {
+        url,
+        agencyObjectId: prostorId,
+        originAgencyName: AD_AGENCY.PROSTOR,
+        realEstateType,
+        adType,
+        title,
+        price: parsedPrice,
+        area: parsedArea,
+        gardenSize,
+        shortDescription: "",
+        longDescription: longDescription,
+        streetNumber: 0,
+        streetName: realEstateProperties["adresa"],
+        locality: "",
+        municipality: "",
+        city: "",
+        region: "",
+        entity: "",
+        country: "",
+        locationLat: lat,
+        locationLong: lng,
+        adStatus,
+        numberOfRooms,
+        numberOfFloors,
+        floor,
+        accessRoadType,
+        heatingType,
+        furnishingType,
+        balcony,
+        newBuilding,
+        elevator,
+        water,
+        electricity,
+        drainageSystem,
+        registeredInZkBooks,
+        recentlyAdapted,
+        parking,
+        garage,
+        gas,
+        antiTheftDoor,
+        airCondition,
+        phoneConnection,
+        cableTV,
+        internet,
+        basementAttic,
+        storeRoom,
+        videoSurveillance,
+        alarm,
+        suitableForStudents,
+        includingBills,
+        animalsAllowed,
+        pool,
+        urbanPlanPermit,
+        buildingPermit,
+        utilityConnection,
+        distanceToRiver,
+        numberOfViewsAgency
+      };
+
+      return data;
+    } catch (e) {
+      console.error(
+        "[PROSTOR] Exception caught: " + e.message,
+        "\r\nURL:",
+        url
+      );
+      return null;
+    }
+  }
+
+  async extractRealEstates(url, prostorCookie) {
     if (PRINT_CRAWLER_DEBUG) {
       console.log("[PROSTOR] Index page : ", url);
     }
 
     try {
-      const res = await fetch(url);
+      const res = await nodeFetch(url, {
+        headers: { Cookie: prostorCookie }
+      });
       const body = await res.text();
       const $ = cheerio.load(body);
 
       const scriptElement = $(
-        "body > div > div.container-fluid > script:nth-child(7)"
+          "body > div.content > div.container-fluid > script:nth-child(6)"
       );
 
       if (
@@ -115,18 +475,19 @@ class ProstorCrawler {
             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;
+            // const transformedRealEstates = [];
+            //
+            // for (const realEstate of realEstates) {
+            //   const transformedRealEstate = ProstorCrawler.transformRealEstateData(
+            //     realEstate
+            //   );
+            //   if (transformedRealEstate) {
+            //     transformedRealEstates.push(transformedRealEstate);
+            //   }
+            // }
+            //
+            // return transformedRealEstates;
+            return realEstates;
           } else {
             throw {
               message: "Something is wrong with JSON data or data is moved"
@@ -134,73 +495,15 @@ class ProstorCrawler {
           }
         } catch (e) {
           console.log(e);
-          throw { message: "Can't find ad data JSON" };
+          throw e;
         }
       }
-    } 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
+        "[PROSTOR] Exception caught:",
+        e.message || "UNKNOWN MESSAGE"
       );
-      return null;
+      return [];
     }
   }
 
@@ -231,11 +534,63 @@ class ProstorCrawler {
         return AD_TYPE.AD_TYPE_SALE.stringId;
       case "najam":
         return AD_TYPE.AD_TYPE_RENT.stringId;
+      case "novogradnja":
+        return AD_TYPE.AD_TYPE_SALE.stringId;
       default:
         return undefined;
     }
   }
 
+  static getHeatingTypeId(realEstateProperties) {
+    const realEstatePropertiesKeys = Object.keys(realEstateProperties);
+    for (const property of realEstatePropertiesKeys) {
+      switch (property) {
+        case "centralno toplane":
+          return HEATING_TYPE.CENTRAL_CITY.id;
+        case "etažno plinsko":
+          return HEATING_TYPE.CENTRAL_GAS.id;
+        case "termo blok":
+        case "podno grijanje":
+          return HEATING_TYPE.OTHER.id;
+        case "etažno električno":
+        case "konvektori":
+          return HEATING_TYPE.ELECTRICITY.id;
+        case "plinske peći":
+          return HEATING_TYPE.GAS.id;
+        case "vlastita kotlovnica":
+          return HEATING_TYPE.CENTRAL_BOILER.id;
+        case "toplotna pumpa":
+          return HEATING_TYPE.HEAT_PUMP.id;
+        case "kamin":
+          return HEATING_TYPE.WOOD.id;
+        default:
+        //console.log("[PROSTOR] Nepoznato >>>  [", property, "]");
+      }
+    }
+  }
+
+  static getStatusId(statusText) {
+    switch (statusText) {
+      case "":
+        return AD_STATUS.STATUS_NORMAL;
+      case "Rezervisano":
+        return AD_STATUS.STATUS_RESERVED;
+      case "Prodano":
+        return AD_STATUS.STATUS_SOLD;
+      case "Iznajmljeno":
+        return AD_STATUS.STATUS_RENTED;
+      case "VIP ponuda":
+        return AD_STATUS.STATUS_VIP;
+      default:
+        console.log("[PROSTOR] Unknown AD_STATUS : [", statusText, "]");
+        return AD_STATUS.STATUS_NORMAL;
+    }
+  }
+
+  async sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
   async saveCrawledResults(results) {
     const savers = this.savers;
 
@@ -244,9 +599,57 @@ class ProstorCrawler {
     // }
 
     //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
+    return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
+  async loginForScraping(PROSTOR_LOGIN, prostorCookie) {
+    let formData = new FormData();
+    formData.append("email", PROSTOR_LOGIN.EMAIL);
+    formData.append("password", PROSTOR_LOGIN.PASSWORD);
+
+    return nodeFetch("https://prostor.ba/moj-prostor/prijava", {
+      method: "POST",
+      body: formData,
+      headers: { Cookie: prostorCookie }
+    })
+      .then(page => {
+        return page.text();
+      })
+      .then(resp => {
+        const $ = cheerio.load(resp);
+        if (
+          $("h1")
+            .text()
+            .indexOf("Dobrodošli") !== -1
+        ) {
+          console.log("[PROSTOR]: Crawler loged in!");
+          return true;
+        } else {
+          console.log("[PROSTOR]: Crawler login failed - wrong credentials!");
+          return false;
+        }
+      })
+      .catch(err => {
+        console.log("[PROSTOR]: Crawler login error ", err);
+      });
+  }
+  async getCookies() {
+    const getResponse = await nodeFetch(
+      "https://prostor.ba/moj-prostor/prijava",
+      {
+        headers: { Cookie: "" }
+      }
+    );
+    const raw = getResponse.headers.raw()["set-cookie"];
+    const cookie = raw
+      .map(datastring => {
+        const data = datastring.split(";");
+        const cookieData = data[0];
+        return cookieData;
+      })
+      .join(";");
+    return cookie;
+  }
 }
 
 module.exports = ProstorCrawler;

app/crawler/specificCrawlers/rental.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const fetch = require("node-fetch");
+const fetch = require("../../helpers/fetchWrapper");
 const cheerio = require("cheerio");
 const Promise = require("bluebird");
 const moment = require("moment-timezone");
@@ -11,7 +11,10 @@ const {
   AD_CATEGORY,
   AD_AGENCY,
   AD_STATUS,
-  CRAWLER_AD_TYPE
+  CRAWLER_AD_TYPE,
+  HEATING_TYPE,
+  ACCESS_ROAD_TYPE,
+  FURNISHING_TYPE
 } = require("../../common/enums");
 
 const {
@@ -156,7 +159,7 @@ class RentalCrawler {
     }
 
     try {
-      const res = await fetch(url);
+      const res = await fetch(url, {} , false);
       const body = await res.text();
       const $ = cheerio.load(body);
       let hrefs = [];
@@ -199,6 +202,10 @@ class RentalCrawler {
       const body = await adPageSource.text();
       const $ = cheerio.load(body);
 
+      if (body.indexOf('<html') === -1) {
+        throw { message: 'Failed to fetch page !' }
+      }
+
       const mapElementParent = $(".box-map").parent();
       const scriptElement = $("script", mapElementParent);
       if (
@@ -219,6 +226,7 @@ class RentalCrawler {
           throw { message: "Can't find ad data JSON" };
         }
 
+        let adStatus = AD_STATUS.STATUS_NORMAL;
         const rentalId = extractedData["re_realEstates_id"];
         const adCategory = this.getKiviCategoryIdFromRentalId(
           parseInt(extractedData["re_types_id"])
@@ -237,6 +245,143 @@ class RentalCrawler {
           };
         }
 
+        const descriptionIds = extractedData["re_descriptions_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(descriptionIds)) {
+          throw {
+            message:
+              'Expected array od descriptions but "re_descriptions_id" not found !'
+          };
+        }
+
+        const spaceIds = extractedData["re_spaces_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(spaceIds)) {
+          throw {
+            message: 'Expected array od spaces but "re_spaces_id" not found !'
+          };
+        }
+
+        const infrastructureIds = extractedData["re_infrastructure_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(infrastructureIds)) {
+          throw {
+            message:
+              'Expected array od infrastructures but "re_infrastructure_id" not found !'
+          };
+        }
+
+        const floorNoIds = extractedData["re_floorNO_id"]
+          .split(",")
+          .map(stringNumber => parseInt(stringNumber));
+
+        if (!Array.isArray(floorNoIds)) {
+          throw {
+            message:
+              'Expected array od infrastructures but "re_floorNO_id" not found !'
+          };
+        }
+
+        const numberOfViewsAgencySelector = $(
+          "body > div > div.container > div.row.content-top > div.col-xs-12.col-sm-12.col-md-9 > div > div.box-viewcount"
+        );
+
+        // number of views is written as : "Broj pregledavanja: NNN"
+        const numberOfViewsAgencyFullText = numberOfViewsAgencySelector
+          .text()
+          .trim();
+
+        const numberOfViewsAgencyParts = numberOfViewsAgencyFullText.split(":");
+
+        const realEstatePropertiesFromDescriptions = this.getPropertiesFromDescriptions(
+          descriptionIds
+        );
+        const realEstatePropertiesFromSpaces = this.getPropertiesFromSpaces(
+          spaceIds
+        );
+
+        const realEstatePropertiesFromInfrastructure = this.getPropertiesFromInfrastructure(
+          infrastructureIds
+        );
+
+        if (extractedData["adm_realEstates_discount"] === "1") {
+          adStatus = AD_STATUS.STATUS_DISCOUNTED;
+        }
+
+        let numberOfRooms =
+            parseInt(extractedData["re_realEstates_roomsNO"]) +
+              parseInt(extractedData["re_realEstates_bedNO"]) || null,
+          numberOfFloors =
+            parseInt(extractedData["re_realEstates_floorsNO"]) ||
+            this.getNumberOfFloorsFromFloorId(extractedData["re_floorNO_id"]),
+          floor =
+            parseInt(extractedData["re_realEstates_floorNO"]) ||
+            this.getFloorNumberFromFloorId(extractedData["re_floorNO_id"]),
+          accessRoadType = realEstatePropertiesFromDescriptions.accessRoadType,
+          heatingType =
+            this.getHeatingTypeId(extractedData["re_heating_id"]) || null,
+          furnishingType = realEstatePropertiesFromDescriptions.furnishingType,
+          balcony =
+            realEstatePropertiesFromDescriptions.balcony ||
+            realEstatePropertiesFromSpaces.balcony,
+          newBuilding = extractedData["op_realEstates_newBuilding"]
+            ? extractedData["op_realEstates_newBuilding"] === "1"
+            : null,
+          elevator = realEstatePropertiesFromDescriptions.elevator,
+          water =
+            realEstatePropertiesFromDescriptions.water ||
+            realEstatePropertiesFromInfrastructure.water,
+          electricity =
+            realEstatePropertiesFromDescriptions.electricity ||
+            realEstatePropertiesFromInfrastructure.electricity,
+          drainageSystem =
+            realEstatePropertiesFromInfrastructure.drainageSystem,
+          registeredInZkBooks =
+            extractedData["op_realEstates_ownerPermit"] === 1 || null,
+          recentlyAdapted = null,
+          parking =
+            realEstatePropertiesFromDescriptions.parking ||
+            realEstatePropertiesFromSpaces.parking,
+          garage = realEstatePropertiesFromSpaces.garage,
+          gas = realEstatePropertiesFromInfrastructure.gas,
+          antiTheftDoor = realEstatePropertiesFromDescriptions.antiTheftDoor,
+          airCondition = realEstatePropertiesFromDescriptions.airCondition,
+          phoneConnection =
+            realEstatePropertiesFromInfrastructure.phoneConnection,
+          cableTV = realEstatePropertiesFromInfrastructure.cableTV,
+          internet = realEstatePropertiesFromInfrastructure.internet,
+          basementAttic =
+            realEstatePropertiesFromSpaces.basementAttic ||
+            this.checkBasemAtticFromFloors(extractedData["re_floorNO_id"]),
+          storeRoom = realEstatePropertiesFromSpaces.storeRoom,
+          videoSurveillance =
+            realEstatePropertiesFromDescriptions.videoSurveillance ||
+            realEstatePropertiesFromInfrastructure.videoSurveillance,
+          alarm = realEstatePropertiesFromDescriptions.alarm,
+          suitableForStudents = null,
+          includingBills =
+            extractedData["op_realEstates_utilitiesIncluded"] === "1" || null,
+          animalsAllowed = null,
+          pool = realEstatePropertiesFromDescriptions.pool,
+          urbanPlanPermit =
+            extractedData["op_realEstates_locationPermit"] === "1" ||
+            realEstatePropertiesFromDescriptions.urbanPlanPermit,
+          buildingPermit =
+            extractedData["op_realEstates_buildingPermit"] === "1" || null,
+          utilityConnection =
+            realEstatePropertiesFromDescriptions.utilityConnection,
+          distanceToRiver = null,
+          numberOfViewsAgency =
+            numberOfViewsAgencyParts.length > 1
+              ? parseInt(numberOfViewsAgencyParts[1])
+              : null;
+
         const title = extractedData["re_realEstates_portalName"];
         const extractedPrice = parseFloat(
           extractedData["re_realEstates_price"]
@@ -277,8 +422,6 @@ class RentalCrawler {
           };
         }
 
-        const adStatus = AD_STATUS.STATUS_NORMAL;
-
         const data = {
           url,
           agencyObjectId: rentalId,
@@ -303,7 +446,42 @@ class RentalCrawler {
           locationLong,
           adStatus,
           publishedDate: publishedDateMoment.toISOString(),
-          renewedDate: renewedDateMoment.toISOString()
+          renewedDate: renewedDateMoment.toISOString(),
+          numberOfRooms,
+          numberOfFloors,
+          floor,
+          accessRoadType,
+          heatingType,
+          furnishingType,
+          balcony,
+          newBuilding,
+          elevator,
+          water,
+          electricity,
+          drainageSystem,
+          registeredInZkBooks,
+          recentlyAdapted,
+          parking,
+          garage,
+          gas,
+          antiTheftDoor,
+          airCondition,
+          phoneConnection,
+          cableTV,
+          internet,
+          basementAttic,
+          storeRoom,
+          videoSurveillance,
+          alarm,
+          suitableForStudents,
+          includingBills,
+          animalsAllowed,
+          pool,
+          urbanPlanPermit,
+          buildingPermit,
+          utilityConnection,
+          distanceToRiver,
+          numberOfViewsAgency
         };
 
         return data;
@@ -350,6 +528,304 @@ class RentalCrawler {
     }
   }
 
+  getPropertiesFromDescriptions(descriptionIds) {
+    const result = {
+      accessRoadType: null,
+      furnishingType: null,
+      balcony: null,
+      elevator: null,
+      parking: null,
+      antiTheftDoor: null,
+      airCondition: null,
+      videoSurveillance: null,
+      alarm: null,
+      pool: null,
+      urbanPlanPermit: null,
+      utilityConnection: null,
+      water: null,
+      electricity: null
+    };
+
+    for (const descriptionId of descriptionIds) {
+      switch (descriptionId) {
+        case 16:
+          result.furnishingType = FURNISHING_TYPE.NOT_FURNISHED.id;
+          break;
+        case 17:
+          result.furnishingType = FURNISHING_TYPE.HALF_FURNISHED.id;
+          break;
+        case 1:
+        case 28:
+          result.furnishingType = FURNISHING_TYPE.FURNISHED.id;
+          break;
+        case 14:
+          result.elevator = true;
+          break;
+        case 39:
+          result.electricity = true;
+          break;
+        case 40:
+          result.water = true;
+          break;
+        case 41:
+        case 58:
+          result.accessRoadType = ACCESS_ROAD_TYPE.ASPHALT.id;
+          break;
+        case 26:
+          result.balcony = true;
+          break;
+        case 62:
+          result.parking = true;
+          break;
+        case 3:
+          result.antiTheftDoor = true;
+          break;
+        case 2:
+        case 21:
+          result.airCondition = true;
+          break;
+        case 4:
+          result.alarm = true;
+          break;
+        case 55:
+          result.videoSurveillance = true;
+          break;
+        case 9:
+          result.pool = true;
+          break;
+        case 60:
+          result.urbanPlanPermit = true;
+          break;
+        case 38:
+          result.utilityConnection = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getPropertiesFromSpaces(spaceIds) {
+    const result = {
+      balcony: null,
+      parking: null,
+      garage: null,
+      basementAttic: null,
+      storeRoom: null
+    };
+
+    for (const spaceId of spaceIds) {
+      switch (spaceId) {
+        case 36:
+        case 12:
+          result.parking = true;
+          break;
+        case 1:
+        case 2:
+        case 3:
+          result.balcony = true;
+          break;
+        case 4:
+        case 30:
+          result.garage = true;
+          break;
+        case 9:
+        case 10:
+          result.storeRoom = true;
+          break;
+        case 18:
+        case 34:
+        case 37:
+        case 27:
+          result.basementAttic = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getHeatingTypeId(heatingRentalId) {
+    // heatingRentalId can have multiple values, like: "1, 2, 3", parseInt will take first integer value
+    const heatingId = parseInt(heatingRentalId);
+    switch (heatingId) {
+      case 27:
+      case 16:
+        return HEATING_TYPE.GAS.id;
+      case 4:
+        return HEATING_TYPE.CENTRAL_GAS.id;
+      case 3:
+      case 23:
+      case 6:
+      case 7:
+      case 8:
+      case 9:
+      case 10:
+        return HEATING_TYPE.CENTRAL_BOILER.id;
+      case 2:
+      case 13:
+      case 30:
+      case 17:
+      case 29:
+      case 31:
+        return HEATING_TYPE.ELECTRICITY.id;
+      case 24:
+      case 25:
+      case 12:
+        return HEATING_TYPE.CENTRAL_CITY.id;
+      case 26:
+      case 21:
+      case 20:
+        return HEATING_TYPE.WOOD.id;
+      case 28:
+      case 19:
+        return HEATING_TYPE.HEAT_PUMP.id;
+      case 14:
+      case 32:
+        return HEATING_TYPE.OTHER.id;
+      default:
+        return null;
+    }
+  }
+
+  getPropertiesFromInfrastructure(infrastructureIds) {
+    const result = {
+      electricity: null,
+      water: null,
+      gas: null,
+      drainageSystem: null,
+      phoneConnection: null,
+      internet: null,
+      videoSurveillance: null,
+      cableTV: null
+    };
+
+    for (const infrastructureId of infrastructureIds) {
+      switch (infrastructureId) {
+        case 1:
+          result.electricity = true;
+          break;
+        case 2:
+          result.water = true;
+          break;
+        case 4:
+          result.gas = true;
+          break;
+        case 5:
+          result.drainageSystem = true;
+          break;
+        case 7:
+        case 8:
+          result.phoneConnection = true;
+          break;
+        case 10:
+          result.internet = true;
+          break;
+        case 11:
+          result.cableTV = true;
+          break;
+        case 16:
+        case 17:
+          result.videoSurveillance = true;
+          break;
+      }
+    }
+
+    return result;
+  }
+
+  getFloorNumberFromFloorId(floorsIdText) {
+    // floorIdText can be array of numbers, separated by comma or number
+    // just extracting floor number from first element
+
+    const floorsId = floorsIdText.split(",");
+    if (floorsId.length === 0) {
+      return null;
+    }
+
+    const firstFloorId = parseInt(floorsId[0]);
+
+    // 1 pod
+    // 2 sut
+    // 3 raz
+    // 4 pri
+    // 5 vpri
+    // 6 prv
+    // 7 dru
+    // 8 tre
+    // 9 čet
+    // 10 man
+    // 11
+    // 12 pot
+    // 13 vpot
+    // 14 tav
+    // 15 pet
+    const floorNumber = [
+      -1,
+      -1,
+      0,
+      0,
+      1,
+      1,
+      2,
+      3,
+      4,
+      null,
+      null,
+      null,
+      null,
+      null,
+      5
+    ];
+
+    return floorNumber[firstFloorId - 1] || null;
+  }
+
+  getNumberOfFloorsFromFloorId(floorsIdText) {
+    // floorIdText can be array of numbers, separated by comma or number
+
+    const floorIds = floorsIdText.split(",");
+    if (floorIds.length === 0) {
+      return null;
+    }
+    let noOfFloors = floorIds.length;
+    // Floors of 'suteren', 'podrum', 'tavan' and 'potkrovlje' are not counted
+    floorIds.forEach(id => {
+      if (
+        parseInt(id) === 1 ||
+        parseInt(id) === 2 ||
+        parseInt(id) === 12 ||
+        parseInt(id) === 14
+      ) {
+        noOfFloors--;
+      }
+    });
+    return noOfFloors;
+  }
+
+  checkBasemAtticFromFloors(floorsIdText) {
+    // floorIdText can be array of numbers, separated by comma or number
+    const floorIds = floorsIdText.split(",");
+
+    let check = false;
+
+    if (floorIds.length === 0) {
+      check = false;
+    }
+    //If floors 'suteren', 'podrum', 'tavan' and 'potkrovlje' exists then tag for basement-attic is true
+    floorIds.forEach(id => {
+      if (
+        parseInt(id) === 1 ||
+        parseInt(id) === 2 ||
+        parseInt(id) === 12 ||
+        parseInt(id) === 14
+      ) {
+        check = true;
+      }
+    });
+    return check;
+  }
+
   async sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
   }
@@ -362,7 +838,7 @@ class RentalCrawler {
     // }
 
     //For now, we use only Postgres saver, so ...
-    return await savers[0].save(results);
+    return savers[0].save(results);
     //so that we can use some sequelize options and information when data is inserted
   }
 }

app/crawler/specificCrawlers/saljic.js

@@ -0,0 +1,687 @@
+"use strict";
+
+const fetch = require("../../helpers/fetchWrapper");
+const { getUrlParams } = require("../../helpers/url");
+const cheerio = require("cheerio");
+const moment = require("moment-timezone");
+const PromisePool = require('@supercharge/promise-pool');
+
+const {
+  AD_TYPE,
+  AD_CATEGORY,
+  AD_AGENCY,
+  AD_STATUS,
+  CRAWLER_AD_TYPE,
+  FURNISHING_TYPE,
+  HEATING_TYPE
+} = require("../../common/enums");
+
+const {
+  PRINT_CRAWLER_DEBUG,
+  DEFAULT_TIMEZONE
+} = require("../../config/appConfig");
+const { SALJIC_FORCE_CRAWL } = require("../specificConfigs/saljic");
+
+const SALJIC_ENUMS = {
+  SALJIC_AD_TYPE: {
+    [CRAWLER_AD_TYPE.ALL]: "&input_vrsta=",
+    [CRAWLER_AD_TYPE.ONLY_SELL]: "&input_vrsta=1",
+    [CRAWLER_AD_TYPE.ONLY_RENT]: "&input_vrsta=2"
+  },
+  SALJIC_AD_CATEGORY: {
+    [AD_CATEGORY.ALL.id]: "&input_kategorija=",
+    [AD_CATEGORY.FLAT.id]: "&input_kategorija=15",
+    [AD_CATEGORY.HOUSE.id]: "&input_kategorija=9",
+    [AD_CATEGORY.LAND.id]: "&input_kategorija=5", //3 and 4 also gradjevinsko
+    [AD_CATEGORY.OFFICE.id]: "&input_kategorija=8",
+    [AD_CATEGORY.APARTMENT.id]: "&input_kategorija=1",
+    [AD_CATEGORY.GARAGE.id]: "&input_kategorija=2"
+    //[AD_CATEGORY.COTTAGE.id]: ""
+  }
+};
+
+class SaljicCrawler {
+  constructor(
+    savers = [],
+    crawlerAdTypes = CRAWLER_AD_TYPE.ALL,
+    crawlerAdCategories = [AD_CATEGORY.FLAT, AD_CATEGORY.HOUSE],
+    maxPages = 5000,
+    maxResultsPerPage = 5000,
+    ignoredUsernames = [],
+    delayBetweenPages = 500
+  ) {
+    this.savers = savers;
+    this.baseUrl = "https://www.saljicnekretnine.ba/v2/nekretnine_search";
+    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));
+      }
+      //
+      //console.log(indexGenerators);
+      //
+      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 &&
+              !SALJIC_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 = SALJIC_ENUMS.SALJIC_AD_TYPE[this.crawlerAdTypes];
+    const urlCategoryPart = SALJIC_ENUMS.SALJIC_AD_CATEGORY[adCategory];
+
+    if (urlAdTypePart !== undefined && urlCategoryPart !== undefined) {
+      while (true) {
+        const urlPagePart = pageToIndex === 1 ? "" : (pageToIndex - 1) * 2 * 11;
+        const urlPageToCrawl = `${this.baseUrl}?order_by=${urlAdTypePart}${urlCategoryPart}&per_page=${urlPagePart}`;
+
+        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("[SALJIC] Index page : ", url);
+    }
+
+    try {
+      const res = await fetch(url, {}, false);
+      const body = await res.text();
+      const $ = cheerio.load(body);
+      let hrefs = [];
+
+      $("#shop")
+        .find(".product")
+        .each((i, elem) => {
+          const href = $(elem)
+            .find("a")
+            .first()
+            .attr("href");
+          if (href) {
+            hrefs.push(href);
+          }
+        });
+
+      let adTypesTmp = [];
+
+      $("#shop")
+        .find(".product")
+        .each((i, elem) => {
+          const adType = $(elem)
+            .find(".trakica-search-page")
+            .text()
+            .trim();
+          if (adType) {
+            adTypesTmp.push(adType);
+          }
+        });
+
+      //Converting to AD_TYPE
+      const adTypes = adTypesTmp.map(adTypeText => {
+        return this.getAdTypeId(adTypeText);
+      });
+
+      //Converting to absolute URLs
+      const hrefsAbs = hrefs.map(link => {
+        return "https://www.saljicnekretnine.ba" + link;
+      });
+
+      let actualNoOfResults =
+        hrefsAbs.length <= maxResultsPerPage
+          ? hrefsAbs.length
+          : maxResultsPerPage;
+
+      const asyncScraping = [];
+      for (let i = 0; i < actualNoOfResults; i++) {
+        asyncScraping.push([hrefsAbs[i], adTypes[i]]);
+      }
+
+      
+
+      const dataResults = []
+      const { scrapedData, errors } = await PromisePool
+        .withConcurrency(2)
+        .for(asyncScraping)
+        .process(async data => {
+          const result = await this.scrapeAd(...data)
+          await this.sleep(this.delayBetweenPages);
+          dataResults.push(result)
+          return result; //TODO: this does not work, scrapedData is null, dataResults works
+        })
+
+      const filteredScrapedData = dataResults.filter(adData => !!adData);
+      return filteredScrapedData;
+    } catch (e) {
+      console.error("[SALJIC] Exception caught:" + e);
+      return [];
+    }
+  }
+
+  async scrapeAd(url, adType) {
+    // console.log("[SALJIC] Scraping : ", url);
+    try {
+      const adPageSource = await fetch(url);
+      const body = await adPageSource.text();
+      const $ = cheerio.load(body);
+
+      if (body.indexOf('<html') === -1) {
+        throw { message: 'Failed to fetch page !' }
+      }
+
+      // No information for status ex. PRODAN
+      const status = AD_STATUS.STATUS_NORMAL;
+      //Extracting agency ID from url
+      const agencyObjectId = url
+        ? parseInt(url.substring(46, url.length))
+        : null;
+
+      if (!agencyObjectId) {
+        throw { message : 'No agency object ID - URL changed?'}
+      }
+
+      //Extracting main properties
+      const propertySelectors = {
+        title:
+          "div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.entry-title > h2",
+        price:
+          "div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.topmargin-sm.single-product > div.product > div.product-price > ins",
+        streetName:
+          "div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.entry-content.topmargin > p",
+        descriptions:
+          "div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.entry-content.topmargin > div.toggle.toggle-bg > div.togglec >p:nth-child(1)",
+        latAndLong:
+          "iframe"
+      };
+      const title = $(propertySelectors.title)
+        .text()
+        .replace(/(\r\n|\n|\r)/gm, "")
+        .replace(/ {1,}/g, " ")
+        .trim();
+
+      const priceText = $(propertySelectors.price)
+        .text()
+        .replace(/(\r\n|\n|\r)/gm, "")
+        .replace(/ {1,}/g, " ")
+        .trim();
+      const price =
+        priceText === "CIJENA NA UPIT"
+          ? null
+          : parseFloat(
+              priceText.substring(8, priceText.length - 3).replace(",", "")
+            );
+
+      const streetName = $(propertySelectors.streetName)
+        .text()
+        .replace(/(\r\n|\n|\r)/gm, "")
+        .trim();
+
+      const descriptions = $(propertySelectors.descriptions)
+        .text()
+        .replace(/\"/g, "")
+        .trim();
+
+      const latAndLongSrc = $(propertySelectors.latAndLong).attr("src");
+      let latText;
+      let longText;
+      if (latAndLongSrc){
+        const mapParams = getUrlParams(latAndLongSrc);
+        if (mapParams) {
+          if (mapParams['marker']){
+            const marker = mapParams['marker'].split(',');
+            latText = marker[0] ? marker[0] : undefined;
+            longText = marker[1] ? marker[1] : undefined;
+          }else{
+            if (mapParams['mlat']) {
+              latText = mapParams['mlat'];
+            }
+            if (mapParams['mlon']) {
+              longText = mapParams['mlon'];
+            }
+          }
+        }
+      }
+
+      const locationLat = parseFloat(latText) || null;
+      const locationLong = parseFloat(longText) || null;
+
+      //====== DETAIL INFORMATION FIELDS ==========
+      let area = null,
+        gardenSize = null,
+        numberOfRooms = null,
+        numberOfFloors = null,
+        floor = null,
+        accessRoadType = null,
+        heatingType = null,
+        furnishingType = null,
+        balcony = null,
+        newBuilding = null,
+        elevator = null,
+        water = null,
+        electricity = null,
+        drainageSystem = null,
+        registeredInZkBooks = null,
+        recentlyAdapted = null,
+        parking = null,
+        garage = null,
+        gas = null,
+        antiTheftDoor = null,
+        airCondition = null,
+        phoneConnection = null,
+        cableTV = null,
+        internet = null,
+        basementAttic = null,
+        storeRoom = null,
+        videoSurveillance = null,
+        alarm = null,
+        suitableForStudents = null,
+        includingBills = null,
+        animalsAllowed = null,
+        pool = null,
+        exchange = null,
+        urbanPlanPermit = null,
+        buildingPermit = null,
+        utilityConnection = null,
+        distanceToRiver = null;
+      let publishedDate = null;
+      let renewedDate = null;
+      let realEstateType;
+      let numberOfViewsAgency = null;
+      let numberOfViewsKivi = null;
+      let streetNumber = 0;
+      let adStatus = status;
+      let shortDescription = descriptions
+        ? descriptions.substring(0, descriptions.indexOf("."))
+        : "";
+      let longDescription = descriptions || "";
+      //Extracting data - Glavne karakteristike
+      let mainFieldIndex = 1;
+      do {
+        const mainFieldSelector = `div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.entry-content.topmargin > div.col-md-12.bottommargin > ul > li.list-group-item:nth-child(${mainFieldIndex})`;
+
+        const mainField = $(mainFieldSelector)
+          .text()
+          .replace(/[\n\r\t]/gm, "")
+          .trim();
+
+        const mainFieldTitle = mainField
+          ? mainField.substring(0, mainField.indexOf("  "))
+          : "";
+        const mainFieldValue = mainField
+          ? mainField
+              .substring(mainField.indexOf("  "), mainField.length)
+              .trim()
+          : "";
+
+        switch (mainFieldTitle) {
+          case "Površina":
+            area = parseFloat(
+              mainFieldValue.substring(0, mainFieldValue.indexOf(" "))
+            );
+            break;
+          case "Okućnica":
+            gardenSize = parseFloat(
+              mainFieldValue.substring(0, mainFieldValue.indexOf(" "))
+            );
+            break;
+          case "Broj soba":
+            numberOfRooms = parseInt(mainFieldValue);
+            break;
+          case "Broj spratova":
+            numberOfFloors = this.parseNumberOfFloors(mainFieldValue);
+            break;
+          case "Sprat":
+            floor = parseInt(mainFieldValue);
+            break;
+          case "Godina renoviranja":
+            recentlyAdapted = true;
+            break;
+          case "Broj parking mjesta":
+            parking = true;
+            break;
+          case "Dostupno od":
+            const day = mainFieldValue.substring(0, 2);
+            const month = mainFieldValue.substring(3, 5);
+            const year = mainFieldValue.substring(6, mainFieldValue.length);
+            publishedDate = new Date(`${month}/${day}/${year}`);
+            break;
+          default:
+            break;
+        }
+
+        if (mainFieldTitle === "") {
+          break;
+        }
+        mainFieldIndex++;
+      } while (true);
+
+      //Extracting data - Sadrzaji
+      let additionalFieldIndex = 1;
+      do {
+        const additionalFieldSelector = `div.content-wrap > div.container > div.col-md-8.nobottommargin > div.single-post > div.entry > div.entry-content.topmargin > div.col-md-12.bottommargin > ul > li.border-color.col-md-5.col-md-offset-1.col-md-pull-1.list-group-item-bottom:nth-child(${additionalFieldIndex})`;
+
+        const additionalField = $(additionalFieldSelector)
+          .text()
+          .trim();
+
+        if (additionalFieldIndex === 1) {
+          //Extracting data of real estate type
+          const categoryTmp = additionalField
+            .replace(/[\n\r\t]/gm, "")
+            .substring(
+              additionalField.indexOf("Kategorija") + 10,
+              additionalField.length
+            )
+            .trim();
+          realEstateType = this.getAdCategoryId(categoryTmp);
+          if (!realEstateType) {
+            throw { message: 'No real estate type - page body not loaded correctly or page changed?' }
+          }
+        } else {
+          switch (additionalField) {
+            case "Internet":
+              internet = true;
+              break;
+            case "Garaža":
+              garage = true;
+              break;
+            case "Klima":
+              airCondition = true;
+              break;
+            case "Balkon":
+              balcony = true;
+              break;
+            case "Ostava":
+              storeRoom = true;
+              break;
+            case "Podrum":
+              basementAttic = true;
+              break;
+            case "Blindirana vrata":
+              antiTheftDoor = true;
+              break;
+            case "Voda":
+              water = true;
+              break;
+            case "Kablovska":
+              cableTV = true;
+              break;
+            case "Uknjiženo":
+              registeredInZkBooks = true;
+              break;
+            case "Grijanje - centralno":
+              heatingType = HEATING_TYPE.CENTRAL_CITY.id;
+              break;
+            case "Grijanje - plin":
+              heatingType = HEATING_TYPE.GAS.id;
+              break;
+            case "Grijanje - struja":
+              heatingType = HEATING_TYPE.ELECTRICITY.id;
+              break;
+            case "Grijanje":
+              heatingType = HEATING_TYPE.OTHER.id;
+              break;
+            case "Plin":
+              gas = true;
+              break;
+            case "Namješten":
+              furnishingType = FURNISHING_TYPE.FURNISHED.id;
+              break;
+            case "Alarm":
+              alarm = true;
+              break;
+            case "Video nadzor":
+              videoSurveillance = true;
+              break;
+            case "Lift":
+              elevator = true;
+              break;
+            case "Novogradnja":
+              newBuilding = true;
+              break;
+
+            default:
+              break;
+          }
+        }
+
+        if (additionalField === "") {
+          break;
+        }
+        additionalFieldIndex++;
+      } while (true);
+
+      //If no published date it takes current date of crawling
+      if (publishedDate) {
+        renewedDate = new Date();
+      } else {
+        publishedDate = new Date();
+        renewedDate = new Date();
+      }
+
+      const originAgencyName = AD_AGENCY.SALJIC;
+      const locality = "";
+      const municipality = "";
+      const city = "";
+      const region = "";
+      const entity = "";
+      const country = "";
+
+      const data = {
+        url,
+        agencyObjectId,
+        originAgencyName,
+        realEstateType,
+        adType,
+        title,
+        price,
+        area,
+        gardenSize,
+        shortDescription,
+        longDescription,
+        streetNumber,
+        streetName,
+        locality,
+        municipality,
+        city,
+        region,
+        entity,
+        country,
+        locationLat,
+        locationLong,
+        adStatus,
+        publishedDate,
+        renewedDate,
+        numberOfRooms,
+        numberOfFloors,
+        floor,
+        accessRoadType,
+        heatingType,
+        furnishingType,
+        balcony,
+        newBuilding,
+        elevator,
+        water,
+        electricity,
+        drainageSystem,
+        registeredInZkBooks,
+        recentlyAdapted,
+        parking,
+        garage,
+        gas,
+        antiTheftDoor,
+        airCondition,
+        phoneConnection,
+        cableTV,
+        internet,
+        basementAttic,
+        storeRoom,
+        videoSurveillance,
+        alarm,
+        suitableForStudents,
+        includingBills,
+        animalsAllowed,
+        pool,
+        exchange,
+        urbanPlanPermit,
+        buildingPermit,
+        utilityConnection,
+        distanceToRiver,
+        numberOfViewsAgency,
+        numberOfViewsKivi
+      };
+
+      return data;
+    } catch (e) {
+      console.error("[SALJIC] Exception caught: " + e.message, "\r\nURL:", url);
+    }
+    return null;
+  }
+
+  //======= HELPER FUNCTIONS =============
+
+  getAdCategoryId(categoryText) {
+    switch (categoryText) {
+      case "Stan":
+        return AD_CATEGORY.FLAT.id;
+      case "Građevinsko zemljiste":
+        return AD_CATEGORY.LAND.id;
+      case "Industrijsko zemljiste":
+        return AD_CATEGORY.LAND.id;
+      case "Poljoprivredno zemljiste":
+        return AD_CATEGORY.LAND.id;
+      case "Kuća":
+        return AD_CATEGORY.HOUSE.id;
+      case "Poslovni prostor":
+        return AD_CATEGORY.OFFICE.id;
+      case "Kancelarije":
+        return AD_CATEGORY.OFFICE.id;
+      case "Apartmani":
+        return AD_CATEGORY.APARTMENT.id;
+      case "Garaža":
+        return AD_CATEGORY.GARAGE.id;
+      case "Vikendica":
+        return AD_CATEGORY.COTTAGE.id;
+      default:
+        return undefined;
+    }
+  }
+
+  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;
+    }
+  }
+
+  parseNumberOfFloors(numberOfFloorsText) {
+    const tryNumericalValue = parseInt(numberOfFloorsText);
+    if (!isNaN(tryNumericalValue)){
+      return tryNumericalValue;
+    }
+
+    // Guess number of floors based on number of + sign concatenations
+    // e.g. P+S+Pt -> 3 floors
+    if (typeof numberOfFloorsText === 'string' && numberOfFloorsText.indexOf('+') > 0) {
+      return numberOfFloorsText.split('+').length + 1
+    }
+
+    return null
+  }
+
+  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 savers[0].save(results);
+    //so that we can use some sequelize options and information when data is inserted
+  }
+}
+
+module.exports = SaljicCrawler;

app/helpers/db/priceHistory.js

@@ -0,0 +1,20 @@
+"use strict";
+const db = require("../../models/index");
+const sequelize = require("sequelize");
+
+const bulkUpsertPriceHistory = async priceHistoryData => {
+  try {
+    const order = [["realEstateId", "desc"]];
+
+    return await db.PriceHistory.bulkCreate(priceHistoryData, {
+      order,
+      ignoreDuplicates: true
+    });
+  } catch (e) {
+    console.log("Error bulk upserting priceHistory : ", e);
+  }
+};
+
+module.exports = {
+  bulkUpsertPriceHistory
+};

app/helpers/db/realEstate.js

@@ -2,6 +2,7 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
+const { AD_CATEGORY } = require("../../common/enums");
 
 const bulkUpsertRealEstates = async realEstateData => {
   try {
@@ -26,7 +27,42 @@ const bulkUpsertRealEstates = async realEstateData => {
       "gardenSize",
       "adStatus",
       "updatedAt",
-      "renewedDate"
+      "renewedDate",
+      "numberOfRooms",
+      "numberOfFloors",
+      "floor",
+      "accessRoadType",
+      "heatingType",
+      "furnishingType",
+      "balcony",
+      "newBuilding",
+      "elevator",
+      "water",
+      "electricity",
+      "drainageSystem",
+      "registeredInZkBooks",
+      "recentlyAdapted",
+      "parking",
+      "garage",
+      "gas",
+      "antiTheftDoor",
+      "airCondition",
+      "phoneConnection",
+      "cableTV",
+      "internet",
+      "basementAttic",
+      "storeRoom",
+      "videoSurveillance",
+      "alarm",
+      "suitableForStudents",
+      "includingBills",
+      "animalsAllowed",
+      "pool",
+      "urbanPlanPermit",
+      "buildingPermit",
+      "utilityConnection",
+      "distanceToRiver",
+      "numberOfViewsAgency"
     ];
     const order = [["updatedAt", "desc"]];
 
@@ -52,9 +88,26 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     sizeMax,
     adType,
     realEstateType,
-    areaToSearch
+    areaToSearch,
+    gardenSizeMin,
+    gardenSizeMax,
+    numberOfRoomsMin,
+    numberOfRoomsMax,
+    numberOfFloorsMin,
+    numberOfFloorsMax,
+    floorMin,
+    floorMax,
+    includeIncompleteAds,
+    includeWithoutPrice,
+    balcony,
+    elevator,
+    newBuilding,
+    accessRoadType
   } = searchRequest;
 
+  //Needed for defining which attribute should exist or not
+  const realEstateTypeObject = AD_CATEGORY[realEstateType];
+
   const longitudeColumn = sequelize.col("locationLong");
   const latitudeColumn = sequelize.col("locationLat");
 
@@ -81,13 +134,12 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
 
   const geoSearchQueryPart = sequelize.where(contains, true);
 
+  //General queries contain only attributes that are defined for every searchreq
+
+  //Query for case of complete ads
   const query = {
     adType,
     realEstateType,
-    price: {
-      [Op.lte]: priceMax,
-      [Op.gte]: priceMin
-    },
     area: {
       [Op.lte]: sizeMax,
       [Op.gte]: sizeMin
@@ -95,10 +147,199 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     [Op.and]: geoSearchQueryPart
   };
 
+  //Query for case of incomplete ads
+  const queryIncludeIncomplete = {
+    adType,
+    realEstateType,
+    area: {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: sizeMax,
+          [Op.gte]: sizeMin
+        },
+        [Op.is]: null
+      }
+    },
+    [Op.and]: geoSearchQueryPart
+  };
+
+  //Is user unchecked includeWithoutPrice FALSE then it shouldn't return null values of price
+  //If not then null values are accepted (this is DEFAULT)
+  //includeIncpompleteAds does not have effect on price query
+  if (includeWithoutPrice) {
+    query.price = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: priceMax,
+          [Op.gte]: priceMin
+        },
+        [Op.is]: null
+      }
+    };
+    queryIncludeIncomplete.price = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: priceMax,
+          [Op.gte]: priceMin
+        },
+        [Op.is]: null
+      }
+    };
+  } else {
+    query.price = {
+      [Op.and]: {
+        [Op.lte]: priceMax,
+        [Op.gte]: priceMin
+      }
+    };
+    queryIncludeIncomplete.price = {
+      [Op.and]: {
+        [Op.lte]: priceMax,
+        [Op.gte]: priceMin
+      }
+    };
+  }
+  //Every other attribute is checked separately and included in query only if it is defined for real estate type
+
+  if (
+    realEstateTypeObject.hasGardenSize &&
+    gardenSizeMax != null &&
+    gardenSizeMin != null
+  ) {
+    query.gardenSize = {
+      [Op.lte]: gardenSizeMax,
+      [Op.gte]: gardenSizeMin
+    };
+    queryIncludeIncomplete.gardenSize = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: gardenSizeMax,
+          [Op.gte]: gardenSizeMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (
+    realEstateTypeObject.hasNumberOfRoom &&
+    numberOfRoomsMin != null &&
+    numberOfRoomsMax != null
+  ) {
+    query.numberOfRooms = {
+      [Op.lte]: numberOfRoomsMax,
+      [Op.gte]: numberOfRoomsMin
+    };
+    queryIncludeIncomplete.numberOfRooms = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: numberOfRoomsMax,
+          [Op.gte]: numberOfRoomsMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (
+    realEstateTypeObject.hasNumberOfFloors &&
+    numberOfFloorsMin != null &&
+    numberOfFloorsMax != null
+  ) {
+    query.numberOfFloors = {
+      [Op.lte]: numberOfFloorsMax,
+      [Op.gte]: numberOfFloorsMin
+    };
+    queryIncludeIncomplete.numberOfFloors = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: numberOfFloorsMax,
+          [Op.gte]: numberOfFloorsMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (
+    realEstateTypeObject.hasFloorProp &&
+    floorMin != null &&
+    floorMax != null
+  ) {
+    query.floor = {
+      [Op.lte]: floorMax,
+      [Op.gte]: floorMin
+    };
+    queryIncludeIncomplete.floor = {
+      [Op.or]: {
+        [Op.and]: {
+          [Op.lte]: floorMax,
+          [Op.gte]: floorMin
+        },
+        [Op.is]: null
+      }
+    };
+  }
+  //Logic for balcony, newBuilding and elevator from users side
+  //If true is checked, then I want characteristic to be true but,
+  //if it is not checked, then I dont care - it can be null or false or true
+  if (realEstateTypeObject.hasBalconyProp && balcony === true) {
+    query.balcony = {
+      [Op.eq]: balcony
+    };
+    queryIncludeIncomplete.balcony = {
+      [Op.or]: {
+        [Op.eq]: balcony,
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (realEstateTypeObject.hasNewBuildingProp && newBuilding === true) {
+    query.newBuilding = {
+      [Op.eq]: newBuilding
+    };
+    queryIncludeIncomplete.newBuilding = {
+      [Op.or]: {
+        [Op.eq]: newBuilding,
+        [Op.is]: null
+      }
+    };
+  }
+
+  if (realEstateTypeObject.hasElevatorProp && elevator === true) {
+    query.elevator = {
+      [Op.eq]: elevator
+    };
+    queryIncludeIncomplete.elevator = {
+      [Op.or]: {
+        [Op.eq]: elevator,
+        [Op.is]: null
+      }
+    };
+  }
+  //If user wants 'ANY' road type acces then it is not included in query -
+  //returns every road type and null values
+  if (accessRoadType !== "ANY") {
+    query.accessRoadType = {
+      [Op.eq]: accessRoadType
+    };
+    queryIncludeIncomplete.accessRoadType = {
+      [Op.or]: {
+        [Op.eq]: accessRoadType,
+        [Op.is]: null
+      }
+    };
+  }
+
+  //When includeIncompleteAds are not defined - null it will consider it true
   const order = [["updatedAt", "desc"]];
 
-  return await db.RealEstate.findAll({
-    where: query,
+  return db.RealEstate.findAll({
+    where:
+      includeIncompleteAds || includeIncompleteAds == null
+        ? queryIncludeIncomplete
+        : query,
     limit: maxResults,
     order
   });

app/helpers/db/searchRequest.js

@@ -2,11 +2,14 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
+const { AD_CATEGORY } = require("../../common/enums");
+const { CHECK_UP_DAYS } = require("../../config/appConfig");
 
 const getSearchRequest = async searchRequestId => {
   try {
     return await db.SearchRequest.findByPk(searchRequestId);
   } catch (error) {
+    console.log("searchrequest.js", error);
     return null;
   }
 };
@@ -14,6 +17,22 @@ const getSearchRequest = async searchRequestId => {
 const createSearchRequest = async (searchRequestFields = {}) => {
   return await db.SearchRequest.create(searchRequestFields);
 };
+const findAllRequestsForCheckUp = async () => {
+  const checkUpOffset = 24 * 60 * 60 * 1000 * CHECK_UP_DAYS; //in miliseconds
+  const checkupDate = new Date();
+  checkupDate.setTime(checkupDate.getTime() - checkUpOffset);
+
+  const dateQuery = {
+    notifiedAt: {
+      [Op.lte]: checkupDate
+    }
+  };
+  const allRequestsForCheckUp = await db.SearchRequest.findAll({
+    where: dateQuery
+  });
+
+  return allRequestsForCheckUp;
+};
 
 const findSearchRequestsForRealEstate = async realEstate => {
   const {
@@ -22,7 +41,15 @@ const findSearchRequestsForRealEstate = async realEstate => {
     adType,
     realEstateType,
     locationLat,
-    locationLong
+    locationLong,
+    accessRoadType,
+    balcony,
+    newBuilding,
+    elevator,
+    gardenSize,
+    numberOfRooms,
+    numberOfFloors,
+    floor
   } = realEstate;
 
   if (!locationLat || !locationLong) {
@@ -39,36 +66,416 @@ const findSearchRequestsForRealEstate = async realEstate => {
 
   const geoSearchQueryPart = sequelize.where(contains, true);
 
+  //Needed for defining which attribute should exist or not
+  const realEstateTypeObject = AD_CATEGORY[realEstateType];
+
+  // ?? Needed to decide on including incomplete RealEstates data
+  let checkForIncompleteWanted = false;
+
+  //Attributes are checked separately to make different query parts
+
+  //If real estate price is number then it searches for req that have priceMin and priceMax
+  //If real estate price is null it searches for req that accept ads without price
+  //User always defines price and area (sliders) - not null in search req
+  let priceQuery = {};
+  if (price != null) {
+    priceQuery = {
+      [Op.and]: [
+        {
+          priceMin: {
+            [Op.lte]: price
+          }
+        },
+        {
+          priceMax: {
+            [Op.gte]: price
+          }
+        }
+      ]
+    };
+  } else {
+    priceQuery = {
+      includeWithoutPrice: {
+        [Op.eq]: true
+      }
+    };
+  }
+
+  let areaQuery = {};
+  if (area != null) {
+    areaQuery = {
+      [Op.and]: [
+        {
+          sizeMin: {
+            [Op.lte]: area
+          }
+        },
+        {
+          sizeMax: {
+            [Op.gte]: area
+          }
+        }
+      ]
+    };
+  } else {
+    checkForIncompleteWanted = true;
+  }
+
+  //Other attributes can be defined or not depending on RealEstate type
+  //we check what to include in query based on real estate type object
+  let gardenSizeQuery = {};
+  if (realEstateTypeObject.hasGardenSize) {
+    if (gardenSize != null) {
+      gardenSizeQuery = {
+        [Op.and]: [
+          {
+            gardenSizeMin: {
+              [Op.lte]: gardenSize
+            }
+          },
+          {
+            gardenSizeMax: {
+              [Op.gte]: gardenSize
+            }
+          }
+        ]
+      };
+    } else {
+      checkForIncompleteWanted = true;
+    }
+  }
+
+  let numberOfRoomsQuery = {};
+  if (realEstateTypeObject.hasNumberOfRoom) {
+    if (numberOfRooms != null) {
+      //If real estate has defined number of rooms ex. 3 it returns req
+      // that accepts 3 rooms or ones that don't have defined number - null
+      //Ex. they didnt choose advanced filters at all
+      numberOfRoomsQuery = {
+        [Op.and]: [
+          {
+            numberOfRoomsMin: {
+              [Op.or]: {
+                [Op.lte]: numberOfRooms,
+                [Op.is]: null
+              }
+            }
+          },
+          {
+            numberOfRoomsMax: {
+              [Op.or]: {
+                [Op.gte]: numberOfRooms,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    } else {
+      // If real estate dont have defined number of rooms ex. null
+      //It returns requests that didn't choose number of rooms - also null
+      //Or ones that picked some values but also picked to includeIncomplete ads (or default)
+      numberOfRoomsQuery = {
+        [Op.or]: [
+          {
+            [Op.and]: [
+              {
+                numberOfRoomsMin: {
+                  [Op.is]: null
+                }
+              },
+              {
+                numberOfRoomsMax: {
+                  [Op.is]: null
+                }
+              }
+            ]
+          },
+          {
+            includeIncompleteAds: {
+              [Op.or]: {
+                [Op.eq]: true,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    }
+  }
+  //Same logic for number of Floors and floors
+  let numberOfFloorsQuery = {};
+  if (realEstateTypeObject.hasNumberOfFloors) {
+    if (numberOfFloors != null) {
+      numberOfFloorsQuery = {
+        [Op.and]: [
+          {
+            numberOfFloorsMin: {
+              [Op.or]: {
+                [Op.lte]: numberOfFloors,
+                [Op.is]: null
+              }
+            }
+          },
+          {
+            numberOfFloorsMax: {
+              [Op.or]: {
+                [Op.gte]: numberOfFloors,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    } else {
+      numberOfFloorsQuery = {
+        [Op.or]: [
+          {
+            [Op.and]: [
+              {
+                numberOfFloorsMin: {
+                  [Op.is]: null
+                }
+              },
+              {
+                numberOfFloorsMax: {
+                  [Op.is]: null
+                }
+              }
+            ]
+          },
+          {
+            includeIncompleteAds: {
+              [Op.or]: {
+                [Op.eq]: true,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    }
+  }
+  let floorQuery = {};
+  if (realEstateTypeObject.hasFloorProp) {
+    if (floor != null) {
+      floorQuery = {
+        [Op.and]: [
+          {
+            floorMin: {
+              [Op.or]: {
+                [Op.lte]: floor,
+                [Op.is]: null
+              }
+            }
+          },
+          {
+            floorMax: {
+              [Op.or]: {
+                [Op.gte]: floor,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    } else {
+      floorQuery = {
+        [Op.or]: [
+          {
+            [Op.and]: [
+              {
+                floorMin: {
+                  [Op.is]: null
+                }
+              },
+              {
+                floorMax: {
+                  [Op.is]: null
+                }
+              }
+            ]
+          },
+          {
+            includeIncompleteAds: {
+              [Op.or]: {
+                [Op.eq]: true,
+                [Op.is]: null
+              }
+            }
+          }
+        ]
+      };
+    }
+  }
+
+  //Logic for balcony, newBuilding and elevator
+  //If user dont check checkbox for ex. elevator  it does not mean he only wants no elevator
+  //If real estate characteristic =true find all req, one that wants charachertistic or dont care - dont need query
+  //If real estate characteristic = false, find all req exept for ones that wants characteristic to be true
+  //If real estate characteristic = null, dont know if true or false, find req that dont care or want char and want incomplete ads
+  let balconyQuery = {};
+  if (realEstateTypeObject.hasBalconyProp && balcony !== true) {
+    if (balcony === false) {
+      balconyQuery = {
+        balcony: {
+          [Op.ne]: true
+        }
+      };
+    } else if (balcony === null) {
+      balconyQuery = {
+        [Op.or]: [
+          {
+            balcony: {
+              [Op.ne]: true
+            }
+          },
+          {
+            [Op.and]: [
+              {
+                balcony: {
+                  [Op.eq]: true
+                }
+              },
+              {
+                includeIncompleteAds: {
+                  [Op.or]: {
+                    [Op.eq]: true,
+                    [Op.is]: null
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      };
+    }
+  }
+  let newBuildingQuery = {};
+  if (realEstateTypeObject.hasNewBuildingProp && newBuilding !== true) {
+    if (newBuilding === false) {
+      newBuildingQuery = {
+        newBuilding: {
+          [Op.ne]: true
+        }
+      };
+    } else if (newBuilding === null) {
+      newBuildingQuery = {
+        [Op.or]: [
+          {
+            newBuilding: {
+              [Op.ne]: true
+            }
+          },
+          {
+            [Op.and]: [
+              {
+                newBuilding: {
+                  [Op.eq]: true
+                }
+              },
+              {
+                includeIncompleteAds: {
+                  [Op.or]: {
+                    [Op.eq]: true,
+                    [Op.is]: null
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      };
+    }
+  }
+  let elevatorQuery = {};
+  if (realEstateTypeObject.hasElevatorProp && elevator !== true) {
+    if (elevator === false) {
+      elevatorQuery = {
+        elevator: {
+          [Op.ne]: true
+        }
+      };
+    } else if (elevator === null) {
+      elevatorQuery = {
+        [Op.or]: [
+          {
+            elevator: {
+              [Op.ne]: true
+            }
+          },
+          {
+            [Op.and]: [
+              {
+                elevator: {
+                  [Op.eq]: true
+                }
+              },
+              {
+                includeIncompleteAds: {
+                  [Op.or]: {
+                    [Op.eq]: true,
+                    [Op.is]: null
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      };
+    }
+  }
+  //General query consists of each individual query
   const query = {
     adType,
     realEstateType,
     subscribed: true,
-    [Op.and]: geoSearchQueryPart
+    [Op.and]: [
+      geoSearchQueryPart,
+      priceQuery,
+      areaQuery,
+      gardenSizeQuery,
+      numberOfRoomsQuery,
+      numberOfFloorsQuery,
+      floorQuery,
+      balconyQuery,
+      newBuildingQuery,
+      elevatorQuery
+    ]
   };
 
-  if (price) {
-    query.priceMin = {
-      [Op.lte]: price
+  //AccessRoadType is defined - should exists for each ad and estate type
+  if (accessRoadType != null) {
+    query.accessRoadType = {
+      [Op.or]: {
+        [Op.like]: "ANY",
+        [Op.eq]: accessRoadType
+      }
     };
-    query.priceMax = {
-      [Op.gte]: price
+  } else {
+    //Null values are returned for user request that wanted ANY acces road type
+    query.accessRoadType = {
+      [Op.eq]: "ANY"
+    };
+  }
+  //Tag to check if incomplete ads are accepted in query which is default
+  if (checkForIncompleteWanted) {
+    query.includeIncompleteAds = {
+      [Op.or]: {
+        [Op.eq]: true,
+        [Op.is]: null
+      }
     };
   }
 
-  if (area) {
-    query.sizeMin = {
-      [Op.lte]: area
-    };
-    query.sizeMax = {
-      [Op.gte]: area
-    };
-  }
-
-  return await db.SearchRequest.findAll({ where: query });
+  return await db.SearchRequest.findAll({
+    where: query
+  });
 };
 
 module.exports = {
   getSearchRequest,
   createSearchRequest,
-  findSearchRequestsForRealEstate
+  findSearchRequestsForRealEstate,
+  findAllRequestsForCheckUp
 };

app/helpers/db/searchRequestMatch.js

@@ -1,5 +1,7 @@
 "use strict";
 const db = require("../../models/index");
+const sequelize = require("sequelize");
+const Op = sequelize.Op;
 
 const findRealEstatesForSearchRequest = async searchRequestId => {
   const query = {

app/helpers/emailContentGenerator.js

@@ -1,10 +1,19 @@
 "use strict";
 
-const { MAX_REAL_ESTATES_IN_EMAIL, APP_URL } = require("../config/appConfig");
-const { AD_CATEGORY } = require("../common/enums");
+const {
+  MAX_REAL_ESTATES_IN_EMAIL,
+  APP_URL,
+  STAGING
+} = require("../config/appConfig");
+const { AD_CATEGORY, AD_TYPE, EMAIL_FREQUENCY } = 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>
+//Tag to recognize staging from development
+const stagingTag = STAGING ? "[STAGING] " : "";
+const wordOfMouthRequest = `Molimo vas <strong>recite svojim prijateljima</strong> za Kivi - što više korisnika budemo imali, moći ćemo više agencija uključiti i više nekretnina imati u bazi. Hvala!`
+
+const generateEmailFooter = (searchRequestId, emailFrequencyTitle) => {
+  return `  <div>Trenutno ste prijavljeni da obavještenja o novim nekretninama primate <strong>${emailFrequencyTitle.toLowerCase()} </strong>.</div>
+    <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>`;
@@ -23,17 +32,24 @@ const generateRealEstateLinks = realEstates => {
 const generateNotificationEmail = (
   realEstates,
   searchRequestId,
+  noAllRealEstates,
   dailyNotification = false
 ) => {
   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 emailFrequencyTitle = dailyNotification
+    ? EMAIL_FREQUENCY.DAILY.title
+    : EMAIL_FREQUENCY.ASAP.title;
+
   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);
+  const moreRealEstates = `<div>Kompletan spisak nekretnina (${noAllRealEstates}) možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
+  const emailFooter = generateEmailFooter(searchRequestId, emailFrequencyTitle);
   const asapMessageBody =
     realEstates.length > 1
       ? "Pronašli smo nekretnine koje odgovaraju Vašoj pretrazi"
@@ -46,7 +62,7 @@ const generateNotificationEmail = (
 
   const messageBody = dailyNotification ? dailyMessageBody : asapMessageBody;
 
-  return `<h3>Zdravo</h3>
+  return `<h3>${stagingTag}Zdravo</h3>
   <h4>${messageBody}</h4>
   <div>
   ${realEstateLinks}
@@ -54,11 +70,36 @@ const generateNotificationEmail = (
   ${moreRealEstates}
   </div>
   <br/>
+  ${wordOfMouthRequest}
+  <br/>
+  <br/>
   ${emailFooter}`;
 };
 
 const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
   const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
+  let adTypeTitle = "";
+  switch (searchRequest.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;
+  }
+  let emailFrequencyTitle;
+  switch (searchRequest.emailFrequency) {
+    case EMAIL_FREQUENCY.ASAP.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.ASAP.title;
+      break;
+    case EMAIL_FREQUENCY.DAILY.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.DAILY.title;
+      break;
+  }
+
   const {
     id,
     gardenSizeMin,
@@ -70,6 +111,7 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
   } = 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/>
@@ -80,25 +122,30 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
     ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
     : ``;
 
-  const emailFooter = generateEmailFooter(id);
+  const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
 
-  return `<h3>Zdravo</h3>
+  return `<h3>${stagingTag}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>Vrsta oglasa: </strong>${adTypeTitle}</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/>
+  <br/>
+  ${wordOfMouthRequest}
+  <br/>
+  <br/>
   ${emailFooter}`;
 };
 
 const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
   if (numberOfRealEstates === 1) {
-    return `Kivi: ${singleRealEstateTitle}`;
+    return `${stagingTag}Kivi: ${singleRealEstateTitle}`;
   }
 
   const leastSignificantDigit = numberOfRealEstates % 10;
@@ -106,7 +153,7 @@ const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
   const secondLeastSignificantDigit = numberWithoutLastDigit % 10;
 
   if (leastSignificantDigit === 1 && secondLeastSignificantDigit !== 1) {
-    return `Kivi : ${numberOfRealEstates} nova nekretnina`;
+    return `${stagingTag}Kivi : ${numberOfRealEstates} nova nekretnina`;
   }
 
   if (
@@ -114,14 +161,58 @@ const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
     leastSignificantDigit <= 4 &&
     secondLeastSignificantDigit !== 1
   ) {
-    return `Kivi: ${numberOfRealEstates} nove nekretnine`;
+    return `${stagingTag}Kivi: ${numberOfRealEstates} nove nekretnine`;
   }
 
-  return `Kivi: ${numberOfRealEstates} novih nekretnina`;
+  return `${stagingTag}Kivi: ${numberOfRealEstates} novih nekretnina`;
+};
+
+const generateCheckUpEmail = searchRequest => {
+  const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
+  const {
+    id,
+    gardenSizeMin,
+    gardenSizeMax,
+    sizeMin,
+    sizeMax,
+    priceMin,
+    priceMax
+  } = searchRequest;
+
+  let emailFrequencyTitle;
+  switch (searchRequest.emailFrequency) {
+    case EMAIL_FREQUENCY.ASAP.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.ASAP.title;
+      break;
+    case EMAIL_FREQUENCY.DAILY.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.DAILY.title;
+      break;
+  }
+
+  const gardenSize = realEstateType.hasGardenSize
+    ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
+    : ``;
+
+  const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
+
+  return `<h3>${stagingTag}Zdravo</h3>
+  <div><strong>Kivi tim traži nekretnine za Vas i kada to ne vidite.</strong></div>
+  <br />
+  <div>Vaša trenutno aktivna pretraga je:</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>
+  <br/>
+  ${emailFooter}`;
 };
 
 module.exports = {
   generateNotificationEmail,
   generateNewSearchRequestEmail,
-  generateEmailSubject
+  generateEmailSubject,
+  generateCheckUpEmail
 };

app/helpers/fetchWrapper.js

@@ -0,0 +1,58 @@
+const nodeFetch = require("node-fetch");
+const AbortController = require('abort-controller');
+const FetchCache = require('@sozialhelden/fetch-cache').default;
+
+console.log("Fc ", FetchCache)
+
+const {
+  USER_AGENT,
+  USE_SCRAPER_API,
+  SCRAPER_API_KEY,
+  SCRAPER_API_BASE_URL,
+  NODE_FETCH_TIMEOUT_MS
+} = require("../config/appConfig");
+
+const timeout = (ms) => {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+const fetchCache = new FetchCache({
+  fetch: nodeFetch,
+  cacheOptions: {
+    // Don't save more than 100 responses in the cache. Allows infinite responses by default
+    maximalItemCount: 10000,
+    // When should the cache evict responses when its full?
+    evictExceedingItemsBy: 'age', // Valid values: 'lru' or 'age'
+    defaultTTL: 6 * 60 * 60 * 1000  // 6 hours
+    // ...see https://github.com/sozialhelden/hamster-cache for all possible options
+  },
+});
+
+
+const fetch = async (url, options = {}, useCache = true) => {
+  const controller = new AbortController();
+
+  const newOptions = Object.assign({}, options);
+  if (!newOptions["headers"]) {
+    newOptions["headers"] = {};
+  }
+
+  newOptions.signal = controller.signal;
+
+ // newOptions["headers"]["User-Agent"] = USER_AGENT;
+
+  let urlToFetchThroughAPI = Buffer.from(url).toString('base64'); 
+  if (SCRAPER_API_BASE_URL.includes('scraperapi')) { 
+    urlToFetchThroughAPI = url; 
+  }
+
+  const urlAdaptedForScraping = USE_SCRAPER_API
+    ? `${SCRAPER_API_BASE_URL}?api_key=${SCRAPER_API_KEY}&url=${urlToFetchThroughAPI}`
+    : url;
+  const result = useCache ? fetchCache.fetch(urlAdaptedForScraping, newOptions) : nodeFetch(urlAdaptedForScraping, newOptions);
+
+  const timeoutId = setTimeout(() => controller.abort(), NODE_FETCH_TIMEOUT_MS);
+  return result;
+};
+
+module.exports = fetch;

app/helpers/log.js

@@ -0,0 +1,13 @@
+const {
+  PRINT_CRAWLER_DEBUG
+} = require("../config/appConfig");
+
+const logDebug = (...args) => {
+  if (PRINT_CRAWLER_DEBUG) {
+    console.log(...args);
+  }
+}
+
+module.exports = {
+  logDebug
+};

app/helpers/url.js

@@ -7,6 +7,26 @@ const currentSearchRequest = async req => {
 
   return await getSearchRequest(searchRequestId);
 };
-module.exports = {
-  currentSearchRequest
+
+const getUrlParams = function (url) {
+  if (typeof url === 'string' && url.length > 0){
+    const params = {};
+    const questionMarkIndex = url.indexOf('?');
+    if (questionMarkIndex === -1) {
+      return undefined;
+    }
+    const query = url.substring(questionMarkIndex+1);
+    const vars = query.split('&');
+    for (let i = 0; i < vars.length; i++) {
+      const pair = vars[i].split('=');
+      params[pair[0]] = decodeURIComponent(pair[1]);
+    }
+    return params;
+  }
+  return undefined;
+};
+
+module.exports = {
+  currentSearchRequest,
+  getUrlParams
 };

app/migrations/20191105174319-add-additional-fields-to-realEstates-table.js

@@ -0,0 +1,163 @@
+"use strict";
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.addColumn("RealEstates", "numberOfRooms", {
+        type: Sequelize.REAL
+      }),
+      queryInterface.addColumn("RealEstates", "numberOfFloors", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("RealEstates", "floor", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("RealEstates", "accessRoadType", {
+        type: Sequelize.TEXT
+      }),
+      queryInterface.addColumn("RealEstates", "heatingType", {
+        type: Sequelize.TEXT
+      }),
+      queryInterface.addColumn("RealEstates", "furnishingType", {
+        type: Sequelize.TEXT
+      }),
+      queryInterface.addColumn("RealEstates", "balcony", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "newBuilding", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "elevator", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "water", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "electricity", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "drainageSystem", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "registeredInZkBooks", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "recentlyAdapted", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "parking", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "garage", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "gas", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "antiTheftDoor", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "airCondition", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "phoneConnection", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "cableTV", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "internet", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "basementAttic", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "storeRoom", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "videoSurveillance", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "alarm", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "suitableForStudents", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "includingBills", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "animalsAllowed", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "pool", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "exchange", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "urbanPlanPermit", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "buildingPermit", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "utilityConnection", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("RealEstates", "distanceToRiver", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("RealEstates", "numberOfViewsAgency", {
+        type: Sequelize.INTEGER,
+        defaultValue: 0
+      }),
+      queryInterface.addColumn("RealEstates", "numberOfViewsKivi", {
+        type: Sequelize.INTEGER,
+        defaultValue: 0
+      })
+    ]);
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.removeColumn("RealEstates", "numberOfRooms"),
+      queryInterface.removeColumn("RealEstates", "numberOfFloors"),
+      queryInterface.removeColumn("RealEstates", "floor"),
+      queryInterface.removeColumn("RealEstates", "accessRoadType"),
+      queryInterface.removeColumn("RealEstates", "heatingType"),
+      queryInterface.removeColumn("RealEstates", "furnishingType"),
+      queryInterface.removeColumn("RealEstates", "balcony"),
+      queryInterface.removeColumn("RealEstates", "newBuilding"),
+      queryInterface.removeColumn("RealEstates", "elevator"),
+      queryInterface.removeColumn("RealEstates", "water"),
+      queryInterface.removeColumn("RealEstates", "electricity"),
+      queryInterface.removeColumn("RealEstates", "drainageSystem"),
+      queryInterface.removeColumn("RealEstates", "registeredInZkBooks"),
+      queryInterface.removeColumn("RealEstates", "recentlyAdapted"),
+      queryInterface.removeColumn("RealEstates", "parking"),
+      queryInterface.removeColumn("RealEstates", "garage"),
+      queryInterface.removeColumn("RealEstates", "gas"),
+      queryInterface.removeColumn("RealEstates", "antiTheftDoor"),
+      queryInterface.removeColumn("RealEstates", "airCondition"),
+      queryInterface.removeColumn("RealEstates", "phoneConnection"),
+      queryInterface.removeColumn("RealEstates", "cableTV"),
+      queryInterface.removeColumn("RealEstates", "internet"),
+      queryInterface.removeColumn("RealEstates", "basementAttic"),
+      queryInterface.removeColumn("RealEstates", "storeRoom"),
+      queryInterface.removeColumn("RealEstates", "videoSurveillance"),
+      queryInterface.removeColumn("RealEstates", "alarm"),
+      queryInterface.removeColumn("RealEstates", "suitableForStudents"),
+      queryInterface.removeColumn("RealEstates", "includingBills"),
+      queryInterface.removeColumn("RealEstates", "animalsAllowed"),
+      queryInterface.removeColumn("RealEstates", "pool"),
+      queryInterface.removeColumn("RealEstates", "exchange"),
+      queryInterface.removeColumn("RealEstates", "urbanPlanPermit"),
+      queryInterface.removeColumn("RealEstates", "buildingPermit"),
+      queryInterface.removeColumn("RealEstates", "utilityConnection"),
+      queryInterface.removeColumn("RealEstates", "distanceToRiver"),
+      queryInterface.removeColumn("RealEstates", "numberOfViewsAgency"),
+      queryInterface.removeColumn("RealEstates", "numberOfViewsKivi")
+    ]);
+  }
+};

app/migrations/20191118105541-add-additional-fields-to-searchRequests-table.js

@@ -0,0 +1,64 @@
+"use strict";
+const { ACCESS_ROAD_TYPE, HEATING_TYPE } = require("../common/enums");
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.addColumn("SearchRequests", "includeIncompleteAds", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "balcony", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "newBuilding", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "elevator", {
+        type: Sequelize.BOOLEAN
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfRoomsMin", {
+        type: Sequelize.REAL
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfRoomsMax", {
+        type: Sequelize.REAL
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfFloorsMin", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "numberOfFloorsMax", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "floorMin", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "floorMax", {
+        type: Sequelize.INTEGER
+      }),
+      queryInterface.addColumn("SearchRequests", "accessRoadType", {
+        type: Sequelize.TEXT,
+        defaultValue: ACCESS_ROAD_TYPE.ANY.id
+      }),
+      queryInterface.addColumn("SearchRequests", "heatingType", {
+        type: Sequelize.TEXT,
+        defaultValue: HEATING_TYPE.ANY.id
+      })
+    ]);
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return Promise.all([
+      queryInterface.removeColumn("SearchRequests", "includeIncompleteAds"),
+      queryInterface.removeColumn("SearchRequests", "balcony"),
+      queryInterface.removeColumn("SearchRequests", "newBuilding"),
+      queryInterface.removeColumn("SearchRequests", "elevator"),
+      queryInterface.removeColumn("SearchRequests", "numberOfRoomsMin"),
+      queryInterface.removeColumn("SearchRequests", "numberOfRoomsMax"),
+      queryInterface.removeColumn("SearchRequests", "numberOfFloorsMin"),
+      queryInterface.removeColumn("SearchRequests", "numberOfFloorsMax"),
+      queryInterface.removeColumn("SearchRequests", "floorMin"),
+      queryInterface.removeColumn("SearchRequests", "floorMax"),
+      queryInterface.removeColumn("SearchRequests", "accessRoadType"),
+      queryInterface.removeColumn("SearchRequests", "heatingType")
+    ]);
+  }
+};

app/migrations/20200121000524-add-priceHistory-table.js

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

app/migrations/20200121094500-add-constraint-priceHistory.js

@@ -0,0 +1,10 @@
+"use strict";
+module.exports = {
+  up: (queryInterface, Sequelize) =>
+    queryInterface.addConstraint("PriceHistory", ["realEstateId", "price"], {
+      type: "unique",
+      name: "uniquePriceRealEstate"
+    }),
+  down: queryInterface =>
+    queryInterface.removeConstraint("PriceHistory", "uniquePriceRealEstate")
+};

app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js

@@ -0,0 +1,14 @@
+"use strict";
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn("SearchRequests", "includeWithoutPrice", {
+      type: Sequelize.BOOLEAN,
+      defaultValue: true
+    });
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn("SearchRequests", "includeWithoutPrice");
+  }
+};

app/migrations/20200215002846-add-column-notified-to-searchrequests.js

@@ -0,0 +1,14 @@
+"use strict";
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn("SearchRequests", "notifiedAt", {
+      type: Sequelize.DATE,
+      defaultValue: new Date()
+    });
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn("SearchRequests", "notifiedAt");
+  }
+};

app/models/index.js

@@ -16,7 +16,7 @@ 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);
+  sequelize = new Sequelize(process.env[config.use_env_variable] + "?ssl=true", config);
 } else {
   sequelize = new Sequelize(
     config.database,

app/models/priceHistory.js

@@ -0,0 +1,44 @@
+"use strict";
+
+module.exports = (sequalize, DataTypes) => {
+  const PriceHistory = sequalize.define(
+    "PriceHistory",
+    {
+      id: {
+        type: DataTypes.BIGINT,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false
+      },
+      realEstateId: {
+        type: DataTypes.BIGINT,
+        allowNull: false,
+        unique: "uniquePriceRealEstate",
+        references: {
+          model: "RealEstates",
+          key: "id"
+        },
+        onUpdate: "CASCADE",
+        onDelete: "SET NULL"
+      },
+      price: {
+        type: DataTypes.REAL,
+        unique: "uniquePriceRealEstate"
+      }
+    },
+    {
+      freezeTableName: true
+    }
+  );
+
+  PriceHistory.associate = models => {
+    PriceHistory.hasMany(models.RealEstate, {
+      foreignKey: "id",
+      sourceKey: "realEstateId",
+      targetKey: "id",
+      as: "realEstates"
+    });
+  };
+
+  return PriceHistory;
+};

app/models/realEstate.js

@@ -48,7 +48,44 @@ module.exports = (sequelize, DataTypes) => {
     longDescription: DataTypes.TEXT,
     adStatus: DataTypes.INTEGER,
     publishedDate: DataTypes.DATE,
-    renewedDate: DataTypes.DATE
+    renewedDate: DataTypes.DATE,
+    numberOfRooms: DataTypes.INTEGER,
+    numberOfFloors: DataTypes.INTEGER,
+    floor: DataTypes.INTEGER,
+    accessRoadType: DataTypes.TEXT,
+    heatingType: DataTypes.TEXT,
+    furnishingType: DataTypes.TEXT,
+    balcony: DataTypes.BOOLEAN,
+    newBuilding: DataTypes.BOOLEAN,
+    elevator: DataTypes.BOOLEAN,
+    water: DataTypes.BOOLEAN,
+    electricity: DataTypes.BOOLEAN,
+    drainageSystem: DataTypes.BOOLEAN,
+    registeredInZkBooks: DataTypes.BOOLEAN,
+    recentlyAdapted: DataTypes.BOOLEAN,
+    parking: DataTypes.BOOLEAN,
+    garage: DataTypes.BOOLEAN,
+    gas: DataTypes.BOOLEAN,
+    antiTheftDoor: DataTypes.BOOLEAN,
+    airCondition: DataTypes.BOOLEAN,
+    phoneConnection: DataTypes.BOOLEAN,
+    cableTV: DataTypes.BOOLEAN,
+    internet: DataTypes.BOOLEAN,
+    basementAttic: DataTypes.BOOLEAN,
+    storeRoom: DataTypes.BOOLEAN,
+    videoSurveillance: DataTypes.BOOLEAN,
+    alarm: DataTypes.BOOLEAN,
+    suitableForStudents: DataTypes.BOOLEAN,
+    includingBills: DataTypes.BOOLEAN,
+    animalsAllowed: DataTypes.BOOLEAN,
+    pool: DataTypes.BOOLEAN,
+    exchange: DataTypes.BOOLEAN,
+    urbanPlanPermit: DataTypes.BOOLEAN,
+    buildingPermit: DataTypes.BOOLEAN,
+    utilityConnection: DataTypes.BOOLEAN,
+    distanceToRiver: DataTypes.INTEGER,
+    numberOfViewsAgency: DataTypes.INTEGER,
+    numberOfViewsKivi: DataTypes.INTEGER
   });
 
   return RealEstate;

app/models/searchRequest.js

@@ -69,6 +69,23 @@ module.exports = (sequelize, DataTypes) => {
     },
     deletedEmail: {
       type: DataTypes.TEXT
+    },
+    includeIncompleteAds: DataTypes.BOOLEAN,
+    includeWithoutPrice: DataTypes.BOOLEAN,
+    balcony: DataTypes.BOOLEAN,
+    elevator: DataTypes.BOOLEAN,
+    newBuilding: DataTypes.BOOLEAN,
+    numberOfRoomsMin: DataTypes.REAL,
+    numberOfRoomsMax: DataTypes.REAL,
+    numberOfFloorsMin: DataTypes.INTEGER,
+    numberOfFloorsMax: DataTypes.INTEGER,
+    floorMin: DataTypes.INTEGER,
+    floorMax: DataTypes.INTEGER,
+    accessRoadType: DataTypes.TEXT,
+    heatingType: DataTypes.TEXT,
+    notifiedAt: {
+      type: DataTypes.DATE,
+      defaultValue: new Date()
     }
   });
 

app/npmScripts/npmCheckUpNotify.js

@@ -0,0 +1,6 @@
+"use strict";
+const { checkUpNotify } = require("../services/notificationService");
+//For testing pursposes
+(async () => {
+  await checkUpNotify();
+})();

app/public/main.css

@@ -102,3 +102,59 @@ h3 {
   border-radius: 4px !important;
   text-align: center;
 }
+
+.collection a.collection-item {
+  color: #02adba;
+}
+
+.collection a.collection-item:not(.active):hover {
+  background-color: rgba(2, 173, 186, 0.2);
+}
+
+.tabs .tab a {
+  color: #02adba;
+  -webkit-transition: color 0.28s ease, background-color 0.28s ease;
+  transition: color 0.28s ease, background-color 0.28s ease;
+}
+.tabs .tab a:focus,
+.tabs .tab a:focus.active {
+  background-color: rgba(2, 173, 186, 0.2);
+}
+.tabs .tab a:hover,
+.tabs .tab a.active {
+  color: #02adba;
+}
+.tabs .indicator {
+  background-color: #02adba;
+}
+
+[type="checkbox"].filled-in:checked + span:not(.lever):after {
+  border: 2px solid #02adba;
+  background-color: #02adba;
+}
+[type="checkbox"].filled-in:not(:checked) + span:not(.lever):after {
+  background-color: transparent;
+  border: 2px solid #02adba;
+}
+
+.distinguished {
+  border: 2px solid #02adba;
+  border-radius: 4px;
+  padding: 5px 5px 3px 5px;
+  margin-left: -5px;
+}
+
+.checkbox-label {
+  color: black;
+  font-size: 14px;
+}
+
+.column-label {
+  position: relative;
+  margin-top: 2rem;
+  margin-bottom: 1rem;
+}
+
+.estates-link {
+  color: rgba(0, 0, 0, 0.87);
+}

app/public/segment.css

@@ -25,6 +25,12 @@
   border-right: 1px solid #02adba;
 }
 
+.segmented.small [type="radio"]:not(:checked) + span,
+.segmented.small [type="radio"]:checked + span {
+  padding-left: 7px;
+  padding-right: 7px;
+}
+
 .segmented :last-child .label {
   border-right: none;
 }

app/routes/index.js

@@ -2,7 +2,7 @@
 
 const express = require("express");
 
-const welcome = require("../controllers/welcome").getWelcome;
+const { getWelcome, postWelcome } = require("../controllers/welcome");
 const {
   getRealEstateTypes,
   postRealEstateTypes
@@ -20,7 +20,8 @@ const { getFilters, postFilters } = require("../controllers/realEstateFilters");
 
 const router = express.Router();
 
-router.get("/", welcome);
+router.get("/", getWelcome);
+router.post("/", postWelcome);
 
 router.get("/vrstanekretnine/:searchRequestId", getRealEstateTypes);
 router.get("/vrstanekretnine", getRealEstateTypes);

app/seeders/20200121150443-initial-price-history.js

@@ -0,0 +1,34 @@
+"use strict";
+
+const { RealEstate } = require("../models");
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    //Reading initial data from RealEstate table in db
+    const realEstateInitialData = await RealEstate.findAll();
+    //Extruding data for table PriceHistory
+    const priceHistoryInitialData = realEstateInitialData.map(realEstate => {
+      //Null values canot be recognized by ignore duplicates in sequalize
+      //Value price = 0 indicates 'cijena na upit'
+      const priceTmp =
+        realEstate.dataValues.price === null ? 0 : realEstate.dataValues.price;
+
+      return {
+        realEstateId: realEstate.dataValues.id,
+        price: priceTmp,
+        createdAt: realEstate.dataValues.createdAt,
+        updatedAt: realEstate.dataValues.updatedAt
+      };
+    });
+
+    return queryInterface.bulkInsert(
+      "PriceHistory",
+      priceHistoryInitialData,
+      {}
+    );
+  },
+
+  async down(queryInterface, Sequelize) {
+    return queryInterface.bulkDelete("PriceHistory", null, {});
+  }
+};

app/services/notificationService.js

@@ -1,4 +1,8 @@
 "use strict";
+const { STAGING } = require("../config/appConfig");
+
+const stagingTag = STAGING ? "[STAGING] " : "";
+
 const {
   matchRealEstates,
   matchSearchRequest
@@ -6,9 +10,15 @@ const {
 const {
   generateNotificationEmail,
   generateNewSearchRequestEmail,
-  generateEmailSubject
+  generateEmailSubject,
+  generateCheckUpEmail
 } = require("../helpers/emailContentGenerator");
-const { findNotNotifiedMatches } = require("../helpers/db/searchRequestMatch");
+const {
+  findNotNotifiedMatches,
+  findRealEstatesForSearchRequest
+} = require("../helpers/db/searchRequestMatch");
+const { findAllRequestsForCheckUp } = require("../helpers/db/searchRequest");
+
 const { sendEmail } = require("../services/emailService");
 
 const notifyForNewRealEstates = async newRealEstates => {
@@ -21,13 +31,17 @@ const notifyForNewSearchRequest = async searchRequest => {
 
   const searchRequestId = searchRequest.id;
   const matchingRealEstates = matches[searchRequestId].realEstates;
-
   const emailContent = generateNewSearchRequestEmail(
     searchRequest,
     matchingRealEstates
   );
   const { email } = searchRequest;
-  await sendEmail(email, "Kivi - novi zahtjev za pretragu", emailContent);
+  //In case of the new search req, notifiedAt column is populated with default value - now (moment of creation)
+  await sendEmail(
+    email,
+    `${stagingTag} Kivi - novi zahtjev za pretragu`,
+    emailContent
+  );
 };
 
 const notifyMatches = async (matches, dailyNotification = false) => {
@@ -39,10 +53,18 @@ const notifyMatches = async (matches, dailyNotification = false) => {
     const { email, subscribed } = searchRequest;
     if (notifyNow && subscribed) {
       const allMatchingRealEstates = matches[id].realEstates || [];
+
+      //Variable allMatchingRealEstates are real estates that are "new" on the market
+      //the ones that we notify user in this moment, not all that already exists in db
+      //New variable allRealEstates are all real estates that exists in db for search req
+      const allRealEstates = await findRealEstatesForSearchRequest(id);
+      const noAllRealEstates = allRealEstates.length;
+
       if (allMatchingRealEstates.length > 0) {
         const emailContent = generateNotificationEmail(
           allMatchingRealEstates,
           id,
+          noAllRealEstates,
           dailyNotification
         );
         const emailSubject = generateEmailSubject(
@@ -55,6 +77,10 @@ const notifyMatches = async (matches, dailyNotification = false) => {
         sendEmailPromise.catch(err =>
           console.log("[Email Sending Failed]", err)
         );
+
+        //Change time of notified At for searchReq
+        searchRequest.notifiedAt = new Date();
+        searchRequest.save();
       }
     }
   }
@@ -109,8 +135,30 @@ const notifyRequestsWithDailyOption = async () => {
   await notifyMatches(matches, true);
 };
 
+const checkUpNotify = async () => {
+  /* const searchRequestsForCheckUp = await findAllRequestsForCheckUp();
+
+  const asyncSendEmailActions = [];
+
+  for (const searchRequest of searchRequestsForCheckUp) {
+    const { email } = searchRequest.dataValues;
+    const emailSubject = `${stagingTag}Kivi: Mi tražimo nekretnine za vas!`;
+    const emailContent = generateCheckUpEmail(searchRequest.dataValues);
+
+    const sendEmailPromise = sendEmail(email, emailSubject, emailContent);
+    asyncSendEmailActions.push(sendEmailPromise);
+    sendEmailPromise.catch(err => console.log("[Email Sending Failed]", err));
+
+    //Change time of notified At for searchReq
+    searchRequest.notifiedAt = new Date();
+    searchRequest.save();
+  }
+  await Promise.all(asyncSendEmailActions);*/
+};
+
 module.exports = {
   notifyForNewRealEstates,
   notifyForNewSearchRequest,
-  notifyRequestsWithDailyOption
+  notifyRequestsWithDailyOption,
+  checkUpNotify
 };

app/views/advancedFilters.ejs

@@ -0,0 +1,68 @@
+<br>
+
+<% for (const filter of advancedBooleanFilterObjects){ %>
+  <p>
+    <label class="checkbox-label">
+      <input type="checkbox" class="filled-in" name="<%= filter.dbField %>"
+        <% if (advancedBooleanFilterValues[filter.dbField]) { %>
+          checked
+        <% } %>>
+      <span><%= filter.title %></span>
+    </label>
+  </p>
+<% } %>
+
+<br>
+<% for (const filter of advancedRangeFilterObjects){ %>
+    <div class="row">
+        <p class="column-label col s5 m3 l2">
+            <%= filter.title %>
+        </p>
+        <div class="input-field col s3 m4 l5">
+            <input
+                    id="<%= filter.dbFieldMin %>"
+                    name="<%= filter.dbFieldMin %>"
+                    type="number"
+                    value="<%= advancedRangeFilterValues[filter.dbFieldMin] !== undefined ? advancedRangeFilterValues[filter.dbFieldMin] : ""%>"
+            >
+            <label for="<%= filter.dbFieldMin %>">Od</label>
+        </div>
+        <div class="input-field col s3 m4 l5">
+            <input
+                    id="<%= filter.dbFieldMax %>"
+                    name="<%= filter.dbFieldMax %>"
+                    type="number"
+                    value="<%= advancedRangeFilterValues[filter.dbFieldMax] !== undefined ? advancedRangeFilterValues[filter.dbFieldMax] : ""%>"
+            >
+            <label for="<%= filter.dbFieldMax %>">Do</label>
+        </div>
+    </div>
+<% } %>
+
+<br>
+<% for (const filter of advancedSegmentSelectFilterObjects){ %>
+  <div>
+    <label class="checkbox-label"><%= filter.title %>: </label><br><br>
+    <span class="segmented small">
+      <% for (const segmentObject of filter.values) { %>
+        <label>
+            <input type="radio" name="<%= filter.dbField %>" value="<%= segmentObject.id %>"
+            <% if (advancedSegmentSelectFilterValues[filter.dbField] === segmentObject.id) { %>
+               checked
+            <% } %>>
+            <span class="label"><%= segmentObject.title %></span>
+        </label>
+      <% } %>
+    </span>
+  </div>
+<% } %>
+
+<br>
+<p class="distinguished">
+  <label class="checkbox-label">
+    <input type="checkbox" class="filled-in" name="includeIncompleteAds"
+           checked
+      >
+    <span>Uključi i oglase bez potpunih informacija</span>
+  </label>
+</p>

app/views/location.ejs

@@ -1,13 +1,17 @@
 <div class="row center-align">
   <h3>
-  Područje na mapi će biti uključeno u pretragu. Namjestite mapu na ulice
-  koje želite da budu vidljive.
+    Područje na mapi će biti uključeno u pretragu. Namjestite mapu na ulice koje
+    želite da budu vidljive.
   </h3>
 </div>
 
 <div class="row center-align">
   <div class="col s12 m12 l12 xl12">
-    <input id="autocompleteInput" placeholder="Unesite grad, naselje ili ulicu..." type="text" />
+    <input
+      id="autocompleteInput"
+      placeholder="Unesite grad, naselje ili ulicu..."
+      type="text"
+    />
   </div>
 </div>
 
@@ -17,12 +21,17 @@
   </div>
 </div>
 
-<br>
+<br />
 
 <form method="POST" id="form-map-output">
   <div class="row center-align">
     <div class="col s6 push-s3">
-      <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">Dalje</a>
+      <a
+        id="submit"
+        href="#"
+        class="welcome-center-button waves-effect waves-light btn"
+        >Dalje</a
+      >
     </div>
   </div>
   <input type="hidden" name="north" id="north" />
@@ -41,15 +50,15 @@
 
   function locateMe() {
     if (navigator.geolocation) {
-
-      function onLocationSuccess (position) {
-        const coordinates = position && position.coords ? position.coords : null;
-        if (coordinates){
+      function onLocationSuccess(position) {
+        const coordinates =
+          position && position.coords ? position.coords : null;
+        if (coordinates) {
           const longitude = coordinates.longitude || null;
           const latitude = coordinates.latitude || null;
 
-          if (longitude && latitude && map){
-            map.setCenter({lat: latitude, lng: longitude});
+          if (longitude && latitude && map) {
+            map.setCenter({ lat: latitude, lng: longitude });
             map.setZoom(16);
           }
         }
@@ -61,20 +70,20 @@
 
   function initMap() {
     const BOSNIA_BOUNDS = {
-      north: 45.70,
+      north: 45.7,
       south: 41.69,
       west: 15.55,
-      east: 20.77,
+      east: 20.77
     };
     const SARAJEVO_COORDINATES = {
       lat: 43.85,
-      lng: 18.41,
+      lng: 18.41
     };
 
-    const mapElement = document.getElementById('map');
+    const mapElement = document.getElementById("map");
     const restrictMapPanningToBosniaOnly = {
       latLngBounds: BOSNIA_BOUNDS,
-      strictBounds: true,
+      strictBounds: true
     };
     const initialMapParams = {
       center: SARAJEVO_COORDINATES,
@@ -87,38 +96,50 @@
     };
     map = new google.maps.Map(mapElement, initialMapParams);
 
-    const inputElement = document.getElementById('autocompleteInput');
-    const restrictAutocompleteResultsToBosniaOnly = {'country': 'ba'};
+    const inputElement = document.getElementById("autocompleteInput");
+    const restrictAutocompleteResultsToBosniaOnly = { country: "ba" };
     const initialAutocompleteParams = {
-      types: ['geocode'],
+      types: ["geocode"],
       componentRestrictions: restrictAutocompleteResultsToBosniaOnly,
-      fields: ['geometry', 'types', 'address_components']
+      fields: ["geometry", "types", "address_components"]
     };
 
-    autocomplete = new google.maps.places.Autocomplete(inputElement, initialAutocompleteParams);
-    autocomplete.bindTo('bounds', map);
-    autocomplete.addListener('place_changed', onPlaceChanged);
+    autocomplete = new google.maps.places.Autocomplete(
+      inputElement,
+      initialAutocompleteParams
+    );
+    autocomplete.bindTo("bounds", map);
+    autocomplete.addListener("place_changed", onPlaceChanged);
     pacSelectFirst(inputElement);
     addLocateMeButton(map);
+
+    //After map initialization we check if area is already selected
+    //If yes we bound map to show already selected area
+    const boundsSelected = <%- boundsSelected %>;
+    const selectedLatLngBounds = <%- JSON.stringify(selectedLatLngBounds) %>;
+
+    if (boundsSelected) {
+      boundMapToSelected(map, selectedLatLngBounds);
+    }
   }
 
   function addLocateMeButton(map) {
-    var parent = document.createElement('div');
+    var parent = document.createElement("div");
     parent.className = "locate-me-container";
 
-    var a = document.createElement('a');
+    var a = document.createElement("a");
     a.id = "locateMe";
     a.className = "btn-floating";
 
-    var i = document.createElement('i');
+    var i = document.createElement("i");
     i.innerText = "gps_fixed";
     i.className = "material-icons right";
 
-    a.appendChild(i)
+    a.appendChild(i);
     a.addEventListener("click", locateMe);
-    parent.appendChild(a)
+    parent.appendChild(a);
 
-    map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(parent)
+    map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(parent);
   }
 
   function onPlaceChanged() {
@@ -133,33 +154,49 @@
   function pacSelectFirst(input) {
     // store the original event binding function
     const _addEventListener = input.addEventListener
-            ? input.addEventListener
-            : input.attachEvent
+      ? input.addEventListener
+      : input.attachEvent;
 
-    function addEventListenerWrapper (type, listener) {
+    function addEventListenerWrapper(type, listener) {
       // Simulate a 'down arrow' keypress on hitting 'return' when no pac suggestion is selected,
       // and then trigger the original listener.
-      if (type == 'keydown') {
-        const originalListener = listener
-        listener = function (event) {
-          const suggestionSelected = $('.pac-item-selected').length > 0
-          if (event.key == 'Enter' && !suggestionSelected) {
-            const simulatedDownArrow = $.Event('keydown', {
+      if (type == "keydown") {
+        const originalListener = listener;
+        listener = function(event) {
+          const suggestionSelected = $(".pac-item-selected").length > 0;
+          if (event.key == "Enter" && !suggestionSelected) {
+            const simulatedDownArrow = $.Event("keydown", {
               keyCode: 40,
               which: 40
-            })
-            originalListener.apply(input, [simulatedDownArrow])
+            });
+            originalListener.apply(input, [simulatedDownArrow]);
           }
 
-          originalListener.apply(input, [event])
-        }
+          originalListener.apply(input, [event]);
+        };
       }
 
-      _addEventListener.apply(input, [type, listener])
+      _addEventListener.apply(input, [type, listener]);
     }
 
-    input.addEventListener = addEventListenerWrapper
-    input.attachEvent = addEventListenerWrapper
+    input.addEventListener = addEventListenerWrapper;
+    input.attachEvent = addEventListenerWrapper;
+  }
+  function boundMapToSelected(map, selectedLatLngBounds) {
+
+    const swBound = new google.maps.LatLng(
+      selectedLatLngBounds.swLat,
+      selectedLatLngBounds.swLng
+    );
+    const neBound = new google.maps.LatLng(
+      selectedLatLngBounds.neLat,
+      selectedLatLngBounds.neLng
+    );
+    let bounds = new google.maps.LatLngBounds();
+    bounds.extend(swBound);
+    bounds.extend(neBound);
+
+    map.fitBounds(bounds);
   }
 
   $(document).ready(function() {
@@ -171,11 +208,16 @@
       $("#east").val(mapBounds.getNorthEast().lng());
       $("#west").val(mapBounds.getSouthWest().lng());
 
-      $("#locationInput").val(document.getElementById('autocompleteInput').value);
+      $("#locationInput").val(
+        document.getElementById("autocompleteInput").value
+      );
 
       $("#form-map-output").submit();
     });
   });
 </script>
-<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAna8ohfV2HBMcxGk_29vqxU5Z_bDickqg&language=bs&libraries=places&callback=initMap" async
-  defer></script>
+<script
+  src="https://maps.googleapis.com/maps/api/js?key=<%= process.env.API_MAP_KEY %>&language=bs&libraries=places&callback=initMap"
+  async
+  defer
+></script>

app/views/realEstateFilters.ejs

@@ -1,63 +1,20 @@
+<br>
 <form id="filtersForm" method="POST">
-  <br>
-
-  <div class="row center-align">
-    <h5>Cijena</h5>
-    <br><br>
-    <div class="center-align no-ui-slider" id="priceFilter"></div>
-  </div>
-
-  <br>
   <div class="row">
-    <div class="col s5 m3 l3 push-m1 push-l2">
-      <input class="sliderInputBox" type="number" id="priceMin" name="priceMin">
-
+    <div class="col s12">
+      <ul class="tabs">
+        <li class="tab col s6"><a href="#standardFilters">Filteri</a></li>
+        <li class="tab col s6"><a href="#advancedFilters">Napredni filteri</a></li>
+      </ul>
     </div>
-    <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-      <input class="sliderInputBox" type="number" id="priceMax" name="priceMax">
+    <div id="standardFilters" class="col s12">
+      <%- include("./standardFilters.ejs") %>
+    </div>
+    <div id="advancedFilters" class="col s12">
+      <%- include("./advancedFilters.ejs") %>
     </div>
   </div>
 
-  <br>
-
-  <div class="row center-align">
-    <h5>Površina</h5>
-    <br><br>
-    <div class="center-align no-ui-slider" id="sizeFilter"></div>
-  </div>
-
-  <br>
-  <div class="row">
-    <div class="col s5 m3 l3 push-m1 push-l2">
-      <input class="sliderInputBox" type="number" id="sizeMin" name="sizeMin">
-
-    </div>
-    <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-      <input class="sliderInputBox" type="number" id="sizeMax" name="sizeMax">
-    </div>
-  </div>
-
-  <br>
-
-  <% if(hasGardenSize) { %>
-    <div class="row center-align">
-      <h5>Površina okućnice</h5>
-      <br><br>
-      <div class="center-align no-ui-slider" id="gardenSizeFilter"></div>
-    </div>
-
-    <br>
-    <div class="row">
-      <div class="col s5 m3 l3 push-m1 push-l2">
-        <input class="sliderInputBox" type="number" id="gardenSizeMin" name="gardenSizeMin">
-
-      </div>
-      <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
-        <input class="sliderInputBox" type="number" id="gardenSizeMax" name="gardenSizeMax">
-      </div>
-    </div>
-  <% } %>
-
   <div class="row">
     <div class="col s6 push-s3">
       <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">Dalje</a>
@@ -66,125 +23,7 @@
 </form>
 
 <script>
-  $(document).ready(function() {
-    const priceSliderOptions = <%- priceSliderOptions %>;
-    const sizeSliderOptions = <%- sizeSliderOptions %>;
-    const priceStep = priceSliderOptions.step;
-    const sizeStep = sizeSliderOptions.step;
-    delete priceSliderOptions.step;
-    delete sizeSliderOptions.step;
-
-    function updatePriceInputs(values, handle, unencoded) {
-      $("#priceMin").val(Math.round(unencoded[0]/priceStep)*priceStep);
-      $("#priceMax").val(Math.round(unencoded[1]/priceStep)*priceStep);
-    }
-    function updateSizeInputs(values, handle, unencoded) {
-      $("#sizeMin").val(Math.round(unencoded[0]/sizeStep)*sizeStep);
-      $("#sizeMax").val(Math.round(unencoded[1]/sizeStep)*sizeStep);
-    }
-
-    const priceSlider = document.getElementById("priceFilter");
-    const sizeSlider = document.getElementById("sizeFilter");
-
-    const priceSliderObject = noUiSlider.create(priceSlider, priceSliderOptions);
-    const sizeSliderObject = noUiSlider.create(sizeSlider, sizeSliderOptions);
-
-    priceSliderObject.on('slide', updatePriceInputs);
-    sizeSliderObject.on('slide', updateSizeInputs);
-
-    function priceMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = priceSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        priceSliderObject.set([fixedNewValue, null]);
-        $("#priceMin").val(Math.round(priceSliderObject.get()[0]));
-      }
-    }
-    function priceMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        priceSliderObject.set([null, newValue]);
-        $("#priceMax").val(Math.round(priceSliderObject.get()[1]));
-      }
-    }
-    $("#priceMin").val(priceSliderOptions.start[0]);
-    $("#priceMax").val(priceSliderOptions.start[1]);
-    $("#priceMin").change(priceMinChangeHandler);
-    $("#priceMax").change(priceMaxChangeHandler);
-
-    function sizeMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = sizeSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        sizeSliderObject.set([fixedNewValue, null]);
-        $("#sizeMin").val(Math.round(sizeSliderObject.get()[0]));
-      }
-    }
-    function sizeMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        sizeSliderObject.set([null, newValue]);
-        $("#sizeMax").val(Math.round(sizeSliderObject.get()[1]));
-      }
-    }
-    $("#sizeMin").val(sizeSliderOptions.start[0]);
-    $("#sizeMax").val(sizeSliderOptions.start[1]);
-    $("#sizeMin").change(sizeMinChangeHandler);
-    $("#sizeMax").change(sizeMaxChangeHandler);
-
-    <% if(hasGardenSize) { %>
-    const gardenSizeSliderOptions = <%- gardenSizeSliderOptions %>;
-    const gardenSizeStep = gardenSizeSliderOptions.step;
-    delete gardenSizeSliderOptions.step;
-
-    function updateGardenSizeInputs(values, handle, unencoded) {
-      $("#gardenSizeMin").val(Math.round(unencoded[0]/gardenSizeStep)*gardenSizeStep);
-      $("#gardenSizeMax").val(Math.round(unencoded[1]/gardenSizeStep)*gardenSizeStep);
-    }
-
-    const gardenSizeSlider = document.getElementById("gardenSizeFilter");
-    const gardenSizeSliderObject = noUiSlider.create(gardenSizeSlider, gardenSizeSliderOptions);
-    gardenSizeSliderObject.on('slide', updateGardenSizeInputs);
-    function gardenSizeMinChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const currentValues = gardenSizeSliderObject.get();
-        const newValue = element.currentTarget.value;
-        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
-        gardenSizeSliderObject.set([fixedNewValue, null]);
-        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
-      }
-    }
-    function gardenSizeMaxChangeHandler(element) {
-      if (element && element.currentTarget && element.currentTarget.value){
-        const newValue = element.currentTarget.value;
-        gardenSizeSliderObject.set([null, newValue]);
-        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
-      }
-    }
-    $("#gardenSizeMin").val(gardenSizeSliderOptions.start[0]);
-    $("#gardenSizeMax").val(gardenSizeSliderOptions.start[1]);
-    $("#gardenSizeMin").change("step", gardenSizeMinChangeHandler);
-    $("#gardenSizeMax").change("step", gardenSizeMaxChangeHandler);
-    <% } %>
-
-    $("#submit").click(function() {
-      const priceFilterValues = priceSlider.noUiSlider.get();
-      $("#priceFilterMin").val(priceFilterValues[0]);
-      $("#priceFilterMax").val(priceFilterValues[1]);
-
-      const sizeFilterValues = sizeSlider.noUiSlider.get();
-      $("#sizeFilterMin").val(sizeFilterValues[0]);
-      $("#sizeFilterMax").val(sizeFilterValues[1]);
-
-      <% if (hasGardenSize) { %>
-        const gardenSizeFilterValues = gardenSizeSlider.noUiSlider.get();
-        $("#gardenSizeFilterMin").val(gardenSizeFilterValues[0]);
-        $("#gardenSizeFilterMax").val(gardenSizeFilterValues[1]);
-      <% } %>
-
-      $("#filtersForm").submit();
-    });
+  $(document).ready(function(){
+    $('.tabs').tabs();
   });
 </script>

app/views/realEstates.ejs

@@ -1,13 +1,29 @@
 <div class="row center-align">
-    <ul class="collection with-header">
-      <% for(const realEstate of realEstates) { %>
-      <li class="collection-item">
-        <div><%= realEstate.title %>
-          <a href="<%= realEstate.url %>" class="kivi-color secondary-content">
+  <ul class="collection with-header">
+    <% for(const realEstate of realEstates) { %>
+    <li class="collection-item">
+      <% if(realEstate.adStatus === AD_STATUS.STATUS_VIP) {%>
+      <div>
+        <% //This needs to do redirecting instead of direct link to realestate
+        %>
+        <a href="/redirect/<%= realEstate.id %>" class="estates-link">
+          <%= realEstate.title %>
+          <div class="kivi-color secondary-content">
             <i class="material-icons">send</i>
-          </a>
-        </div>
-      </li>
-      <% } %>
-    </ul>
-  </div>
+          </div>
+        </a>
+      </div>
+      <%} else { %>
+      <div>
+        <a href="<%= realEstate.url %>" class="estates-link">
+          <%= realEstate.title %>
+          <div class="kivi-color secondary-content">
+            <i class="material-icons">send</i>
+          </div>
+        </a>
+      </div>
+      <% }%>
+    </li>
+    <% } %>
+  </ul>
+</div>

app/views/redirect.ejs

@@ -1,26 +1,49 @@
-<br><br>
+<br /><br />
 <div class="center">
-    <div class="preloader-wrapper big active center">
-        <div class="kivi-spinner-color spinner-layer spinner-green-only">
-            <div class="circle-clipper left">
-                <div class="circle"></div>
-            </div><div class="gap-patch">
-                <div class="circle"></div>
-            </div><div class="circle-clipper right">
-                <div class="circle"></div>
-            </div>
-        </div>
+  <div class="preloader-wrapper big active center">
+    <div class="kivi-spinner-color spinner-layer spinner-green-only">
+      <div class="circle-clipper left">
+        <div class="circle"></div>
+      </div>
+      <div class="gap-patch">
+        <div class="circle"></div>
+      </div>
+      <div class="circle-clipper right">
+        <div class="circle"></div>
+      </div>
     </div>
+  </div>
 </div>
 
-<br>
+<br />
+<% if(vipAd) { %>
 <div class="center">
-    <h6>
-        <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl">Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a>
-    </h6>
+  <h6>
+    Ovaj oglas zahtijeva da budete član
+    <a href="https://prostor.ba/" rel="noreferrer">Prostor.ba</a>.
+    <br />
+    <br />
+    <a href="https://prostor.ba/moj-prostor/prijava" rel="noreferrer"
+      >Ulogujte se</a
+    >
+    ili napravite
+    <a href="https://prostor.ba/moj-prostor/registracija" rel="noreferrer"
+      >novi račun</a
+    >, a potom otvorite <a href="<%= redirectUrl %>" rel="noreferrer">oglas</a>.
+  </h6>
 </div>
+<% } else { %>
+<div class="center">
+  <h6>
+    <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl"
+      >Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a
+    >
+  </h6>
+</div>
+<% }%>
+
 <script>
-    window.onload = function() {
-        document.getElementById('realEstateUrl').click();
-    }
+  window.onload = function() {
+    document.getElementById("realEstateUrl").click();
+  };
 </script>

app/views/standardFilters.ejs

@@ -0,0 +1,204 @@
+<br />
+
+<div class="row center-align">
+  <h5>Cijena (KM)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="priceFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input class="sliderInputBox" type="number" id="priceMin" name="priceMin" />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input class="sliderInputBox" type="number" id="priceMax" name="priceMax" />
+  </div>
+</div>
+
+<br />
+<p class="distinguished">
+  <label class="checkbox-label">
+    <input type="checkbox" class="filled-in" name="includeWithoutPrice"
+      checked
+      >
+    <span>Uključi i oglase bez cijene</span>
+  </label>
+</p>
+<br />
+
+<div class="row center-align">
+  <h5>Površina (m<sup>2</sup>)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="sizeFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input class="sliderInputBox" type="number" id="sizeMin" name="sizeMin" />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input class="sliderInputBox" type="number" id="sizeMax" name="sizeMax" />
+  </div>
+</div>
+
+<br />
+
+<% if(hasGardenSize) { %>
+<div class="row center-align">
+  <h5>Površina okućnice (m<sup>2</sup>)</h5>
+  <br /><br />
+  <div class="col s12">
+    <div class="center-align no-ui-slider" id="gardenSizeFilter"></div>
+  </div>
+</div>
+
+<br />
+<div class="row">
+  <div class="col s5 m3 l3 push-m1 push-l2">
+    <input
+      class="sliderInputBox"
+      type="number"
+      id="gardenSizeMin"
+      name="gardenSizeMin"
+    />
+  </div>
+  <div class="col s5 m3 l3 push-s1 push-m4 push-l4">
+    <input
+      class="sliderInputBox"
+      type="number"
+      id="gardenSizeMax"
+      name="gardenSizeMax"
+    />
+  </div>
+</div>
+<% } %>
+
+<script>
+  $(document).ready(function() {
+    const priceSliderOptions = <%- priceSliderOptions %>;
+    const sizeSliderOptions = <%- sizeSliderOptions %>;
+    const priceStep = priceSliderOptions.step;
+    const sizeStep = sizeSliderOptions.step;
+    delete priceSliderOptions.step;
+    delete sizeSliderOptions.step;
+
+    function updatePriceInputs(values, handle, unencoded) {
+      $("#priceMin").val(Math.round(unencoded[0]/priceStep)*priceStep);
+      $("#priceMax").val(Math.round(unencoded[1]/priceStep)*priceStep);
+    }
+    function updateSizeInputs(values, handle, unencoded) {
+      $("#sizeMin").val(Math.round(unencoded[0]/sizeStep)*sizeStep);
+      $("#sizeMax").val(Math.round(unencoded[1]/sizeStep)*sizeStep);
+    }
+
+    const priceSlider = document.getElementById("priceFilter");
+    const sizeSlider = document.getElementById("sizeFilter");
+
+    const priceSliderObject = noUiSlider.create(priceSlider, priceSliderOptions);
+    const sizeSliderObject = noUiSlider.create(sizeSlider, sizeSliderOptions);
+
+    priceSliderObject.on('slide', updatePriceInputs);
+    sizeSliderObject.on('slide', updateSizeInputs);
+
+    function priceMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = priceSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        priceSliderObject.set([fixedNewValue, null]);
+        $("#priceMin").val(Math.round(priceSliderObject.get()[0]));
+      }
+    }
+    function priceMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        priceSliderObject.set([null, newValue]);
+        $("#priceMax").val(Math.round(priceSliderObject.get()[1]));
+      }
+    }
+    $("#priceMin").val(priceSliderOptions.start[0]);
+    $("#priceMax").val(priceSliderOptions.start[1]);
+    $("#priceMin").change(priceMinChangeHandler);
+    $("#priceMax").change(priceMaxChangeHandler);
+
+    function sizeMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = sizeSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        sizeSliderObject.set([fixedNewValue, null]);
+        $("#sizeMin").val(Math.round(sizeSliderObject.get()[0]));
+      }
+    }
+    function sizeMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        sizeSliderObject.set([null, newValue]);
+        $("#sizeMax").val(Math.round(sizeSliderObject.get()[1]));
+      }
+    }
+    $("#sizeMin").val(sizeSliderOptions.start[0]);
+    $("#sizeMax").val(sizeSliderOptions.start[1]);
+    $("#sizeMin").change(sizeMinChangeHandler);
+    $("#sizeMax").change(sizeMaxChangeHandler);
+
+    <% if(hasGardenSize) { %>
+    const gardenSizeSliderOptions = <%- gardenSizeSliderOptions %>;
+    const gardenSizeStep = gardenSizeSliderOptions.step;
+    delete gardenSizeSliderOptions.step;
+
+    function updateGardenSizeInputs(values, handle, unencoded) {
+      $("#gardenSizeMin").val(Math.round(unencoded[0]/gardenSizeStep)*gardenSizeStep);
+      $("#gardenSizeMax").val(Math.round(unencoded[1]/gardenSizeStep)*gardenSizeStep);
+    }
+
+    const gardenSizeSlider = document.getElementById("gardenSizeFilter");
+    const gardenSizeSliderObject = noUiSlider.create(gardenSizeSlider, gardenSizeSliderOptions);
+    gardenSizeSliderObject.on('slide', updateGardenSizeInputs);
+    function gardenSizeMinChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const currentValues = gardenSizeSliderObject.get();
+        const newValue = element.currentTarget.value;
+        const fixedNewValue = newValue > currentValues[1] ? currentValues[1] : newValue;
+        gardenSizeSliderObject.set([fixedNewValue, null]);
+        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
+      }
+    }
+    function gardenSizeMaxChangeHandler(element) {
+      if (element && element.currentTarget && element.currentTarget.value){
+        const newValue = element.currentTarget.value;
+        gardenSizeSliderObject.set([null, newValue]);
+        $("#gardenSizeMin").val(Math.round(gardenSizeSliderObject.get()[0]));
+      }
+    }
+    $("#gardenSizeMin").val(gardenSizeSliderOptions.start[0]);
+    $("#gardenSizeMax").val(gardenSizeSliderOptions.start[1]);
+    $("#gardenSizeMin").change("step", gardenSizeMinChangeHandler);
+    $("#gardenSizeMax").change("step", gardenSizeMaxChangeHandler);
+    <% } %>
+
+    $("#submit").click(function() {
+      const priceFilterValues = priceSlider.noUiSlider.get();
+      $("#priceFilterMin").val(priceFilterValues[0]);
+      $("#priceFilterMax").val(priceFilterValues[1]);
+
+      const sizeFilterValues = sizeSlider.noUiSlider.get();
+      $("#sizeFilterMin").val(sizeFilterValues[0]);
+      $("#sizeFilterMax").val(sizeFilterValues[1]);
+
+      <% if (hasGardenSize) { %>
+        const gardenSizeFilterValues = gardenSizeSlider.noUiSlider.get();
+        $("#gardenSizeFilterMin").val(gardenSizeFilterValues[0]);
+        $("#gardenSizeFilterMax").val(gardenSizeFilterValues[1]);
+      <% } %>
+
+      $("#filtersForm").submit();
+    });
+  });
+</script>

app/views/welcome.ejs

@@ -1,4 +1,3 @@
-<!--   -->
 <br><br>
 <div class="row center-align">
     <img src="assets/images/logo.svg" alt="kivi logo" width="160">
@@ -8,8 +7,26 @@
   <div> Na vaš email. </div>
   <div> BESPLATNO </div>
 </div>
-<div class="row center-align">
-    <div class="col s6 push-s3">
-        <a href="<%= nextStep %>" class="welcome-center-button btn">Javi mi</a>
+<form method="POST" name="welcomeForm">
+    <div class="row center-align">
+        <div class="col s5 m4 l3 push-s1 push-m2 push-l3">
+            <a href="#" onclick="saleClick()" class="welcome-center-button btn">Kupi</a>
+        </div>
+        <div class="col s5 m4 l3 push-s1 push-m2 push-l3">
+            <a href="#" onclick="rentClick()" class="welcome-center-button btn">Unajmi</a>
+        </div>
     </div>
-</div>
+    <input type="hidden" id="adType" name="adType">
+</form>
+
+<script>
+    function saleClick(){
+        $("#adType").val("<%= AD_TYPE.AD_TYPE_SALE.id %>");
+        document.welcomeForm.submit();
+    }
+
+    function rentClick(){
+        $("#adType").val("<%= AD_TYPE.AD_TYPE_RENT.id %>");
+        document.welcomeForm.submit();
+    }
+</script>

development.env

@@ -8,12 +8,25 @@ SEQUELIZE_LOGGING=0- no sequelize logging, 1- log to the console
 PORT=Port for the app, defaults to 5000
 APP_BASE_URL=base url for the app
 
+ENVIRONMENT=Variable to denote development, staging and production
+
+USER_AGENT=User agent header to send in fetch requests
+
 MAX_REAL_ESTATES_IN_EMAIL=Max number of real estates that will be shown in email, others will be truncated and URL with full list will be shwon
 MAX_REAL_ESTATES_IN_FIRST_EMAIL=Max number of real estates that will be shown in first (welcome) email
 
+CHECK_UP_DAYS=Check up email is sent after this number of days without notification
 #=============== GOOGLE ANALYTICS =============#
 GA_ID=Google Analytics ID
 
+#=============== GOOGLE MAPS =============#
+API_MAP_KEY=(your-key-here)
+
+#=============== SCRAPER API SUPORT =============#
+USE_SCRAPER_API= To turn it on (1) or off (0)
+SCRAPER_API_KEY= Key for Scraper api
+SCRAPER_API_BASE_URL= Base url without question mark (example: http://sabur.kivi.ba:1337)
+
 #=============== AWS SDK EMAIL SETTINGS =======#
 AWS_KEY_ID=(your-key-here)
 AWS_SECRET_ACCESS_KEY=(your-key-here)
@@ -42,12 +55,14 @@ RENTAL_DELAY_BETWEEN_PAGES=time in miliseconds to wait before indexing next page
 RENTAL_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found
 #==PROSTOR==
 PROSTOR_MAX_PAGES=!!! This is not used for prostor crawler !!!
-PROSTOR_MAX_RESULTS_PER_PAGE=For Prostor crawler, this represents MAX RESULTS in total
+PROSTOR_MAX_RESULTS_PER_PAGE=For Prostor crawler, this represents how many ads are crawled at once
 PROSTOR_CRAWLER_AD_TYPE=enum name of what type of ads should be crawled, check common/enums.js file for valid values
 PROSTOR_CRAWLER_AD_CATEGORIES=comma separated list of enum names of categories to be included, check common/enums.js file for valid values
 PROSTOR_IGNORED_USERNAMES=!!! This is not used for prostor crawler !!!
 PROSTOR_DELAY_BETWEEN_PAGES=!!! This is not used for prostor crawler !!!
 PROSTOR_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found
+PROSTOR_LOGIN_EMAIL=Email of valid Prostor.ba account for crawling purposes
+PROSTOR_LOGIN_PASS=Password of valid Prostor.ba account for crawling purposes
 #==AKTIDO==
 AKTIDO_MAX_PAGES=Restrict crawler to this number of pages
 AKTIDO_MAX_RESULTS_PER_PAGE=Only this number or less results from one page will be scraped and saved
@@ -56,3 +71,9 @@ AKTIDO_CRAWLER_AD_CATEGORIES=comma separated list of enum names of categories to
 AKTIDO_IGNORED_USERNAMES=!!! This is not used for aktido crawler !!!
 AKTIDO_DELAY_BETWEEN_PAGES=time in miliseconds to wait before indexing next page
 AKTIDO_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found
+#==SALJIC NEKRETNINE==
+SALJIC_MAX_PAGES=Restrict crawler to this number of pages
+SALJIC_MAX_RESULTS_PER_PAGE=For Saljic crawler, this represents how many ads are crawled at once
+SALJIC_CRAWLER_AD_TYPE=enum name of what type of ads should be crawled, check common/enums.js file for valid values
+SALJIC_CRAWLER_AD_CATEGORIES=comma separated list of enum names of categories to be included, check common/enums.js file for valid values
+SALJIC_FORCE_CRAWL=Non-zero value will force crawler to crawl all pages without stopping when known real estate is found

index.js

@@ -4,6 +4,7 @@ const bodyParser = require("body-parser");
 const layout = require("express-layout");
 const compression = require("compression");
 const forceSSL = require("./app/helpers/forceSSL");
+const { logDebug } = require("./app/helpers/log");
 
 const {
   APP_PORT,
@@ -12,6 +13,7 @@ const {
 } = require("./app/config/appConfig");
 const routes = require("./app/routes");
 const { crawlAll } = require("./app/crawler/crawl");
+const { checkUpNotify } = require("./app/services/notificationService");
 const {
   notifyForNewRealEstates
 } = require("./app/services/notificationService");
@@ -37,12 +39,21 @@ app.listen(APP_PORT, () =>
 
 let crawlerRunning = STOP_CRAWLER;
 const crawl = () => {
+  logDebug("Crawl start. crawlerRunning: ", crawlerRunning);
   if (!crawlerRunning) {
     crawlerRunning = true;
     crawlAll().then(newRealEstates => {
-      crawlerRunning = false;
+      logDebug("crawlAll done, new real estate len: ", newRealEstates.length);
       notifyForNewRealEstates(newRealEstates);
+    }).catch(e => {
+      console.error('Error happened: ', e);
+    }).finally(()=> {
+      crawlerRunning = false;
+      logDebug('Finally done!');
     });
   }
 };
+
 setInterval(crawl, CRAWLER_INTERVAL * 1000);
+
+setInterval(checkUpNotify, 1000 * 60 * 60 * 24);

package-lock.json

@@ -40,6 +40,32 @@
         "@sendgrid/helpers": "^6.3.0"
       }
     },
+    "@sozialhelden/fetch-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@sozialhelden/fetch-cache/-/fetch-cache-2.0.1.tgz",
+      "integrity": "sha512-vMlsdT5JQCGjx1fcFxmMNh7ZKppjjsfUAeZEhhNwhEL7GaqbZXsD1OXEyx2IcRa25ZuZtvJSV6Q3rE77VRdLvg==",
+      "requires": {
+        "@sozialhelden/hamster-cache": "^1.0.0"
+      }
+    },
+    "@sozialhelden/hamster-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@sozialhelden/hamster-cache/-/hamster-cache-1.0.0.tgz",
+      "integrity": "sha512-/TEGA8mdMawZp4Yq/GrkL+72YL5EGuSeVXC3pKW12YY1t3C+zCN/HZ0HRp4zWF/e67svXcxuz/B0AEQxEdvi7A=="
+    },
+    "@supercharge/goodies": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@supercharge/goodies/-/goodies-1.4.0.tgz",
+      "integrity": "sha512-Np6u2qjRwiA3wTgzz4n2yduydIjSXqtJWP5cOnNqjdlCR/EUAK86LAOhEcU+YW211D1ksugns3GqpARJDoXQ7g=="
+    },
+    "@supercharge/promise-pool": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@supercharge/promise-pool/-/promise-pool-1.3.0.tgz",
+      "integrity": "sha512-9/EVrJevSPEqI4i/gRH8Dt7C+FQT65wRRYuu0MDaGmSLZ2aTel0jOGu8Ae84fPiQ+Ah0B80RPFUxk+K+Cz48DA==",
+      "requires": {
+        "@supercharge/goodies": "~1.4.0"
+      }
+    },
     "@types/caseless": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
@@ -79,6 +105,14 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "accepts": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
@@ -1052,6 +1086,14 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
+    "eslint-plugin-prettier": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz",
+      "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==",
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -1066,6 +1108,11 @@
         "es5-ext": "~0.10.14"
       }
     },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -1271,6 +1318,11 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
       "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
+    },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -1333,13 +1385,23 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+      "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
+      },
+      "dependencies": {
+        "combined-stream": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+          "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+          "requires": {
+            "delayed-stream": "~1.0.0"
+          }
+        }
       }
     },
     "forwarded": {
@@ -1396,7 +1458,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1417,12 +1480,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1437,17 +1502,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1564,7 +1632,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1576,6 +1645,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1590,6 +1660,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1597,12 +1668,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -1621,6 +1694,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1701,7 +1775,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1713,6 +1788,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1798,7 +1874,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1834,6 +1911,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1853,6 +1931,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -1896,12 +1975,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3160,6 +3241,19 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
+    "prettier": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
+      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -3385,6 +3479,18 @@
         "tough-cookie": "~2.4.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        }
       }
     },
     "require-directory": {

package.json

@@ -8,13 +8,17 @@
     "start": "node ./index.js",
     "start-mon": "nodemon ./index.js",
     "migrate": "cd app && npx sequelize db:migrate",
-    "setup": "docker build -t marketalerts .  && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 4 && npm run migrate",
+    "seed": "cd app && npx sequelize db:seed:all",
+    "setup": "docker build -t marketalerts .  && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 10 && npm run migrate",
     "docker-start": "docker start pg_marketalerts",
     "docker-stop": "docker stop pg_marketalerts",
     "crawl": "cd app/crawler && node npmCrawl.js",
     "daily-notify": "cd app/npmScripts && node npmDailyNotify.js",
+    "checkup-notify": "cd app/npmScripts && node npmCheckUpNotify.js",
     "test-search": "cd test && node searchTest.js",
-    "test-olx-scraper": "cd test && node olxScrapeTest.js"
+    "test-olx-scraper": "cd test && node olxScrapeTest.js",
+    "test-rental-scraper": "cd test && node rentalScrapeTest.js",
+    "test-saljic-scraper": "cd test && node saljicScrapeTest.js"
   },
   "repository": {
     "type": "git",
@@ -28,21 +32,27 @@
   "dependencies": {
     "2checkout-node": "0.0.1",
     "@sendgrid/mail": "^6.3.1",
+    "@sozialhelden/fetch-cache": "^2.0.1",
+    "@supercharge/promise-pool": "^1.3.0",
+    "abort-controller": "^3.0.0",
     "aws-sdk": "^2.422.0",
     "bluebird": "^3.5.5",
     "cheerio": "^1.0.0-rc.2",
     "compression": "^1.7.4",
     "dotenv": "^7.0.0",
     "ejs": "^2.6.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "express": "^4.16.4",
     "express-ejs-layouts": "^2.5.0",
     "express-layout": "^0.1.0",
+    "form-data": "^3.0.0",
     "html-to-text": "^5.1.1",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.26",
     "node-fetch": "^2.3.0",
     "node-schedule": "^1.3.2",
     "pg": "^7.10.0",
+    "prettier": "^1.19.1",
     "react-step-wizard": "^5.1.0",
     "sequelize": "^5.18.4",
     "sequelize-cli": "^5.5.0"

test/olxScrapeTest.js

@@ -9,7 +9,7 @@ if (urlToScrape) {
 
   (async () => {
     const data = await crawler.scrapeAd(urlToScrape);
-    console.log(data);
+    console.log("Scraped data:", data);
   })();
 } else {
   console.log("No URL to scrape. Use like this : ");

test/rentalScrapeTest.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const rentalCrawler = require("../app/crawler/specificCrawlers/rental");
+
+const urlToScrape = process.argv[2] || undefined;
+
+if (urlToScrape) {
+  const crawler = new rentalCrawler();
+
+  (async () => {
+    const data = await crawler.scrapeAd(urlToScrape);
+    console.log(data);
+  })();
+} else {
+  console.log("No URL to scrape. Use like this : ");
+  console.log("npm run test-rental-scraper -- URL_TO_SCRAPE");
+}

test/saljicScrapeTest.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const saljicCrawler = require("../app/crawler/specificCrawlers/saljic");
+
+const urlToScrape = process.argv[2] || undefined;
+
+if (urlToScrape) {
+  const crawler = new saljicCrawler();
+
+  (async () => {
+    const data = await crawler.scrapeAd(urlToScrape);
+    console.log("Scraped data:", data);
+  })();
+} else {
+  console.log("No URL to scrape. Use like this : ");
+  console.log("npm run test-saljic-scraper -- URL_TO_SCRAPE");
+}