Merge branch 'master' into 'tag-staging-email'
# Conflicts: # app/config/appConfig.js
This commit is contained in:
Naida Vatric
20
app/helpers/db/priceHistory.js
Normal file
20
app/helpers/db/priceHistory.js
Normal file
@@ -0,0 +1,20 @@
|
||||
"use strict";
|
||||
const db = require("../../models/index");
|
||||
const sequelize = require("sequelize");
|
||||
|
||||
const bulkUpsertPriceHistory = async priceHistoryData => {
|
||||
try {
|
||||
const order = [["realEstateId", "desc"]];
|
||||
|
||||
return await db.PriceHistory.bulkCreate(priceHistoryData, {
|
||||
order,
|
||||
ignoreDuplicates: true
|
||||
});
|
||||
} catch (e) {
|
||||
console.log("Error bulk upserting priceHistory : ", e);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
bulkUpsertPriceHistory
|
||||
};
|
||||
@@ -2,6 +2,8 @@
|
||||
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 = [
|
||||
@@ -96,12 +98,16 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
floorMin,
|
||||
floorMax,
|
||||
includeIncompleteAds,
|
||||
includeWithoutPrice,
|
||||
balcony,
|
||||
elevator,
|
||||
newBuilding,
|
||||
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");
|
||||
|
||||
@@ -134,15 +140,6 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
const query = {
|
||||
adType,
|
||||
realEstateType,
|
||||
price: {
|
||||
[Op.or]: {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
},
|
||||
[Op.is]: null
|
||||
}
|
||||
},
|
||||
area: {
|
||||
[Op.lte]: sizeMax,
|
||||
[Op.gte]: sizeMin
|
||||
@@ -154,15 +151,6 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
const queryIncludeIncomplete = {
|
||||
adType,
|
||||
realEstateType,
|
||||
price: {
|
||||
[Op.or]: {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
},
|
||||
[Op.is]: null
|
||||
}
|
||||
},
|
||||
area: {
|
||||
[Op.or]: {
|
||||
[Op.and]: {
|
||||
@@ -175,8 +163,49 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
[Op.and]: geoSearchQueryPart
|
||||
};
|
||||
|
||||
//Every other attribute is checked separately and included in query only if it is defined
|
||||
if (gardenSizeMax && gardenSizeMin) {
|
||||
//Is user unchecked includeWithoutPrice FALSE then it shouldn't return null values of price
|
||||
//If not then null values are accepted (this is DEFAULT)
|
||||
//includeIncpompleteAds does not have effect on price query
|
||||
if (includeWithoutPrice) {
|
||||
query.price = {
|
||||
[Op.or]: {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
},
|
||||
[Op.is]: null
|
||||
}
|
||||
};
|
||||
queryIncludeIncomplete.price = {
|
||||
[Op.or]: {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
},
|
||||
[Op.is]: null
|
||||
}
|
||||
};
|
||||
} else {
|
||||
query.price = {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
}
|
||||
};
|
||||
queryIncludeIncomplete.price = {
|
||||
[Op.and]: {
|
||||
[Op.lte]: priceMax,
|
||||
[Op.gte]: priceMin
|
||||
}
|
||||
};
|
||||
}
|
||||
//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
|
||||
) {
|
||||
query.gardenSize = {
|
||||
[Op.lte]: gardenSizeMax,
|
||||
[Op.gte]: gardenSizeMin
|
||||
@@ -192,7 +221,11 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
if (numberOfRoomsMin && numberOfRoomsMax) {
|
||||
if (
|
||||
realEstateTypeObject.hasNumberOfRoom &&
|
||||
numberOfRoomsMin != null &&
|
||||
numberOfRoomsMax != null
|
||||
) {
|
||||
query.numberOfRooms = {
|
||||
[Op.lte]: numberOfRoomsMax,
|
||||
[Op.gte]: numberOfRoomsMin
|
||||
@@ -208,7 +241,11 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
if (numberOfFloorsMin && numberOfFloorsMax) {
|
||||
if (
|
||||
realEstateTypeObject.hasNumberOfFloors &&
|
||||
numberOfFloorsMin != null &&
|
||||
numberOfFloorsMax != null
|
||||
) {
|
||||
query.numberOfFloors = {
|
||||
[Op.lte]: numberOfFloorsMax,
|
||||
[Op.gte]: numberOfFloorsMin
|
||||
@@ -224,7 +261,11 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
if (floorMin && floorMax) {
|
||||
if (
|
||||
realEstateTypeObject.hasFloorProp &&
|
||||
floorMin != null &&
|
||||
floorMax != null
|
||||
) {
|
||||
query.floor = {
|
||||
[Op.lte]: floorMax,
|
||||
[Op.gte]: floorMin
|
||||
@@ -239,8 +280,10 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if (balcony) {
|
||||
//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) {
|
||||
query.balcony = {
|
||||
[Op.eq]: balcony
|
||||
};
|
||||
@@ -252,7 +295,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
if (newBuilding) {
|
||||
if (realEstateTypeObject.hasNewBuildingProp && newBuilding === true) {
|
||||
query.newBuilding = {
|
||||
[Op.eq]: newBuilding
|
||||
};
|
||||
@@ -264,7 +307,7 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
if (elevator) {
|
||||
if (realEstateTypeObject.hasElevatorProp && elevator === true) {
|
||||
query.elevator = {
|
||||
[Op.eq]: elevator
|
||||
};
|
||||
@@ -275,7 +318,8 @@ 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
|
||||
|
||||
@@ -49,128 +49,390 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
|
||||
const geoSearchQueryPart = sequelize.where(contains, true);
|
||||
|
||||
//General query contains only attributes that are defined for every RealEstate - not null
|
||||
const query = {
|
||||
adType,
|
||||
realEstateType,
|
||||
subscribed: true,
|
||||
[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
|
||||
|
||||
// ?? Needed to decide on including incomplete RealEstates data
|
||||
let checkForIncompleteWanted = false;
|
||||
|
||||
//Attributes are checked separately and included in query only if defined
|
||||
//Price and area should be defined for every property
|
||||
//Attributes are checked separately to make different query parts
|
||||
|
||||
if (price) {
|
||||
query.priceMin = {
|
||||
[Op.lte]: price
|
||||
//If real estate price is number then it searches for req that have priceMin and priceMax
|
||||
//If real estate price is null it searches for req that accept ads without price
|
||||
//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
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
query.priceMax = {
|
||||
[Op.gte]: price
|
||||
} else {
|
||||
priceQuery = {
|
||||
includeWithoutPrice: {
|
||||
[Op.eq]: true
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
if (area) {
|
||||
query.sizeMin = {
|
||||
[Op.lte]: area
|
||||
};
|
||||
query.sizeMax = {
|
||||
[Op.gte]: area
|
||||
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
|
||||
if (gardenSize) {
|
||||
query.gardenSizeMin = {
|
||||
[Op.lte]: gardenSize
|
||||
};
|
||||
query.gardenSizeMax = {
|
||||
[Op.gte]: gardenSize
|
||||
};
|
||||
} else if (realEstateTypeObject.hasGardenSize) {
|
||||
checkForIncompleteWanted = true;
|
||||
//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;
|
||||
}
|
||||
}
|
||||
|
||||
if (numberOfRooms) {
|
||||
query.numberOfRoomsMin = {
|
||||
[Op.lte]: numberOfRooms
|
||||
};
|
||||
query.numberOfRoomsMax = {
|
||||
[Op.gte]: numberOfRooms
|
||||
};
|
||||
} else if (realEstateTypeObject.hasNumberOfRoom) {
|
||||
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
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
if (numberOfFloors) {
|
||||
query.numberOfFloorsMin = {
|
||||
[Op.lte]: numberOfFloors
|
||||
};
|
||||
query.numberOfFloorsMax = {
|
||||
[Op.gte]: numberOfFloors
|
||||
};
|
||||
} else if (realEstateTypeObject.hasNumberOfFloors) {
|
||||
checkForIncompleteWanted = 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
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
if (floor) {
|
||||
query.floorMin = {
|
||||
[Op.lte]: floor
|
||||
};
|
||||
query.floorMax = {
|
||||
[Op.gte]: floor
|
||||
};
|
||||
} else if (realEstateTypeObject.hasFloorProp) {
|
||||
checkForIncompleteWanted = 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
|
||||
const query = {
|
||||
adType,
|
||||
realEstateType,
|
||||
subscribed: true,
|
||||
[Op.and]: [
|
||||
geoSearchQueryPart,
|
||||
priceQuery,
|
||||
areaQuery,
|
||||
gardenSizeQuery,
|
||||
numberOfRoomsQuery,
|
||||
numberOfFloorsQuery,
|
||||
floorQuery,
|
||||
balconyQuery,
|
||||
newBuildingQuery,
|
||||
elevatorQuery
|
||||
]
|
||||
};
|
||||
|
||||
if (accessRoadType) {
|
||||
//AccessRoadType is defined - should exists for each ad and estate type
|
||||
if (accessRoadType != null) {
|
||||
query.accessRoadType = {
|
||||
[Op.or]: {
|
||||
[Op.eq]: "ANY",
|
||||
[Op.like]: "ANY",
|
||||
[Op.eq]: accessRoadType
|
||||
}
|
||||
};
|
||||
} else if (realEstateTypeObject.hasAccesRoadType) {
|
||||
checkForIncompleteWanted = true;
|
||||
}
|
||||
|
||||
if (balcony) {
|
||||
query.balcony = {
|
||||
[Op.eq]: balcony
|
||||
} else {
|
||||
//Null values are returned for user request that wanted ANY acces road type
|
||||
query.accessRoadType = {
|
||||
[Op.eq]: "ANY"
|
||||
};
|
||||
} 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
|
||||
//Tag to check if incomplete ads are accepted in query
|
||||
if (checkForIncompleteWanted) {
|
||||
query.includeIncompleteAds = {
|
||||
[Op.eq]: true
|
||||
};
|
||||
}
|
||||
return await db.SearchRequest.findAll({ where: query });
|
||||
|
||||
return await db.SearchRequest.findAll({
|
||||
where: query
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
"use strict";
|
||||
const db = require("../../models/index");
|
||||
const sequelize = require("sequelize");
|
||||
const Op = sequelize.Op;
|
||||
const { CHECK_UP_DAYS } = require("../../config/appConfig");
|
||||
|
||||
const findRealEstatesForSearchRequest = async searchRequestId => {
|
||||
const query = {
|
||||
@@ -40,6 +43,42 @@ const findNotNotifiedMatches = async () => {
|
||||
|
||||
return matchingRecords;
|
||||
};
|
||||
const findAllRequestsForCheckUp = async () => {
|
||||
//First we find IDs of search request that don't need to be emailed for check up - to EXCLUDE
|
||||
//The ones that received notification for real estate CHECK_UP_DAYS days from now
|
||||
const date = new Date();
|
||||
const checkUpDate = date.getDate() - CHECK_UP_DAYS;
|
||||
date.setDate(checkUpDate);
|
||||
const dateQuery = {
|
||||
createdAt: {
|
||||
[Op.gte]: date
|
||||
}
|
||||
};
|
||||
|
||||
const excludedMatches = await db.SearchRequestMatch.findAll({
|
||||
attributes: ["searchRequestId"],
|
||||
where: dateQuery,
|
||||
order: [["searchRequestId", "ASC"]]
|
||||
});
|
||||
|
||||
const excludedRequestsAll = excludedMatches.map(match => {
|
||||
return match.dataValues.searchRequestId;
|
||||
});
|
||||
//Removing duplicate search request id-s for optimization
|
||||
const excludedRequests = [...new Set(excludedRequestsAll)];
|
||||
|
||||
const query = {
|
||||
subscribed: true,
|
||||
id: {
|
||||
[Op.notIn]: excludedRequests
|
||||
}
|
||||
};
|
||||
const allRequestsForCheckUp = await db.SearchRequest.findAll({
|
||||
where: query
|
||||
});
|
||||
|
||||
return allRequestsForCheckUp;
|
||||
};
|
||||
|
||||
const addMatches = async matchingRecords => {
|
||||
return await db.SearchRequestMatch.bulkCreate(matchingRecords, {
|
||||
@@ -50,5 +89,6 @@ const addMatches = async matchingRecords => {
|
||||
module.exports = {
|
||||
findRealEstatesForSearchRequest,
|
||||
addMatches,
|
||||
findNotNotifiedMatches
|
||||
findNotNotifiedMatches,
|
||||
findAllRequestsForCheckUp
|
||||
};
|
||||
|
||||
@@ -159,8 +159,42 @@ const generateEmailSubject = (numberOfRealEstates, singleRealEstateTitle) => {
|
||||
return `${stagingTag}Kivi: ${numberOfRealEstates} novih nekretnina`;
|
||||
};
|
||||
|
||||
const generateCheckUpEmail = searchRequest => {
|
||||
const realEstateType = AD_CATEGORY[searchRequest.realEstateType];
|
||||
const {
|
||||
id,
|
||||
gardenSizeMin,
|
||||
gardenSizeMax,
|
||||
sizeMin,
|
||||
sizeMax,
|
||||
priceMin,
|
||||
priceMax
|
||||
} = searchRequest;
|
||||
|
||||
const gardenSize = realEstateType.hasGardenSize
|
||||
? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
|
||||
: ``;
|
||||
|
||||
const emailFooter = generateEmailFooter(id);
|
||||
|
||||
return `<h3>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>
|
||||
<br/>
|
||||
<div>
|
||||
<div><strong>Tip nekretnine: </strong>${realEstateType.title}</div>
|
||||
<div><strong>Kvadratura nekretnine:</strong> Od ${sizeMin} do ${sizeMax} m2</div>
|
||||
${gardenSize}
|
||||
<div><strong>Cijena:</strong> ${priceMin} do ${priceMax} KM</div>
|
||||
</div>
|
||||
<br/>
|
||||
${emailFooter}`;
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
generateNotificationEmail,
|
||||
generateNewSearchRequestEmail,
|
||||
generateEmailSubject
|
||||
generateEmailSubject,
|
||||
generateCheckUpEmail
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user