Prostor VIP ads fixed.

Rename settings var

See merge request saburly/marketalarm/web!93

app/config/appConfig.js

@@ -9,7 +9,7 @@ const APP_URL =
     ? process.env.APP_URL || "http://market-alarm"
     : process.env.APP_URL || `${APP_BASE_URL}:${APP_PORT}`;
 
-const STAGING = process.env.SETTINGS !== "production";
+const STAGING = process.env.ENVIRONMENT !== "production";
 
 const DEFAULT_TIMEZONE = "Europe/Sarajevo";
 
@@ -55,5 +55,4 @@ module.exports = {
   STAGING,
   CHECK_UP_DAYS,
   PROSTOR_LOGIN
-
 };

app/crawler/specificCrawlers/prostor.js

@@ -191,13 +191,7 @@ class ProstorCrawler {
     const { lat, lng, property_name, price, size, link, status } = realEstate;
 
     //Status information is given already in realestate list
-    //For VIP Ads status ='' canot be used, but no VIP ads are crawled
-    //We will make "fake" vip ad for RE that have size=55
-    //It is weird because yesterday it said 'VIP ponuda' ???
-    const adStatus =
-      size === "55"
-        ? ProstorCrawler.getStatusId("VIP ponuda")
-        : ProstorCrawler.getStatusId(status);
+    const adStatus = ProstorCrawler.getStatusId(status);
 
     const url = `https://prostor.ba${link}`;
 

app/crawler/specificCrawlers/saljic.js

@@ -268,6 +268,7 @@ class SaljicCrawler {
 
       const descriptions = $(propertySelectors.descriptions)
         .text()
+        .replace(/\"/g, "")
         .trim();
 
       const latAndLongSrc = $(propertySelectors.latAndLong).attr("src");
@@ -283,8 +284,8 @@ class SaljicCrawler {
       const locationLong = parseFloat(longText) || null;
 
       //====== DETAIL INFORMATION FIELDS ==========
-      let area,
-        gardenSize,
+      let area = null,
+        gardenSize = null,
         numberOfRooms = null,
         numberOfFloors = null,
         floor = null,
@@ -315,6 +316,7 @@ class SaljicCrawler {
         includingBills = null,
         animalsAllowed = null,
         pool = null,
+        exchange = null,
         urbanPlanPermit = null,
         buildingPermit = null,
         utilityConnection = null,
@@ -323,7 +325,14 @@ class SaljicCrawler {
       let renewedDate = null;
       let realEstateType;
       let numberOfViewsAgency = null;
-
+      let numberOfViewsKivi = null;
+      let streetNumber = 0;
+      let adStatus = status;
+      let shortDescription = descriptions.substring(
+        0,
+        descriptions.indexOf(".")
+      );
+      let longDescription = descriptions;
       //Extracting data - Glavne karakteristike
       let mainFieldIndex = 1;
       do {
@@ -482,29 +491,37 @@ class SaljicCrawler {
         renewedDate = new Date();
       }
 
+      const originAgencyName = AD_AGENCY.SALJIC;
+      const locality = "";
+      const municipality = "";
+      const city = "";
+      const region = "";
+      const entity = "";
+      const country = "";
+
       const data = {
         url,
         agencyObjectId,
-        originAgencyName: AD_AGENCY.SALJIC,
+        originAgencyName,
         realEstateType,
         adType,
         title,
         price,
         area,
         gardenSize,
-        shortDescription: descriptions.substring(0, descriptions.indexOf(".")),
-        longDescription: descriptions,
-        streetNumber: 0,
+        shortDescription,
+        longDescription,
+        streetNumber,
         streetName,
-        locality: "",
-        municipality: "",
-        city: "",
-        region: "",
-        entity: "",
-        country: "",
+        locality,
+        municipality,
+        city,
+        region,
+        entity,
+        country,
         locationLat,
         locationLong,
-        adStatus: status,
+        adStatus,
         publishedDate,
         renewedDate,
         numberOfRooms,
@@ -537,12 +554,15 @@ class SaljicCrawler {
         includingBills,
         animalsAllowed,
         pool,
+        exchange,
         urbanPlanPermit,
         buildingPermit,
         utilityConnection,
         distanceToRiver,
-        numberOfViewsAgency
+        numberOfViewsAgency,
+        numberOfViewsKivi
       };
+
       return data;
     } catch (e) {
       console.error("Exception caught: " + e.message, "\r\nURL:", url);

app/services/notificationService.js

@@ -131,7 +131,7 @@ const notifyRequestsWithDailyOption = async () => {
 };
 
 const checkUpNotify = async () => {
-  const searchRequestsForCheckUp = await findAllRequestsForCheckUp();
+ /* const searchRequestsForCheckUp = await findAllRequestsForCheckUp();
 
   const asyncSendEmailActions = [];
 
@@ -144,7 +144,7 @@ const checkUpNotify = async () => {
     asyncSendEmailActions.push(sendEmailPromise);
     sendEmailPromise.catch(err => console.log("[Email Sending Failed]", err));
   }
-  await Promise.all(asyncSendEmailActions);
+  await Promise.all(asyncSendEmailActions); */ 
 };
 
 module.exports = {

development.env

@@ -8,7 +8,7 @@ SEQUELIZE_LOGGING=0- no sequelize logging, 1- log to the console
 PORT=Port for the app, defaults to 5000
 APP_BASE_URL=base url for the app
 
-SETTINGS=Variable to denote development, staging and production
+ENVIRONMENT=Variable to denote development, staging and production
 
 
 MAX_REAL_ESTATES_IN_EMAIL=Max number of real estates that will be shown in email, others will be truncated and URL with full list will be shwon