Merge branch 'master' into 'add-more-real-estate-filters'

# Conflicts:
#   app/views/standardFilters.ejs

app/helpers/emailContentGenerator.js

@@ -23,19 +23,16 @@ const generateRealEstateLinks = realEstates => {
 const generateNotificationEmail = (
   realEstates,
   searchRequestId,
-  noAllRealEstates,
   dailyNotification = false
 ) => {
   const truncateList = realEstates.length > MAX_REAL_ESTATES_IN_EMAIL;
-
   const realEstatesToShow = truncateList
     ? realEstates.slice(0, MAX_REAL_ESTATES_IN_EMAIL)
     : realEstates;
 
   const allRealEstatesLink = `${APP_URL}/nekretnine/${searchRequestId}`;
-
   const realEstateLinks = generateRealEstateLinks(realEstatesToShow);
-  const moreRealEstates = `<div>Kompletan spisak nekretnina (${noAllRealEstates}) možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
+  const moreRealEstates = `<div>Kompletan spisak nekretnina možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
   const emailFooter = generateEmailFooter(searchRequestId);
   const asapMessageBody =
     realEstates.length > 1
@@ -73,7 +70,6 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
   } = searchRequest;
 
   const realEstateLinks = generateRealEstateLinks(matchingRealEstates);
-
   const instantRealEstatesText = `<br/>
        <div>
         U međuvremenu pogledajte neke od nedavno objavljenih nekretnina koje odgovaraju Vašim uslovima pretrage :<br/>

app/public/main.css

@@ -154,7 +154,3 @@ h3 {
   margin-top: 2rem;
   margin-bottom: 1rem;
 }
-
-.estates-link {
-  color: rgba(0, 0, 0, 0.87);
-}

app/services/notificationService.js

@@ -8,10 +8,7 @@ const {
   generateNewSearchRequestEmail,
   generateEmailSubject
 } = require("../helpers/emailContentGenerator");
-const {
-  findNotNotifiedMatches,
-  findRealEstatesForSearchRequest
-} = require("../helpers/db/searchRequestMatch");
+const { findNotNotifiedMatches } = require("../helpers/db/searchRequestMatch");
 const { sendEmail } = require("../services/emailService");
 
 const notifyForNewRealEstates = async newRealEstates => {
@@ -42,18 +39,10 @@ const notifyMatches = async (matches, dailyNotification = false) => {
     const { email, subscribed } = searchRequest;
     if (notifyNow && subscribed) {
       const allMatchingRealEstates = matches[id].realEstates || [];
-
-      //Variable allMatchingRealEstates are real estates that are "new" on the market
-      //the ones that we notify user in this moment, not all that already exists in db
-      //New variable allRealEstates are all real estates that exists in db for search req
-      const allRealEstates = await findRealEstatesForSearchRequest(id);
-      const noAllRealEstates = allRealEstates.length;
-
       if (allMatchingRealEstates.length > 0) {
         const emailContent = generateNotificationEmail(
           allMatchingRealEstates,
           id,
-          noAllRealEstates,
           dailyNotification
         );
         const emailSubject = generateEmailSubject(

app/views/realEstates.ejs

@@ -1,16 +1,13 @@
 <div class="row center-align">
-  <ul class="collection with-header">
-    <% for(const realEstate of realEstates) { %>
-    <li class="collection-item">
-      <div>
-        <a href="<%= realEstate.url %>" class="estates-link">
-          <%= realEstate.title %>
-          <div class="kivi-color secondary-content">
+    <ul class="collection with-header">
+      <% for(const realEstate of realEstates) { %>
+      <li class="collection-item">
+        <div><%= realEstate.title %>
+          <a href="<%= realEstate.url %>" class="kivi-color secondary-content">
             <i class="material-icons">send</i>
-          </div>
-        </a>
-      </div>
-    </li>
-    <% } %>
-  </ul>
-</div>
+          </a>
+        </div>
+      </li>
+      <% } %>
+    </ul>
+  </div>