Scrape lat lng from olx

.gitignore

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

Dockerfile

@@ -1,11 +1,48 @@
-FROM postgres:11.3
+#
+# example Dockerfile for https://docs.docker.com/engine/examples/postgresql_service/
+#
 
-ENV POSTGIS_MAJOR 2.4
+FROM ubuntu:16.04
 
-RUN apt-get update \
+# Add the PostgreSQL PGP key to verify their Debian packages.
-      && apt-get --assume-yes install software-properties-common postgis\
+# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc
-      && rm -rf /var/lib/apt/lists/
+RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
 
-RUN mkdir -p /docker-entrypoint-initdb.d
+# Add PostgreSQL's repository. It contains the most recent stable release
+#     of PostgreSQL, ``9.3``.
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
-CMD ["postgres"]
+# Install ``python-software-properties``, ``software-properties-common`` and PostgreSQL 9.3
+#  There are some warnings (in red) that show up during the build. You can hide
+#  them by prefixing each apt-get statement with DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y python-software-properties software-properties-common postgresql-9.3 postgresql-client-9.3 postgresql-contrib-9.3
+
+# Note: The official Debian and Ubuntu images automatically ``apt-get clean``
+# after each ``apt-get``
+
+# Run the rest of the commands as the ``postgres`` user created by the ``postgres-9.3`` package when it was ``apt-get installed``
+USER postgres
+
+# Create a PostgreSQL role named ``docker`` with ``docker`` as the password and
+# then create a database `docker` owned by the ``docker`` role.
+# Note: here we use ``&&\`` to run commands one after the other - the ``\``
+#       allows the RUN command to span multiple lines.
+RUN    /etc/init.d/postgresql start &&\
+    psql --command "CREATE USER docker WITH SUPERUSER PASSWORD 'docker';" &&\
+    createdb -O docker marketalerts
+
+# Adjust PostgreSQL configuration so that remote connections to the
+# database are possible.
+RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.3/main/pg_hba.conf
+
+# And add ``listen_addresses`` to ``/etc/postgresql/9.3/main/postgresql.conf``
+RUN echo "listen_addresses='*'" >> /etc/postgresql/9.3/main/postgresql.conf
+
+# Expose the PostgreSQL port
+EXPOSE 5432
+
+# Add VOLUMEs to allow backup of config, logs and databases
+VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
+
+# Set the default command to run when starting the container
+CMD ["/usr/lib/postgresql/9.3/bin/postgres", "-D", "/var/lib/postgresql/9.3/main", "-c", "config_file=/etc/postgresql/9.3/main/postgresql.conf"]

README.md

@@ -1,43 +1,10 @@
-# MarketAlert
+# web
+
 
 The purpose of this project is to build a web application that enables subscribing to notifications when new products are published on various ad based marketplaces. The MVP will be only based on OLX.ba
 
-## Setup
+Run postgres image with:
+docker run --name pg_test -d -p 5432:5432 marketalerts
 
-### Setup with npm commands
+Run with: 
-
+$ npm start 
-1. Install packages  
-`npm install`
-
-2. Run setup script  
-`npm run setup`  
-this will create and run postgres image and then execute migrations
-
-3. Run app  
-`npm start` to run app without restart on changes or  
-`npm run start-mon` to run app with automatic restart on code change
-
-
-### Manual setup
-
-1. Create postgres docker image   
-`docker build -t marketalerts .`
-
-2. Run postgres image with  
-`docker run --name pg_marketalerts -d -p 5432:5432 marketalerts`
-
-3. Install packages  
-`npm install`
-
-4. Run migrations from `app` folder  
-`npm run migrate` or `npx sequelize db:migrate`
-
-5. Run app  
-`npm start` or `npm run start-mon` to run app with automatic restart on code change
-
-
-### AWS SES
-
-    - 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/config/config.json

@@ -7,9 +7,9 @@
     "dialect": "postgres"
   },
   "test": {
-    "use_env_variable": "DATABASE_URL"
+    "use_env_variable": "JAWSDB_URL"
   },
   "production": {
-    "use_env_variable": "DATABASE_URL"
+    "use_env_variable": "JAWSDB_URL"
   }
 }

app/controllers/dobrodosli.js

@@ -0,0 +1,7 @@
+const getDobrodosli = (req,res) => {
+  res.render('dobrodosli', { nextStep: '/vrstanekretnine' } );
+}
+
+module.exports = { 
+  getDobrodosli
+};

app/controllers/gardenSizes.js

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

app/controllers/goAgain.js

@@ -1,7 +0,0 @@
-const getGoAgain = async (req,res) => {
-  res.render('goAgain');
-};
-
-module.exports = {
-  getGoAgain
-};

app/controllers/grad.js

@@ -0,0 +1,27 @@
+const db = require('../models/index');
+const  { currentRERequest } = require('../helpers/url'); 
+const { regions } = require('../helpers/codes');
+
+const gradovi = regions();
+
+
+const getGrad = (req,res) => {
+  const nextStep = req.query.nextStep || '/';
+  res.render('grad', { 
+         nextStep, 
+         gradovi  
+  });
+}
+
+const postGrad = async (req, res) => {
+  const request = await currentRERequest(req);
+  const nextStep = req.query.nextStep || `/mjesto/${request.uniqueId}`;
+  request.city = req.body.grad;
+  await request.save();
+  res.redirect(nextStep)
+}
+
+module.exports = { 
+  getGrad,
+  postGrad
+};

app/controllers/mjesto.js

@@ -0,0 +1,26 @@
+const db = require('../models/index');
+const  { currentRERequest } = require('../helpers/url'); 
+const { places } = require('../helpers/codes');
+
+const getMjesto = async (req,res) => {
+  let request = await currentRERequest(req);
+  const mjesta = places(request.city);
+  const nextStep = req.query.nextStep || '/';
+  res.render('mjesto', { 
+         nextStep, 
+         mjesta  
+  });
+}
+
+const postMjesto = async (req, res) => {
+  let request = await currentRERequest(req);
+  request.place = req.body.mjesto;
+  console.log("AAA ", req.body);
+  await request.save();
+  res.send("Result is " + JSON.stringify(request)); 
+}
+
+module.exports = { 
+  getMjesto,
+  postMjesto
+};

