Merge branch 'staging-tag-to-checkup-email' into 'master'

Added staging tag to checkup email. Email footer bug fixed.

See merge request saburly/marketalarm/web!91

app/crawler/specificCrawlers/saljic.js

@@ -218,7 +218,7 @@ class SaljicCrawler {
   }
 
   async scrapeAd(url, adType) {
-    console.log("[SALJIC] Scraping : ", url);
+    // console.log("[SALJIC] Scraping : ", url);
     try {
       const adPageSource = await fetch(url);
       const body = await adPageSource.text();
@@ -543,7 +543,6 @@ class SaljicCrawler {
         distanceToRiver,
         numberOfViewsAgency
       };
-      console.log(data);
       return data;
     } catch (e) {
       console.error("Exception caught: " + e.message, "\r\nURL:", url);

app/helpers/emailContentGenerator.js

@@ -171,13 +171,23 @@ const generateCheckUpEmail = searchRequest => {
     priceMax
   } = searchRequest;
 
+  let emailFrequencyTitle;
+  switch (searchRequest.emailFrequency) {
+    case EMAIL_FREQUENCY.ASAP.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.ASAP.title;
+      break;
+    case EMAIL_FREQUENCY.DAILY.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.DAILY.title;
+      break;
+  }
+
   const gardenSize = realEstateType.hasGardenSize
     ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
     : ``;
 
-  const emailFooter = generateEmailFooter(id);
+  const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
 
-  return `<h3>Zdravo</h3>
+  return `<h3>${stagingTag}Zdravo</h3>
   <div><strong>Kivi tim traži nekretnine za Vas i kada to ne vidite.</strong></div>
   <br />
   <div>Vaša trenutno aktivna pretraga je:</div>

app/services/notificationService.js

@@ -1,5 +1,8 @@
 "use strict";
 const { STAGING } = require("../config/appConfig");
+
+const stagingTag = STAGING ? "[STAGING] " : "";
+
 const {
   matchRealEstates,
   matchSearchRequest
@@ -27,12 +30,12 @@ const notifyForNewSearchRequest = async searchRequest => {
 
   const searchRequestId = searchRequest.id;
   const matchingRealEstates = matches[searchRequestId].realEstates;
-  const stagingTag = STAGING ? "[STAGING] " : "";
   const emailContent = generateNewSearchRequestEmail(
     searchRequest,
     matchingRealEstates
   );
   const { email } = searchRequest;
+
   await sendEmail(
     email,
     `${stagingTag} Kivi - novi zahtjev za pretragu`,
@@ -134,7 +137,7 @@ const checkUpNotify = async () => {
 
   for (const searchRequest of searchRequestsForCheckUp) {
     const { email } = searchRequest.dataValues;
-    const emailSubject = `Kivi: Mi tražimo nekretnine za vas!`;
+    const emailSubject = `${stagingTag}Kivi: Mi tražimo nekretnine za vas!`;
     const emailContent = generateCheckUpEmail(searchRequest.dataValues);
 
     const sendEmailPromise = sendEmail(email, emailSubject, emailContent);