Results title text made into link.

app/helpers/db/realEstate.js

@@ -2,8 +2,6 @@
 const db = require("../../models/index");
 const sequelize = require("sequelize");
 const Op = sequelize.Op;
-const { AD_CATEGORY } = require("../../common/enums");
-
 const bulkUpsertRealEstates = async realEstateData => {
   try {
     const fieldsToUpdateIfDuplicate = [
@@ -104,9 +102,6 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     accessRoadType
   } = searchRequest;
 
-  //Needed for defining which attribute should exist or not
-  const realEstateTypeObject = AD_CATEGORY[realEstateType];
-
   const longitudeColumn = sequelize.col("locationLong");
   const latitudeColumn = sequelize.col("locationLat");
 
@@ -180,13 +175,8 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     [Op.and]: geoSearchQueryPart
   };
 
-  //Every other attribute is checked separately and included in query only if it is defined for real estate type
-
-  if (
-    realEstateTypeObject.hasGardenSize &&
-    gardenSizeMax != null &&
-    gardenSizeMin != null
-  ) {
+  //Every other attribute is checked separately and included in query only if it is defined
+  if (gardenSizeMax && gardenSizeMin) {
     query.gardenSize = {
       [Op.lte]: gardenSizeMax,
       [Op.gte]: gardenSizeMin
@@ -202,11 +192,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     };
   }
 
-  if (
-    realEstateTypeObject.hasNumberOfRoom &&
-    numberOfRoomsMin != null &&
-    numberOfRoomsMax != null
-  ) {
+  if (numberOfRoomsMin && numberOfRoomsMax) {
     query.numberOfRooms = {
       [Op.lte]: numberOfRoomsMax,
       [Op.gte]: numberOfRoomsMin
@@ -222,11 +208,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     };
   }
 
-  if (
-    realEstateTypeObject.hasNumberOfFloors &&
-    numberOfFloorsMin != null &&
-    numberOfFloorsMax != null
-  ) {
+  if (numberOfFloorsMin && numberOfFloorsMax) {
     query.numberOfFloors = {
       [Op.lte]: numberOfFloorsMax,
       [Op.gte]: numberOfFloorsMin
@@ -242,11 +224,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     };
   }
 
-  if (
-    realEstateTypeObject.hasFloorProp &&
-    floorMin != null &&
-    floorMax != null
-  ) {
+  if (floorMin && floorMax) {
     query.floor = {
       [Op.lte]: floorMax,
       [Op.gte]: floorMin
@@ -261,10 +239,8 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
       }
     };
   }
-  //Logic for balcony, newBuilding and elevator from users side
-  //If true is checked, then I want characteristic to be true but,
-  //if it is not checked, then I dont care - it can be null or false or true
-  if (realEstateTypeObject.hasBalconyProp && balcony === true) {
+
+  if (balcony) {
     query.balcony = {
       [Op.eq]: balcony
     };
@@ -276,7 +252,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     };
   }
 
-  if (realEstateTypeObject.hasNewBuildingProp && newBuilding === true) {
+  if (newBuilding) {
     query.newBuilding = {
       [Op.eq]: newBuilding
     };
@@ -288,7 +264,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
     };
   }
 
-  if (realEstateTypeObject.hasElevatorProp && elevator === true) {
+  if (elevator) {
     query.elevator = {
       [Op.eq]: elevator
     };
@@ -299,8 +275,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
       }
     };
   }
-  //If user wants 'ANY' road type acces then it is not included in query -
-  //returns every road type and null values
+
   if (accessRoadType !== "ANY") {
     query.accessRoadType = {
       [Op.eq]: accessRoadType

app/helpers/db/searchRequest.js

@@ -49,383 +49,128 @@ const findSearchRequestsForRealEstate = async realEstate => {
 
   const geoSearchQueryPart = sequelize.where(contains, true);
 
-  //Needed for defining which attribute should exist or not
-  const realEstateTypeObject = AD_CATEGORY[realEstateType];
-
-  // ?? Needed to decide on including incomplete RealEstates data
-  let checkForIncompleteWanted = false;
-
-  //Attributes are checked separately to make different query parts
-
-  //If price is null it will be excluded from query - it will show properties with null price values
-  //User always defines price and area (sliders) - not null in search req
-  let priceQuery = {};
-  if (price != null) {
-    priceQuery = {
-      [Op.and]: [
-        {
-          priceMin: {
-            [Op.lte]: price
-          }
-        },
-        {
-          priceMax: {
-            [Op.gte]: price
-          }
-        }
-      ]
-    };
-  }
-
-  let areaQuery = {};
-  if (area != null) {
-    areaQuery = {
-      [Op.and]: [
-        {
-          sizeMin: {
-            [Op.lte]: area
-          }
-        },
-        {
-          sizeMax: {
-            [Op.gte]: area
-          }
-        }
-      ]
-    };
-  } else {
-    checkForIncompleteWanted = true;
-  }
-
-  //Other attributes can be defined or not depending on RealEstate type
-  //we check what to include in query based on real estate type object
-  let gardenSizeQuery = {};
-  if (realEstateTypeObject.hasGardenSize) {
-    if (gardenSize != null) {
-      gardenSizeQuery = {
-        [Op.and]: [
-          {
-            gardenSizeMin: {
-              [Op.lte]: gardenSize
-            }
-          },
-          {
-            gardenSizeMax: {
-              [Op.gte]: gardenSize
-            }
-          }
-        ]
-      };
-    } else {
-      checkForIncompleteWanted = true;
-    }
-  }
-
-  let numberOfRoomsQuery = {};
-  if (realEstateTypeObject.hasNumberOfRoom) {
-    if (numberOfRooms != null) {
-      //If real estate has defined number of rooms ex. 3 it returns req
-      // that accepts 3 rooms or ones that don't have defined number - null
-      //Ex. they didnt choose advanced filters at all
-      numberOfRoomsQuery = {
-        [Op.and]: [
-          {
-            numberOfRoomsMin: {
-              [Op.or]: {
-                [Op.lte]: numberOfRooms,
-                [Op.is]: null
-              }
-            }
-          },
-          {
-            numberOfRoomsMax: {
-              [Op.or]: {
-                [Op.gte]: numberOfRooms,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
-      };
-    } else {
-      // If real estate dont have defined number of rooms ex. null
-      //It returns requests that didn't choose number of rooms - also null
-      //Or ones that picked some values but also picked to includeIncomplete ads
-      numberOfRoomsQuery = {
-        [Op.or]: [
-          {
-            [Op.and]: [
-              {
-                numberOfRoomsMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                numberOfRoomsMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.eq]: true
-            }
-          }
-        ]
-      };
-    }
-  }
-  //Same logic for number of Floors and floors
-  let numberOfFloorsQuery = {};
-  if (realEstateTypeObject.hasNumberOfFloors) {
-    if (numberOfFloors != null) {
-      numberOfFloorsQuery = {
-        [Op.and]: [
-          {
-            numberOfFloorsMin: {
-              [Op.or]: {
-                [Op.lte]: numberOfFloors,
-                [Op.is]: null
-              }
-            }
-          },
-          {
-            numberOfFloorsMax: {
-              [Op.or]: {
-                [Op.gte]: numberOfFloors,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
-      };
-    } else {
-      numberOfFloorsQuery = {
-        [Op.or]: [
-          {
-            [Op.and]: [
-              {
-                numberOfFloorsMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                numberOfFloorsMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.eq]: true
-            }
-          }
-        ]
-      };
-    }
-  }
-  let floorQuery = {};
-  if (realEstateTypeObject.hasFloorProp) {
-    if (floor != null) {
-      floorQuery = {
-        [Op.and]: [
-          {
-            floorMin: {
-              [Op.or]: {
-                [Op.lte]: floor,
-                [Op.is]: null
-              }
-            }
-          },
-          {
-            floorMax: {
-              [Op.or]: {
-                [Op.gte]: floor,
-                [Op.is]: null
-              }
-            }
-          }
-        ]
-      };
-    } else {
-      floorQuery = {
-        [Op.or]: [
-          {
-            [Op.and]: [
-              {
-                floorMin: {
-                  [Op.is]: null
-                }
-              },
-              {
-                floorMax: {
-                  [Op.is]: null
-                }
-              }
-            ]
-          },
-          {
-            includeIncompleteAds: {
-              [Op.eq]: true
-            }
-          }
-        ]
-      };
-    }
-  }
-
-  //Logic for balcony, newBuilding and elevator
-  //If user dont check checkbox for ex. elevator  it does not mean he only wants no elevator
-  //If real estate characteristic =true find all req, one that wants charachertistic or dont care - dont need query
-  //If real estate characteristic = false, find all req exept for ones that wants characteristic to be true
-  //If real estate characteristic = null, dont know if true or false, find req that dont care or want char and want incomplete ads
-  let balconyQuery = {};
-  if (realEstateTypeObject.hasBalconyProp && balcony !== true) {
-    if (balcony === false) {
-      balconyQuery = {
-        balcony: {
-          [Op.ne]: true
-        }
-      };
-    } else if (balcony === null) {
-      balconyQuery = {
-        [Op.or]: [
-          {
-            balcony: {
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                balcony: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.eq]: true
-                }
-              }
-            ]
-          }
-        ]
-      };
-    }
-  }
-  let newBuildingQuery = {};
-  if (realEstateTypeObject.hasNewBuildingProp && newBuilding !== true) {
-    if (newBuilding === false) {
-      newBuildingQuery = {
-        newBuilding: {
-          [Op.ne]: true
-        }
-      };
-    } else if (newBuilding === null) {
-      newBuildingQuery = {
-        [Op.or]: [
-          {
-            newBuilding: {
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                newBuilding: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.eq]: true
-                }
-              }
-            ]
-          }
-        ]
-      };
-    }
-  }
-  let elevatorQuery = {};
-  if (realEstateTypeObject.hasElevatorProp && elevator !== true) {
-    if (elevator === false) {
-      elevatorQuery = {
-        elevator: {
-          [Op.ne]: true
-        }
-      };
-    } else if (elevator === null) {
-      elevatorQuery = {
-        [Op.or]: [
-          {
-            elevator: {
-              [Op.ne]: true
-            }
-          },
-          {
-            [Op.and]: [
-              {
-                elevator: {
-                  [Op.eq]: true
-                }
-              },
-              {
-                includeIncompleteAds: {
-                  [Op.eq]: true
-                }
-              }
-            ]
-          }
-        ]
-      };
-    }
-  }
-  //General query consists of each individual query
+  //General query contains only attributes that are defined for every RealEstate - not null
   const query = {
     adType,
     realEstateType,
     subscribed: true,
-    [Op.and]: [
-      geoSearchQueryPart,
-      priceQuery,
-      areaQuery,
-      gardenSizeQuery,
-      numberOfRoomsQuery,
-      numberOfFloorsQuery,
-      floorQuery,
-      balconyQuery,
-      newBuildingQuery,
-      elevatorQuery
-    ]
+    [Op.and]: geoSearchQueryPart
   };
+  //Needed for defining which attribute should exist or not
+  const realEstateTypeObject = AD_CATEGORY[realEstateType];
+  //Needed to decide on including incomplete RealEstates data
+  let checkForIncompleteWanted = false;
 
-  //AccessRoadType is defined - should exists for each ad and estate type
-  if (accessRoadType != null) {
+  //Attributes are checked separately and included in query only if defined
+  //Price and area should be defined for every property
+
+  if (price) {
+    query.priceMin = {
+      [Op.lte]: price
+    };
+    query.priceMax = {
+      [Op.gte]: price
+    };
+  }
+
+  if (area) {
+    query.sizeMin = {
+      [Op.lte]: area
+    };
+    query.sizeMax = {
+      [Op.gte]: area
+    };
+  } else {
+    checkForIncompleteWanted = true;
+  }
+  //Other attributes can be defined or not depending on RealEstate type
+  if (gardenSize) {
+    query.gardenSizeMin = {
+      [Op.lte]: gardenSize
+    };
+    query.gardenSizeMax = {
+      [Op.gte]: gardenSize
+    };
+  } else if (realEstateTypeObject.hasGardenSize) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (numberOfRooms) {
+    query.numberOfRoomsMin = {
+      [Op.lte]: numberOfRooms
+    };
+    query.numberOfRoomsMax = {
+      [Op.gte]: numberOfRooms
+    };
+  } else if (realEstateTypeObject.hasNumberOfRoom) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (numberOfFloors) {
+    query.numberOfFloorsMin = {
+      [Op.lte]: numberOfFloors
+    };
+    query.numberOfFloorsMax = {
+      [Op.gte]: numberOfFloors
+    };
+  } else if (realEstateTypeObject.hasNumberOfFloors) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (floor) {
+    query.floorMin = {
+      [Op.lte]: floor
+    };
+    query.floorMax = {
+      [Op.gte]: floor
+    };
+  } else if (realEstateTypeObject.hasFloorProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (accessRoadType) {
     query.accessRoadType = {
       [Op.or]: {
-        [Op.like]: "ANY",
+        [Op.eq]: "ANY",
         [Op.eq]: accessRoadType
       }
     };
-  } else {
-    //Null values are returned for user request that wanted ANY acces road type
-    query.accessRoadType = {
-      [Op.eq]: "ANY"
-    };
+  } else if (realEstateTypeObject.hasAccesRoadType) {
+    checkForIncompleteWanted = true;
   }
-  //Tag to check if incomplete ads are accepted in query
+
+  if (balcony) {
+    query.balcony = {
+      [Op.eq]: balcony
+    };
+  } else if (realEstateTypeObject.hasBalconyProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (newBuilding) {
+    query.newBuilding = {
+      [Op.eq]: newBuilding
+    };
+  } else if (realEstateTypeObject.hasNewBuildingProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  if (elevator) {
+    query.elevator = {
+      [Op.eq]: elevator
+    };
+  } else if (realEstateTypeObject.hasElevatorProp) {
+    checkForIncompleteWanted = true;
+  }
+
+  //If one of the attributes that exists for property type is null
+  //we include in query to check if incomplete real estates are accepted
   if (checkForIncompleteWanted) {
     query.includeIncompleteAds = {
       [Op.eq]: true
     };
   }
-
-  return await db.SearchRequest.findAll({
-    where: query
-  });
+  return await db.SearchRequest.findAll({ where: query });
 };
 
 module.exports = {

app/helpers/emailContentGenerator.js

@@ -23,16 +23,19 @@ 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 možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
+  const moreRealEstates = `<div>Kompletan spisak nekretnina (${noAllRealEstates}) možete pogledati na <a href="${allRealEstatesLink}">listi nekretnina</a><div>`;
   const emailFooter = generateEmailFooter(searchRequestId);
   const asapMessageBody =
     realEstates.length > 1
@@ -70,6 +73,7 @@ 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,3 +154,7 @@ h3 {
   margin-top: 2rem;
   margin-bottom: 1rem;
 }
+
+.estates-link {
+  color: rgba(0, 0, 0, 0.87);
+}

app/services/notificationService.js

@@ -8,7 +8,10 @@ const {
   generateNewSearchRequestEmail,
   generateEmailSubject
 } = require("../helpers/emailContentGenerator");
-const { findNotNotifiedMatches } = require("../helpers/db/searchRequestMatch");
+const {
+  findNotNotifiedMatches,
+  findRealEstatesForSearchRequest
+} = require("../helpers/db/searchRequestMatch");
 const { sendEmail } = require("../services/emailService");
 
 const notifyForNewRealEstates = async newRealEstates => {
@@ -39,10 +42,18 @@ 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,13 +1,16 @@
 <div class="row center-align">
-    <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">
+  <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">
             <i class="material-icons">send</i>
-          </a>
-        </div>
-      </li>
-      <% } %>
-    </ul>
-  </div>
+          </div>
+        </a>
+      </div>
+    </li>
+    <% } %>
+  </ul>
+</div>