app/controllers/municipalities.js

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

app/controllers/neighborhoodMap.js

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

app/controllers/prices.js

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

app/controllers/queryReview.js

@@ -1,85 +0,0 @@
-const { currentRERequest } = require('../helpers/url');
-const { getRegionName, getMunicipalityName } = require('../helpers/codes');
-const { realEstateTypes, sizes, gardenSizes, prices, getEnumTypeTitle, getRealEstateTypeEnum } = require('../helpers/enums');
-
-const getQueryReview = async (req,res) => {
-  const request = await currentRERequest(req);
-  const nextStep = req.query.nextStep;
-
-  if (!request || !request.dataValues) {
-    return null;
-  }
-
-  const { 
-    realEstateType, 
-    region, 
-    municipality, 
-    sizeMin, 
-    sizeMax, 
-    gardenSizeMin, 
-    gardenSizeMax, 
-    priceMin, 
-    priceMax } = request.dataValues;
-
-  const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
-  const enableGardenSizeEdit = realEstateTypeObject ? realEstateTypeObject.hasGardenSize : false;
-
-  const realEstateTypeTitle = realEstateType ? getEnumTypeTitle(realEstateTypes, realEstateType) : null;
-  const regionName = region ? getRegionName(region) : null;
-  const municipalityName = (region && municipality) ? getMunicipalityName(region, municipality) : null;
-  const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
-  const gardenSizeTitle =  gardenSizeMin ? gardenSizeMin + "-" + gardenSizeMax + " m2" : null;
-  const priceTitle =  priceMin ? priceMin + "-" + priceMax + " KM" : null;
-
-  const uniqueId = request.dataValues.uniqueId ? request.dataValues.uniqueId : '';
-
-  const queryData = [
-    {
-      id: 'realEstateType',
-      title: realEstateTypeTitle,
-      url: `/vrstanekretnine/${uniqueId}?nextStep=pregled`,
-    },
-    {
-      id: 'region',
-      title: regionName,
-      url: `/grad/${uniqueId}?nextStep=mjesto`,
-    },
-    {
-      id: 'municipality',
-      title: municipalityName,
-      url: `/mjesto/${uniqueId}?nextStep=pregled`,
-    },
-    {
-      id: 'size',
-      title: sizeTitle,
-      url: `/povrsina/${uniqueId}?nextStep=pregled`,
-    },
-    {
-      id: 'gardenSize',
-      title: gardenSizeTitle,
-      url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : '',
-    },
-    {
-      id: 'price',
-      title: priceTitle,
-      url: `/cijena/${uniqueId}?nextStep=pregled`
-    }
-  ];
-
-  res.render('queryReview', {
-    nextStep,
-    queryData,
-  });
-};
-
-const postQueryReview = async (req, res) => {
-  const request = await currentRERequest(req);
-  const nextStep = req.query.nextStep || `/posalji/${request.uniqueId}`;
-
-  res.redirect(nextStep);
-};
-
-module.exports = {
-  getQueryReview,
-  postQueryReview
-};

app/controllers/querySubmit.js

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

app/controllers/realEstateTypes.js

@@ -1,44 +0,0 @@
-const db = require('../models/index');
-
-const { currentRERequest } = require('../helpers/url');
-const { realEstateTypes, getRealEstateTypeEnum } = require('../helpers/enums');
-
-
-const getRealEstateTypes = (req,res) => {
-  res.render('realEstateType', { realEstateTypes });
-};
-
-const postRealEstateTypes = async (req, res) => {
-  const request = await currentRERequest(req);
-
-  const nextStepPage = req.query.nextStep || 'grad';
-
-  if (request && request.uniqueId) {
-    const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
-    request.realEstateType = req.body.realestatetype;
-    if (!getRealEstateTypeEnum(request.realEstateType).hasGardenSize){
-      request.gardenSize = null;
-    }
-    await request.save();
-
-    res.redirect(nextStepUrl)
-  } else {
-    db.RealEstateRequest.create({
-      realEstateType: req.body.realestatetype
-    }).then( (result) => {
-      const nextStepUrl = `/${nextStepPage}/${result.uniqueId}`;
-      res.redirect(nextStepUrl);
-    }).catch( (e) => {
-      res.send(e);
-    });
-  }
-
-
-
-
-};
-
-module.exports = {
-  getRealEstateTypes,
-  postRealEstateTypes
-};

app/controllers/regions.js

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

app/controllers/sizes.js

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

app/controllers/unsubscribe.js

@@ -1,15 +0,0 @@
-
-const { currentRERequest } = require('../helpers/url');
-
-const getUnsubscribe = async (req, res) => {
-    const request = await currentRERequest(req);
-    request.subscribed = false;
-    await request.save();
-
-    res.render('unsubscribe', { nextStep: '/vrstanekretnine' });
-};
-
-
-module.exports = {
-    getUnsubscribe
-};

app/controllers/vrsta_nekretnine.js

@@ -0,0 +1,35 @@
+const db = require('../models/index');
+
+const vrsteNekretnina = [
+  { ime: "Kuća", id: "kuca" }, 
+  { ime: "Stan", id: "stan" }, 
+  { ime: "Vikendica", id: "vikendica" }
+];
+
+
+const getVrstaNekretnine = (req,res) => {
+  const nextStep = req.query.nextStep; 
+  res.render('vrsta_nekretnine', { 
+         nextStep, 
+         vrste: vrsteNekretnina 
+  });
+}
+
+const postVrstaNekretnine = (req, res) => {
+  let nextStep = req.query.nextStep;
+
+  db.RealEstateRequest.create({
+    realEstateType: req.body.vrsta
+  }).then( (result) => {
+    nextStep = nextStep || `/grad/${result.uniqueId}`;
+    res.redirect(nextStep); 
+  }).catch( (e) => {
+   res.send(e);
+  }); 
+  
+}
+
+module.exports = { 
+  getVrstaNekretnine,
+  postVrstaNekretnine
+};

