Merge branch 'add-other-olx-real-estate-categories' into 'master'

Add other olx real estate categories

See merge request saburly/marketalarm/web!43

app/common/enums.js

@@ -53,17 +53,41 @@ const AD_CATEGORY = {
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS,
     gardenSizeSliderOptions: GARDEN_SIZE_SLIDER_OPTIONS
   },
-  //OFFICE: { id: "OFFICE", title: "Kancelarija", hasGardenSize: false },
+  OFFICE: {
-  //LAND: { id: "LAND", title: "Zemljište", hasGardenSize: true },
+    id: "OFFICE",
+    title: "Kancelarija",
+    hasGardenSize: false,
+    priceSliderOptions: PRICE_SLIDER_OPTIONS,
+    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
+  },
+  LAND: {
+    id: "LAND",
+    title: "Zemljište",
+    hasGardenSize: false,
+    priceSliderOptions: PRICE_SLIDER_OPTIONS,
+    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
+  },
   APARTMENT: {
     id: "APARTMENT",
     title: "Apartman",
     hasGardenSize: false,
     priceSliderOptions: PRICE_SLIDER_OPTIONS,
     sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
+  },
+  GARAGE: {
+    id: "GARAGE",
+    title: "Garaža",
+    hasGardenSize: false,
+    priceSliderOptions: PRICE_SLIDER_OPTIONS,
+    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
+  },
+  COTTAGE: {
+    id: "COTTAGE",
+    title: "Vikendica",
+    hasGardenSize: true,
+    priceSliderOptions: PRICE_SLIDER_OPTIONS,
+    sizeSliderOptions: HOME_SIZE_SLIDER_OPTIONS
   }
-  //GARAGE: { id: "GARAGE", title: "Garaža", hasGardenSize: false },
-  //COTTAGE: { id: "COTTAGE", title: "Vikendica", hasGardenSize: true }
 };
 
 const AD_STATUS = {

app/controllers/queryReview.js

@@ -27,13 +27,11 @@ const getQueryReviewData = searchRequest => {
     : "-";
 
   const locationTitle = "Location description - PLACEHOLDER";
-  const sizeTitle = sizeMin && sizeMax ? `${sizeMin} - ${sizeMax} m2` : "-";
+  const sizeTitle = `${sizeMin} - ${sizeMax} m2`;
-  const gardenSizeTitle =
+  const gardenSizeTitle = enableGardenSizeEdit
-    enableGardenSizeEdit && gardenSizeMin && gardenSizeMax
+    ? `${gardenSizeMin} - ${gardenSizeMax} m2`
-      ? `${gardenSizeMin} - ${gardenSizeMax} m2`
+    : "-";
-      : "-";
+  const priceTitle = `${priceMin} - ${priceMax} KM`;
-  const priceTitle =
-    priceMin && priceMax ? `${priceMin} - ${priceMax} KM` : "-";
 
   return [
     {
@@ -75,11 +73,13 @@ const getQueryReview = async (req, res) => {
   const nextStep = req.query.nextStep;
   const error = req.query.error;
   const queryReviewData = getQueryReviewData(searchRequest);
+  const email = searchRequest.email;
 
   res.render("queryReview", {
     nextStep,
     queryReviewData,
     title,
+    email,
     error
   });
 };

app/controllers/realEstateFilters.js

@@ -23,15 +23,15 @@ const getFilters = async (req, res) => {
     gardenSizeSliderOptions
   } = category;
 
-  if (priceMin && priceMax) {
+  if (priceMin || priceMax) {
     priceSliderOptions.start = [priceMin, priceMax];
   }
 
-  if (sizeMin && sizeMax) {
+  if (sizeMin || sizeMax) {
     sizeSliderOptions.start = [sizeMin, sizeMax];
   }
 
-  if (gardenSizeSliderOptions && gardenSizeMin && gardenSizeMax) {
+  if (gardenSizeSliderOptions && (gardenSizeMin || gardenSizeMax)) {
     gardenSizeSliderOptions.start = [gardenSizeMin, gardenSizeMax];
   }
 
@@ -62,7 +62,10 @@ const postFilters = async (req, res) => {
   searchRequest.sizeMin = sizeMin;
   searchRequest.sizeMax = sizeMax;
 
-  if (req.body.gardenSizeFilterMin && req.body.gardenSizeFilterMax) {
+  if (
+    req.body.gardenSizeFilterMin !== undefined &&
+    req.body.gardenSizeFilterMax !== undefined
+  ) {
     const gardenSizeMin = parseInt(req.body.gardenSizeFilterMin);
     const gardenSizeMax = parseInt(req.body.gardenSizeFilterMax);
 

app/crawler/specific/olx.js

@@ -24,10 +24,11 @@ const OLX_ENUMS = {
   OLX_AD_CATEGORY: {
     [AD_CATEGORY.FLAT.id]: "&kategorija=23",
     [AD_CATEGORY.HOUSE.id]: "&kategorija=24",
-    //[AD_CATEGORY.LAND.id]: "&kategorija=29",
+    [AD_CATEGORY.LAND.id]: "&kategorija=29",
-    //[AD_CATEGORY.OFFICE.id]: "&kategorija=25",
+    [AD_CATEGORY.OFFICE.id]: "&kategorija=25",
-    [AD_CATEGORY.APARTMENT.id]: "&kategorija=27"
+    [AD_CATEGORY.APARTMENT.id]: "&kategorija=27",
-    //[AD_CATEGORY.CATEGORY_GARAGE.id]: "&kategorija=30"
+    [AD_CATEGORY.GARAGE.id]: "&kategorija=30",
+    [AD_CATEGORY.COTTAGE.id]: "&kategorija=26"
   },
   MAX_DETAIL_FIELDS: 30,
   OLX_PUBLISHED_DATE_FORMAT: "DD.MM.YYYY. u HH:mm",
@@ -445,13 +446,17 @@ class OlxCrawler {
       case "Stanovi":
         return AD_CATEGORY.FLAT.id;
       case "Zemljišta":
-        return undefined; //AD_CATEGORY.LAND;
+        return AD_CATEGORY.LAND.id;
       case "Kuće":
         return AD_CATEGORY.HOUSE.id;
       case "Poslovni prostori":
-        return undefined; //AD_CATEGORY.OFFICE;
+        return AD_CATEGORY.OFFICE.id;
       case "Apartmani":
         return AD_CATEGORY.APARTMENT.id;
+      case "Garaže":
+        return AD_CATEGORY.GARAGE.id;
+      case "Vikendice":
+        return AD_CATEGORY.COTTAGE.id;
       default:
         return undefined;
     }

app/views/queryReview.ejs

@@ -14,13 +14,13 @@
     </div>
     <div class="row center-align">
         <div class="col">
-            <input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" />
+            <input id="email" name="email" type="email" placeholder="vas.email@mail.com" <% if (email) { %>value="<%= email %>" <% } %> required size="250" />
         </div>
     </div>
 
     <div class="row center-align">
         <div class="col">
-            <input id="confirmEmail" name="confirmEmail" type="email" placeholder="potvrdite.email@mail.com" required size="250" />
+            <input id="confirmEmail" name="confirmEmail" type="email" placeholder="potvrdite.email@mail.com" <% if (email) { %>value="<%= email %>" <% } %> required size="250" />
         </div>
     </div>