senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'checkup-email-bug-fix'

Browse Source 
# Conflicts:
#   app/services/notificationService.js
This commit is contained in:
Naida Vatric
2020-02-25 15:12:47 +00:00
parent bc7ce9d708 08ad9edfe1
commit a508f72d7c
12 changed files with 87 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/helpers/db/searchRequest.js
View File

@@ -174,7 +174,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
} 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
//Or ones that picked some values but also picked to includeIncomplete ads (or default)
numberOfRoomsQuery = {
[Op.or]: [
{
@@ -193,7 +193,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -243,7 +246,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -292,7 +298,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -330,7 +339,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -364,7 +376,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -398,7 +413,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
},
{
includeIncompleteAds: {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
}
}
]
@@ -440,10 +458,13 @@ const findSearchRequestsForRealEstate = async realEstate => {
[Op.eq]: "ANY"
};
}
//Tag to check if incomplete ads are accepted in query
//Tag to check if incomplete ads are accepted in query which is default
if (checkForIncompleteWanted) {
query.includeIncompleteAds = {
[Op.eq]: true
[Op.or]: {
[Op.eq]: true,
[Op.is]: null
}
};
}