app/controllers/welcome.js

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

app/helpers/awsEmail.js

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

app/helpers/crawlers/olxClawler.js

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

app/helpers/db/dbHelper.js

@@ -1,70 +0,0 @@
-const db = require('../../models/index');
-
-/**
- * Find all subscribed RealEstateRequests 
- */
-const allRERequest = async () => {
-    return await db.RealEstateRequest.findAll({
-        where: {
-            subscribed: true
-        }
-      });
-}
-
-/**
- * Find all subscribed RealEstateRequests by UUID
- */
-const allRERequestByUiid = async (requestArray) => {
-
-  const Op = db.Sequelize.Op;
-  return await db.RealEstateRequest.findAll({
-      where: {
-          subscribed: true,
-          [Op.or]: requestArray
-      }
-    });
-}
-
-/**
- * Find all , or all depending on notified bolean marketalerts, that the hasLocation is true, and order them by email
- * 
- * @param fechAll bolean
- * @param notified bolean
- * 
- * @returns array of MarketAlerts
- */
-const allMarketAlerts = async (fetchAll, notified) => {
-
-    let queryObject = {
-        order: [
-            ['email', 'DESC'],
-        ]
-    }
-
-    if (!fetchAll){
-        queryObject.where = {
-            notified: notified,
-            hasLocation: true
-        }
-    }
-
-    return await db.MarketAlert.findAll(queryObject);
-  }
-  
-/**
- * Find all unnotified marketalerts 
- *  @param latLng array
- *  @param email string
- * 
- * @returns array of MarketAlerts
- */
-const findPointInsideBoundingBox = async (latLng, email) => {
-  return await db.sequelize.query(`SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${latLng[0]} ${latLng[1]})'))`);
-}
-
-module.exports = {
-  allRERequest,
-  allMarketAlerts,
-  allRERequestByUiid,
-  findPointInsideBoundingBox
-};

app/helpers/email.js

@@ -1,9 +0,0 @@
-
-const isValidEmail = (email) => {
-  const simpleEmailRegex = /^.+@.+\..+$/;
-  return (email && email.length < 250 && simpleEmailRegex.test(email));
-};
-
-module.exports = {
-  isValidEmail
-};

app/helpers/enums.js

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

app/helpers/scraping.js

@@ -0,0 +1,27 @@
+let fetch = require("node-fetch");
+
+const getRealEstateGeolocation = async (url) => {
+  let response = await fetch(url);
+  const body = await response.text();
+  let lat, long;
+  const googleMapRegex = new RegExp(/google.maps.LatLng\((.*?)\)/g);
+  const googleMapString = body.match(googleMapRegex);
+  if (googleMapString && googleMapString.length) {
+    const latLongRegex =  new RegExp(/\((.*?)\)/g);
+    let latLongString = googleMapString[0].match(latLongRegex);
+    if (latLongString && latLongString.length) {
+      latLongString = latLongString[0].trim();
+      latLongString = latLongString.substr(1, latLongString.length - 2);
+      const latLongArray = latLongString.split(",");
+      if (latLongArray.length) {
+        lat = latLongArray[0];
+        long = latLongArray[1];
+      }
+    }
+  }
+  return { lat, long };
+}
+
+module.exports = {
+  getRealEstateGeolocation
+};

app/helpers/url.js

@@ -5,8 +5,10 @@ const currentRERequest = async (req) => {
   if(!uniqueId) return null;
 
   const request = await db.RealEstateRequest.findOne({ where: {uniqueId} });
+  console.log("Request ", request);
   return request;
-};
+}
+
 module.exports = {
-  currentRERequest,
+  currentRERequest
-};
+}

app/lib/arethereanynewitems.js

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

app/lib/scraptheitems.js

@@ -1,6 +1,6 @@
 let fetch = require("node-fetch");
 let cheerio = require("cheerio");
