Compare commits
1 Commits
include-in
...
prostor-vi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5bdc8e149a |
@@ -191,13 +191,7 @@ class ProstorCrawler {
|
||||
const { lat, lng, property_name, price, size, link, status } = realEstate;
|
||||
|
||||
//Status information is given already in realestate list
|
||||
//For VIP Ads status ='' canot be used, but no VIP ads are crawled
|
||||
//We will make "fake" vip ad for RE that have size=55
|
||||
//It is weird because yesterday it said 'VIP ponuda' ???
|
||||
const adStatus =
|
||||
size === "55"
|
||||
? ProstorCrawler.getStatusId("VIP ponuda")
|
||||
: ProstorCrawler.getStatusId(status);
|
||||
const adStatus = ProstorCrawler.getStatusId(status);
|
||||
|
||||
const url = `https://prostor.ba${link}`;
|
||||
|
||||
|
||||
@@ -332,14 +332,10 @@ const findRealEstatesForSearchRequest = async (searchRequest, maxResults) => {
|
||||
};
|
||||
}
|
||||
|
||||
//When includeIncompleteAds are not defined - null it will consider it true
|
||||
const order = [["updatedAt", "desc"]];
|
||||
|
||||
return db.RealEstate.findAll({
|
||||
where:
|
||||
includeIncompleteAds || includeIncompleteAds == null
|
||||
? queryIncludeIncomplete
|
||||
: query,
|
||||
where: includeIncompleteAds ? queryIncludeIncomplete : query,
|
||||
limit: maxResults,
|
||||
order
|
||||
});
|
||||
|
||||
@@ -157,7 +157,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 default)
|
||||
//Or ones that picked some values but also picked to includeIncomplete ads
|
||||
numberOfRoomsQuery = {
|
||||
[Op.or]: [
|
||||
{
|
||||
@@ -176,10 +176,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -229,10 +226,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -281,10 +275,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -322,10 +313,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -359,10 +347,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -396,10 +381,7 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
},
|
||||
{
|
||||
includeIncompleteAds: {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -441,13 +423,10 @@ const findSearchRequestsForRealEstate = async realEstate => {
|
||||
[Op.eq]: "ANY"
|
||||
};
|
||||
}
|
||||
//Tag to check if incomplete ads are accepted in query which is default
|
||||
//Tag to check if incomplete ads are accepted in query
|
||||
if (checkForIncompleteWanted) {
|
||||
query.includeIncompleteAds = {
|
||||
[Op.or]: {
|
||||
[Op.eq]: true,
|
||||
[Op.is]: null
|
||||
}
|
||||
[Op.eq]: true
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -61,8 +61,9 @@
|
||||
<p class="distinguished">
|
||||
<label class="checkbox-label">
|
||||
<input type="checkbox" class="filled-in" name="includeIncompleteAds"
|
||||
<% if (includeIncompleteAds) { %>
|
||||
checked
|
||||
>
|
||||
<% } %>>
|
||||
<span>Uključi i oglase bez potpunih informacija</span>
|
||||
</label>
|
||||
</p>
|
||||
|
||||
Reference in New Issue
Block a user