-const areThereAnyNewItems = require("./areThereAnyNewItems");
+const areThereAnyNewItems = require("./arethereanynewitems");
 
 async function scrapTheItems(url, controlDate, noNewItems = false) {
   let items = [];

app/lib/sendnotification.js

@@ -1,11 +1,11 @@
-const scrapTheItems = require("./scrapTheItems");
+const scrapTheItems = require("./scraptheitems");
 const convertToDate = require("./convertToDate");
 const AWS = require('aws-sdk');
-// AWS.config.update({region: 'eu-central-1'});
+AWS.config.update({region: 'eu-central-1'});
 
 
 async function sendNotification(marketAlert) {
-  const { id, email, olx_url } = marketAlert;
+  const { id, email, olx_url, last_date } = marketAlert;
   let url =
     "https://www.olx.ba/pretraga?" + olx_url + "&sort_order=desc&sort_po=datum";
   let newItems = await scrapTheItems(url);
@@ -17,8 +17,8 @@ async function sendNotification(marketAlert) {
       ""
     );
 
-  // Create sendEmail params
+  // Create sendEmail params 
-  const params = {
+  var params = {
     Destination: { /* required */
       CcAddresses: [
       ],
@@ -50,7 +50,7 @@ async function sendNotification(marketAlert) {
 
   if (message) {
     const sendPromise = new AWS.SES({apiVersion: '2010-12-01'}).sendEmail(params).promise();
-    await sendPromise;
+    await sendPromise; 
     return { id, date: String(convertToDate(lastDate)) };
   }
 }

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

@@ -12,7 +12,8 @@ module.exports = {
         type: Sequelize.UUID
       },
       realEstateType: {
-        type: Sequelize.STRING
+        type: Sequelize.ENUM,  
+        values: ['kuca','stan','vikendica','plac','poslovni_prostor','apartman','garaza']
       },
       email: {
         type: Sequelize.STRING

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

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

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

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

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

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

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

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

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

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

app/migrations/20190523144812-activate-postgis.js

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

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

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

app/migrations/20190529093410-slider-fields.js

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

app/migrations/20190530101945-range-fields.js

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

app/migrations/20190531111232-subscribed-boolean.js

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

app/migrations/20190618103020-expand-maketalert.js

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

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

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

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

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

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

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

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

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

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

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

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

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

app/models/marketalert.js

@@ -1,21 +1,8 @@
 'use strict';
 module.exports = (sequelize, DataTypes) => {
   const MarketAlert = sequelize.define('MarketAlert', {
-    url: DataTypes.STRING,
+    olxUrl: DataTypes.STRING,
-    realestateOrigin: DataTypes.STRING,
-    originId: DataTypes.STRING,
     lastDate: DataTypes.STRING,
-    size : DataTypes.INTEGER,
-    gardenSize : DataTypes.INTEGER,
-    price : DataTypes.INTEGER,
-    municipality : DataTypes.STRING,
-    region : DataTypes.STRING,
-    realEstateType : DataTypes.STRING,
-    notified : DataTypes.BOOLEAN,
-    title : DataTypes.STRING,
-    request: DataTypes.STRING,
-    hasLocation: DataTypes.BOOLEAN,
-    
     email: { 
       type: DataTypes.STRING,
       allowNul: false

app/models/realestaterequest.js

@@ -1,25 +1,18 @@
 'use strict';
-
 module.exports = (sequelize, DataTypes) => {
-
   const RealEstateRequest = sequelize.define('RealEstateRequest', {
     uniqueId: {
       type: DataTypes.UUID,
       defaultValue: DataTypes.UUIDV4,
       allowNull: false
     },
-    realEstateType: DataTypes.STRING,
+    realEstateType: {
-    email: DataTypes.STRING,
+      type: DataTypes.ENUM,
-    region: DataTypes.STRING,
+      values: ['kuca','stan','vikendica','plac','poslovni_prostor','apartman','garaza']
-    municipality: DataTypes.STRING,
+    },
-    sizeMin: DataTypes.INTEGER,
+    email: DataTypes.STRING, 
-    sizeMax: DataTypes.INTEGER,
+    city: DataTypes.STRING,
-    gardenSizeMin: DataTypes.INTEGER,
+    place: DataTypes.STRING,
-    gardenSizeMax: DataTypes.INTEGER,
-    priceMin: DataTypes.INTEGER,
-    priceMax: DataTypes.INTEGER,
-    bounding_box: DataTypes.GEOMETRY('POINT', 4326),
-    subscribed: DataTypes.BOOLEAN
   }, {});
   RealEstateRequest.associate = function(models) {
     // associations can be defined here

app/public/main.css

@@ -1,39 +1,11 @@
-.welcome-center-button { 
+.dobrodosli-center-button { 
   width: 100%; 
 }
 
-.welcome-big-logo { 
+.dobrodosli-big-logo { 
   font-size: 200pt;
   background-image: url(./images/logo.png);
   background-size: contain;
   background-repeat: no-repeat;
   color: rgba(0, 0, 0, 0);
 }
-.no-ui-slider {
-  width: 95%
-}
-
-
-#map {
-  height: 50%;
-}
-
-html,
-body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-}
-  
-#floating-panel {
-  top: 10px;
-  left: 25%;
-  z-index: 5;
-  background-color: #fff;
-  padding: 5px;
-  border: 1px solid #999;
-  text-align: center;
-  font-family: 'Roboto', 'sans-serif';
-  line-height: 30px;
-  padding-left: 10px;
-}

app/services/crawlerService.js

@@ -1,86 +0,0 @@
-
-const Promise = require("bluebird");
-const OlxCrawler = require("../helpers/crawlers/olxClawler");
-const db = require("../models/index");
-const { allMarketAlerts } = require('../helpers/db/dbHelper');
-
-const olxCrawler = new OlxCrawler(1, 2, 3);
-
-const crawlers = [
-    olxCrawler,
-];
-
-async function crawlAll() {
-    console.log("CRAWLER SERVICE: crawlAll");
-
-    try {
-        const marketAlertsFromDb = await allMarketAlerts(true);
-        const hrefs = [];
-       
-        marketAlertsFromDb.map(marketAlert => {
-            if (hrefs[marketAlert.request] === undefined) {
-                hrefs[marketAlert.request] = []
-            }
-
-            hrefs[marketAlert.request].push(marketAlert.url);
-        })
-
-        global.hrefs = hrefs;
-        console.log("CRAWLER SERVICE: GLOBAL HREFS");
-        console.log(global.hrefs);
-
-    } catch (e) {
-        console.error("CRAWLER SERVICE:could not fetch marketalerts ", e);
-    }
-
-    return Promise.map(crawlers, function (crawler) {
-        return crawler.crawl();
-    }).then(async (results) => {
-
-        try {
-
-            const marketAlertsFromDb = await allMarketAlerts(false, true);
-
-            console.log("CRAWLER SERVICE: number of existing MarketAlerts from db: " + marketAlertsFromDb.length);
-
-            const marketAlerts = [];
-            const mergedResults = [].concat.apply([], results);
-
-            for (const result of mergedResults) {
-                marketAlerts.push({
-                    url: result.url,
-                    realestateOrigin: "OLX",
-                    originId: 1,
-                    size: result.size,
-                    price: result.price,
-                    email: result.email,
-                    request: result.uuid,
-                    // lastDate: DataTypes.STRING,
-                    municipality: result.municipality,
-                    region: result.region,
-                    gardenSize: isNaN(result.gardenSize) ? 0 : result.gardenSize,
-                    realEstateType: result.realEstateType,
-                    title: result.title,
-                    notified: false,
-                    hasLocation: result.hasLocation
-                })
-            }
-            console.log("CRAWLER SERVICE: Number of crawler results: " + marketAlerts.length);
-
-            try {
-
-                const filteredMarketAlerts = marketAlerts.filter((elem) => !marketAlertsFromDb.find(({ url }) => elem.url === url));
-                console.log("CRAWLER SERVICE: Number of new crawler results: " + filteredMarketAlerts.length);
-
-                await db.MarketAlert.bulkCreate(filteredMarketAlerts);
-
-            } catch (e) {
-                console.log("CRAWLER SERVICE: Could not bulkCreate marketalers reason: ", e);
-            }
-        } catch (e) {
-            console.log("CRAWLER SERVICE: Error crawling. Trying next crawler! ", e);
-        }
-    })
-};
-module.exports = crawlAll;
-// crawlAll();

app/services/notificationService.js

@@ -1,29 +0,0 @@
-
-const db = require("../models/index");
-const { allMarketAlerts } = require('../helpers/db/dbHelper');
-const { createMarketAlertEmailTemplate, sendBulkEmail } = require('../helpers/awsEmail');
-
-
-async function processNotifications() {
-
-    try {
-        const marketAlerts = await allMarketAlerts(false, false);
-        console.log(marketAlerts.length)
-        await createMarketAlertEmailTemplate();
-        if (marketAlerts.length > 0) {
-            console.log("NOTIFICATION SERVICE: Number of new alerts: " + marketAlerts.length)
-            await sendBulkEmail(marketAlerts);
-        } else {
-            console.log("NOTIFICATION SERVICE: No new alerts");
-        }
-
-        await db.MarketAlert.update(
-            { notified: true }, /* set attributes' value */
-            { where: { notified: false } } /* where criteria */
-        );
-    } catch (e) {
-        console.log("NOTIFICATION SERVICE: could not send notifications reason: ", e);
-    }
-}
-
-module.exports = processNotifications;

app/views/dobrodosli.ejs

@@ -1,7 +1,7 @@
 
 <!--   -->
 <div class="row center-align">
-    <span class="welcome-big-logo">🤙</span>
+    <span class="dobrodosli-big-logo">🤙</span>
 </div>
 <div class="row center-align">
   <div>Sve nekretnine dostupne u oglasima.</div>
@@ -10,7 +10,7 @@
 </div>
 <div class="row">
 <div class="col s6 push-s3">
-<a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
+<a href="<%= nextStep %>" class="dobrodosli-center-button waves-effect waves-light btn">
   Javi mi
 </a>
 </div>

app/views/gardenSize.ejs

@@ -1,6 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koliko okućnice tražite ?</h2>
-</div>
-
-<% include partials/range %> 

app/views/goAgain.ejs

@@ -1,25 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h4>Provjerite Vaš email !</h4>
-</div>
-
-<div class="row center-align">
-  <h4>Želite li pretražiti još jednu nekretninu ?</h4>
-</div>
-
-<form method="POST" id="form-goagain">
-<div class="row">
-  <div class="col s3 push-s3">
-    <a href="/" class="welcome-center-button waves-effect waves-light btn">
-      Da
-    </a>
-  </div>
-
-  <div class="col s3 push-s3">
-    <a href="/" class="welcome-center-button waves-effect waves-light btn">
-      Ne
-    </a>
-  </div>
-</div>
-</form>
-

app/views/grad.ejs

@@ -0,0 +1,25 @@
+<div class="row center-align">
+  <h2>U kojoj regiji tražite nekretninu?</h2>
+</div>
+
+<form method="POST" id="form-grad">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(const grad of gradovi) { %> 
+    <li class="collection-item" > <div id="<%= grad.id %>" ><%= grad.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="grad" id="grad" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#grad").val(clickedId);
+     $("#form-grad").submit();  
+   });
+ });
+</script>
+

app/views/layout.ejs

@@ -3,7 +3,6 @@
   <head>
      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
       <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
     <meta charset="UTF-8" />
@@ -14,9 +13,5 @@
       <%-body%>
     </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script> 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/13.1.5/nouislider.min.js"></script> 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/wnumb/1.1.0/wNumb.min.js"></script> 
-    
-    
   </body>
 </html>

app/views/mjesto.ejs

@@ -0,0 +1,25 @@
+<div class="row center-align">
+  <h2>U kojem mjestu tražite nekretninu?</h2>
+</div>
+
+<form method="POST" id="form-mjesto">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(const mjesto of mjesta) { %> 
+    <li class="collection-item" > <div id="<%= mjesto.id %>" ><%= mjesto.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="mjesto" id="mjesto" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#mjesto").val(clickedId);
+     $("#form-mjesto").submit();  
+   });
+ });
+</script>
+

app/views/municipality.ejs

@@ -1,28 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojem mjestu tražite nekretninu?</h2>
-</div>
-
-<form method="POST" id="form-municipality">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const municipality of municipalities) { %>
-    <li class="collection-item">
-      <div val="<%= municipality.name %>" id="<%= municipality.id %>" onclick="saveAndSubmit(this.id)"><%= municipality.name %>
-        <a href="#" class="secondary-content">
-          <i class="material-icons">send</i>
-        </a>
-      </div>
-    </li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="municipality" id="municipality" />
-</div>
-</form>
-
-<script>
-   function saveAndSubmit(id, name) {
-     $("#municipality").val(id);
-     $("#form-municipality").submit();
-   }
-</script>

app/views/neighborhoodMap.ejs

@@ -1,129 +0,0 @@
-<div class="row center-align">
-  <h2>U kojem naselju tražite nekretninu?</h2>
-</div>
-
-<div class="row center-align">
-  <div id="floating-panel">
-    <input id="address" type="textbox" value="">
-    <input id="submit" type="button" value="Trazi">
-  </div>
-  <div id="map"></div>
-</div>
-<form method="POST" id="form-map-output">
-  <div class="row center-align">
-    <div class="col s6 push-s3">
-      <a id="btnsubmit" href="#" class="welcome-center-button waves-effect waves-light btn">
-        Dalje
-      </a>
-    </div>
-  </div>
-  <input type="hidden" name="north" id=north />
-  <input type="hidden" name="south" id=south />
-  <input type="hidden" name="east" id=east />
-  <input type="hidden" name="west" id=west />
-</form>
-<script>
-
-
-  var map;
-  var municipality = "<%= municipality%>";
-  var defaultAddress = document.getElementById('address');
-  var latLngRestrictions = [];
-
-  var BOSNIA_BOUNDS = {
-    north: 45.70,
-    south: 41.69,
-    west: 15.55,
-    east: 20.77,
-  };
-
-  function initMap() {
-    var geocoder = new google.maps.Geocoder();
-
-    document.getElementById('submit').addEventListener('click', function () {
-      geocodeAddress(geocoder, map, false, latLngRestrictions);
-    });
-
-
-
-    defaultAddress.value = municipality;
-    geocodeAddress(geocoder, map, true);
-
-    $(document).ready(() => {
-      $("#btnsubmit").click(() => {
-        var bounds = map.getBounds();
-
-        $("#north").val(map.getBounds().getNorthEast().lat());
-        $("#south").val(map.getBounds().getSouthWest().lat());
-        $("#east").val(map.getBounds().getNorthEast().lng());
-        $("#west").val(map.getBounds().getSouthWest().lng());
-
-        $("#form-map-output").submit();
-      });
-    });
-
-
-  }
-
-  function geocodeAddress(geocoder, resultsMap, isInit, geocoderRestrictions) {
-
-
-
-    var address = document.getElementById('address').value;
-    let geocoderOptions = geocoderRestrictions
-      ? { 'address': address, 'bounds': geocoderRestrictions }
-      : { 'address': address }
-
-    geocoder.geocode(geocoderOptions, function (results, status) {
-      if (status === 'OK') {
-
-        var bounds = results[0].geometry.bounds;
-
-        var resultBounds = new google.maps.LatLngBounds(
-
-          results[0].geometry.viewport.getSouthWest(),
-          results[0].geometry.viewport.getNorthEast()
-        );
-
-        if (isInit) {
-          map = new google.maps.Map(document.getElementById('map'), {
-            zoom: 11,
-          });
-          resultsMap = map
-        }
-
-        // map.fitBounds(resultBounds);
-        resultsMap.setCenter(results[0].geometry.location);
-
-        if (isInit) {
-
-          latLngRestrictions = new google.maps.LatLngBounds(
-            new google.maps.LatLng(bounds.getSouthWest().lat(), bounds.getSouthWest().lng()),
-            new google.maps.LatLng(bounds.getNorthEast().lng(), bounds.getNorthEast().lng()));
-
-
-          let latLngRestrictionsa = {
-            west: bounds.getSouthWest().lng(),
-            east: bounds.getNorthEast().lng(),
-            north: bounds.getNorthEast().lat(),
-            south: bounds.getSouthWest().lat()
-          }
-          map.setOptions({
-            restriction: {
-              latLngBounds: latLngRestrictionsa,
-              strictBounds: false,
-            }
-          })
-        } else {
-          resultsMap.setZoom(17);
-        }
-
-      } else {
-        alert('Geocode was not successful for the following reason: ' + status);
-      }
-    });
-  }
-</script>
-<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAna8ohfV2HBMcxGk_29vqxU5Z_bDickqg&callback=initMap" async
-  defer></script>
-</div>

app/views/partials/range.ejs

@@ -1,53 +0,0 @@
-<form method="POST" id="form-range">
-
-  <div class="row center-align no-ui-slider" id="slider"></div>
-
-  <div class="col s6 push-s3">
-    <a id="btnsubmit" href="#" class="welcome-center-button waves-effect waves-light btn">
-      Dalje
-    </a>
-  </div>
-
-  <input type="hidden" name="from" id="from" />
-  <input type="hidden" name="to" id="to" />
-</form>
-
-<script>
-
-  $(document).ready(() => {
-
-    var slider = document.getElementById('slider');
-
-    const unitFormat = wNumb({
-        decimals: 3,
-        thousand: '.',
-        suffix: '<%= unit %>'
-      })
-
-
-    noUiSlider.create(slider, {
-      start: [<%= rangeFrom.value %>, <%= rangeTo.value %>],
-      connect: true,
-      tooltips: true,
-      step: <%= rangeFrom.step %>,
-      range: {
-        'min': <%= rangeFrom.min %>,
-        'max': <%= rangeTo.max %>
-    },
-      format: unitFormat
-    });
-
-
-    $("#btnsubmit").click(() => {
-      const sliderValues = slider.noUiSlider.get();
-      
-      $("#from").val(unitFormat.from(sliderValues[0]));
-      $("#to").val(unitFormat.from(sliderValues[1]));
-
-      $("#form-range").submit();
-      // });
-
-    });
-  });
-
-</script>

app/views/price.ejs

@@ -1,6 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koja Vam okvirna cijena odgovara ?</h2>
-</div>
-
-<% include partials/range %> 

app/views/queryReview.ejs

@@ -1,36 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Da li je ovo to što ste tražili ?</h2>
-</div>
-
-<form method="POST" id="form-queryreview">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const stepData of queryData) { %>
-      <li class="collection-item" >
-        <div id="<%= stepData.id %>" ><%= stepData.title || '-' %>
-          <a href="<%= stepData.url %>" class="secondary-content">
-            <i class="material-icons">edit</i>
-          </a>
-        </div>
-      </li>
-    <% } %>
-  </ul>
-</div>
-<div class="row">
-  <div class="col s6 push-s3">
-    <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
-      To je to
-    </a>
-  </div>
-</div>
-</form>
-
-<script>
- $(document).ready( () => {
-   $("#submit").click( () => {
-     $("#form-queryreview").submit();
-   });
- });
-</script>
-

app/views/querySubmit.ejs

@@ -1,68 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h4>Da Vam javimo kada se Vaša željena nekretnina pojavi u oglasima, upišite svoj e-mail</h4>
-</div>
-
-<form method="POST" id="form-submitquery">
-  <div class="row center-align">
-    <div class="col s6 push-s3">
-      <input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" />
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col s6 push-s3">
-      <h6 id="error-lable-email" style="color: red"><%= error %> </h6>
-    </div>
-  </div>
-
-  <div class="row center-align">
-    <div class="col s6 push-s3">
-      <input id="confirm" name="confirm" type="email" placeholder="potvrdite.email@mail.com" required size="250" />
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col s6 push-s3">
-      <h6 id="error-lable-email-confirm" style="color: red"></h6>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col s6 push-s3">
-      <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
-        Javi mi
-      </a>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col s6 push-s3">
-      <p>* U svakom trenutku možete prekinuti slanje objava kroz link u e-mailu</p>
-    </div>
-  </div>
-</form>
-
-<script>
-  $(document).ready(() => {
-    $("#submit").click(() => {
-      const emailField = document.getElementById('email');
-      const emailConfirmField = document.getElementById('confirm');
-      const errorMessage = "Greška ! Unedite validan email";
-      $("#error-lable-email").text("");
-      $("#error-lable-email-confirm").text("");
-
-      if (!emailField.validity.valid) {
-        $("#error-lable-email").text(errorMessage);
-        return
-      }
-
-      if (!emailConfirmField.validity.valid) {
-        $("#error-lable-email-confirm").text(errorMessage);
-        return
-      }
-
-      $("#form-submitquery").submit();
-
-    });
-  });
-</script>

app/views/realEstateType.ejs

@@ -1,33 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Koju nekretninu tražite?</h2>
-</div>
-
-<form method="POST" id="form-real-estate-type">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const realEstateType of realEstateTypes) { %>
-    <li class="collection-item">
-      <div id="<%= realEstateType.id %>" onclick="saveAndSubmit(this.id)"><%= realEstateType.title %>
-        <a href="#" class="secondary-content">
-          <i class="material-icons">send</i>
-        </a>
-      </div>
-    </li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="realestatetype" id="realestatetype" />
-</div>
-</form>
-
-<script>
-  function saveAndSubmit(id) {
-   $("#realestatetype").val(id);
-   $("#form-real-estate-type").submit();
-  }
-</script>
-
-
-
-
-

app/views/region.ejs

@@ -1,29 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>U kojoj regiji tražite nekretninu?</h2>
-</div>
-
-<form method="POST" id="form-region">
-<div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const region of regions) { %>
-    <li class="collection-item">
-      <div id="<%= region.id %>" onclick="saveAndSubmit(this.id)"><%= region.name %>
-        <a href="#" class="secondary-content">
-          <i class="material-icons">send</i>
-        </a>
-      </div>
-    </li>
-    <% } %>
-  </ul>
-  <input type="hidden" name="region" id="region" />
-</div>
-</form>
-
-<script>
-  function saveAndSubmit(id) {
-    $("#region").val(id);
-    $("#form-region").submit();
-  }
-</script>
-

app/views/size.ejs

@@ -1,6 +0,0 @@
-<!--suppress HtmlUnknownAnchorTarget -->
-<div class="row center-align">
-  <h2>Od koliko kvadrata tražite nekretninu ?</h2>
-</div>
-
-<% include partials/range %> 

app/views/unsubscribe.ejs

@@ -1,14 +0,0 @@
-
-<div class="row center-align">
-    <span class="welcome-big-logo">🤙</span>
-</div>
-<div class="row center-align">
-  <div>Uspješno ste se odjavili</div>
-</div>
-<div class="row">
-<div class="col s6 push-s3">
-<a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
-  Nova pretraga
-</a>
-</div>
-</div>

app/views/vrsta_nekretnine.ejs

@@ -0,0 +1,29 @@
+<div class="row center-align">
+  <h2>Koju nekretninu tražite?</h2>
+</div>
+
+<form method="POST" id="form-vrsta">
+<div class="row center-align">
+  <ul class="collection with-header">
+    <% for(let vrsta of vrste) { %> 
+    <li class="collection-item" > <div id="<%= vrsta.id %>" ><%= vrsta.ime %><a href="#!" class="secondary-content"><i class="material-icons">send</i></a></div></li>
+    <% } %>
+  </ul>
+  <input type="hidden" name="vrsta" id="vrsta" />
+</div>
+</form>
+
+<script>
+ $(document).ready( () => {
+   $(".collection-item").click( (e) => {
+     const clickedId = $(e.target).attr("id"); 
+     $("#vrsta").val(clickedId);
+     $("#form-vrsta").submit();  
+   });
+ });
+</script>
+
+
+
+
+

development.env

@@ -1,5 +0,0 @@
-  AMAZON_ACCES_KEY_ID=(your-key-here)
-  AMAZON_SECRET_ACCESS_KEY=(your-key-here)
-  AMAZON_REGION=eu-west-1
-  APP_URL=http://localhost:3001
-  SOURCE_EMAIL=info@saburly.com

index.js

@@ -1,25 +1,14 @@
-const welcome = require('./app/controllers/welcome').getWelcome;
+const dobrodosli = require('./app/controllers/dobrodosli').getDobrodosli;
-const { getRealEstateTypes, postRealEstateTypes } = require('./app/controllers/realEstateTypes');
+const { getVrstaNekretnine, postVrstaNekretnine} = require('./app/controllers/vrsta_nekretnine');
-const { getRegion, postRegion } = require('./app/controllers/regions');
+const { getGrad, postGrad } = require('./app/controllers/grad');
-const { getMunicipality, postMunicipality } = require('./app/controllers/municipalities');
+const { getMjesto, postMjesto } = require('./app/controllers/mjesto');
-const { getSize, postSize } = require('./app/controllers/sizes');
-const { getGardenSize, postGardenSize } = require('./app/controllers/gardenSizes');
-const { getPrice, postPrice } = require('./app/controllers/prices');
-const { getQueryReview, postQueryReview } = require('./app/controllers/queryReview');
-const { getQuerySubmit, postQuerySubmit } = require('./app/controllers/querySubmit');
-const { getGoAgain } = require('./app/controllers/goAgain');
-const { getNeighborhood, postNeighborhood } = require('./app/controllers/neighborhoodMap');
-const { getUnsubscribe } = require('./app/controllers/unsubscribe');
-const schedule = require('node-schedule');
-const crawlAll = require('./app/services/crawlerService')
-const processNotifications = require('./app/services/notificationService')
 
 let express = require("express");
 const path = require("path");
 const bodyParser = require("body-parser");
 const MarketAlert = require("./app/models/marketalert");
-const sendNotification = require("./app/lib/sendNotification");
+const sendNotification = require("./app/lib/sendnotification");
-const scrapTheItems = require("./app/lib/scrapTheItems");
+const scrapTheItems = require("./app/lib/scraptheitems");
 const sequelize = require("./app/models/index").sequelize;
 const Twocheckout = require("2checkout-node");
 const layout = require('express-layout');
@@ -37,7 +26,7 @@ app.use(layout());
 const compression = require('compression');
 app.use(compression());
 
-app.get("/api/sendnotifications", async (req, res) => {
+app.get("/api/sendnotifications", async function(req, res) {
   let marketAlerts = await MarketAlert.findAll();
 
   let lastDateUpdate = await Promise.all(
@@ -70,7 +59,7 @@ app.get("/api/items/:url", async (req, res) => {
   });
 });
 
-app.post("/api/marketalerts", (req, res) => {
+app.post("/api/marketalerts", function(req, res) {
   const { email, last_date, olx_url } = req.body;
   console.log(email, last_date, olx_url);
   sequelize.sync().then(() => {
@@ -86,7 +75,7 @@ app.post("/api/marketalerts", (req, res) => {
   });
 });
 
-app.post("/api/payforalert", (req, res) => {
+app.post("/api/payforalert", function(request, response) {
   let tco = new Twocheckout({
     sellerId: "901402692",
     privateKey: "A28DCE5F-9292-405C-8161-F84D8BB83AFC",
@@ -95,7 +84,7 @@ app.post("/api/payforalert", (req, res) => {
 
   let params = {
     merchantOrderId: "123",
-    token: req.body.token,
+    token: request.body.token,
     currency: "USD",
     total: "2.00",
     billingAddr: {
@@ -105,74 +94,34 @@ app.post("/api/payforalert", (req, res) => {
       state: "BiH",
       zipCode: "71000",
       country: "BiH",
-      email: req.body.email,
+      email: request.body.email,
       phoneNumber: "5555555555"
     }
   };
 
-  tco.checkout.authorize(params, function (error, data) {
+  tco.checkout.authorize(params, function(error, data) {
     if (error) {
-      res.send(error.message);
+      response.send(error.message);
     } else {
-      res.send(data.response.responseMsg);
+      response.send(data.response.responseMsg);
     }
   });
 });
 
-var runServices = async () => {
+app.get('/', dobrodosli); 
+app.get('/vrstanekretnine/:request_id', getVrstaNekretnine);
+app.get('/vrstanekretnine', getVrstaNekretnine);
 
-  
+app.post('/vrstanekretnine/:request_id', postVrstaNekretnine);
-}
+app.post('/vrstanekretnine', postVrstaNekretnine);
 
-runServices();
+app.get('/grad/:request_id', getGrad);
+app.post('/grad/:request_id', postGrad);
 
-var rule = new schedule.RecurrenceRule();
+app.get('/mjesto/:request_id', getMjesto);
-  rule.seccond = 1;
+app.post('/mjesto/:request_id', postMjesto);
-  schedule.scheduleJob(rule, async function () {
-    console.log(new Date(), 'Crawler service started');
-    await crawlAll();
-    console.log(new Date(), 'Crawler service finished, starting Notification service');
-    await processNotifications();
-    console.log(new Date(), 'Notification service finished');
-  });
 
 
-
+app.use('/assets', express.static('./app/public'))
-app.get('/', welcome);
-app.get('/vrstanekretnine/:request_id', getRealEstateTypes);
-app.get('/vrstanekretnine', getRealEstateTypes);
-
-app.post('/vrstanekretnine/:request_id', postRealEstateTypes);
-app.post('/vrstanekretnine', postRealEstateTypes);
-
-app.get('/grad/:request_id', getRegion);
-app.post('/grad/:request_id', postRegion);
-
-app.get('/mjesto/:request_id', getMunicipality);
-app.post('/mjesto/:request_id', postMunicipality);
-
-app.get('/naselje/:request_id/:municipality', getNeighborhood);
-app.post('/naselje/:request_id/:municipality', postNeighborhood);
-
-app.get('/povrsina/:request_id', getSize);
-app.post('/povrsina/:request_id', postSize);
-
-app.get('/okucnica/:request_id', getGardenSize);
-app.post('/okucnica/:request_id', postGardenSize);
-
-app.get('/cijena/:request_id', getPrice);
-app.post('/cijena/:request_id', postPrice);
-
-app.get('/pregled/:request_id', getQueryReview);
-app.post('/pregled/:request_id', postQueryReview);
-
-app.get('/posalji/:request_id', getQuerySubmit);
-app.post('/posalji/:request_id', postQuerySubmit);
-
-app.get('/odjava/:request_id', getUnsubscribe);
-
-app.get('/ponovo', getGoAgain);
-
-app.use('/assets', express.static('./app/public'));
 
 app.listen(port, () => console.log(`Example app listening on port ${port}!`));

package.json

@@ -5,12 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node ./index.js",
+    "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",
-    "docker-start": "docker start pg_marketalerts",
-    "docker-stop": "docker stop pg_marketalerts"
   },
   "repository": {
     "type": "git",
@@ -25,7 +20,6 @@
     "2checkout-node": "0.0.1",
     "@sendgrid/mail": "^6.3.1",
     "aws-sdk": "^2.422.0",
-    "bluebird": "^3.5.5",
     "cheerio": "^1.0.0-rc.2",
     "compression": "^1.7.4",
     "dotenv": "^7.0.0",
@@ -34,13 +28,9 @@
     "express-ejs-layouts": "^2.5.0",
     "express-layout": "^0.1.0",
     "node-fetch": "^2.3.0",
-    "node-schedule": "^1.3.2",
     "pg": "^7.10.0",
     "react-step-wizard": "^5.1.0",
     "sequelize": "^4.43.2",
-    "sequelize-cli": "^5.5.0"
+    "sequelize-cli": "^5.4.0"
-  },
-  "devDependencies": {
-    "nodemon": "^1.19.0"
   }
 }