U međuvremenu pogledajte neke od nedavno objavljenih nekretnina koje odgovaraju Vašim uslovima pretrage :
@@ -80,13 +111,14 @@ const generateNewSearchRequestEmail = (searchRequest, matchingRealEstates) => {
? `
`
: ``;
- const emailFooter = generateEmailFooter(id);
+ const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
return `
Naručili ste da Vam javimo ako se nekretnina sa navedenim uslovima pojavi u oglasima:
Tip nekretnine: ${realEstateType.title}
+
Vrsta oglasa: ${adTypeTitle}
Kvadratura nekretnine: Od ${sizeMin} do ${sizeMax} m2
${gardenSize}
Cijena: ${priceMin} do ${priceMax} KM
diff --git a/app/migrations/20200121000524-add-priceHistory-table.js b/app/migrations/20200121000524-add-priceHistory-table.js
new file mode 100644
index 0000000..6d56f99
--- /dev/null
+++ b/app/migrations/20200121000524-add-priceHistory-table.js
@@ -0,0 +1,42 @@
+"use strict";
+
+module.exports = {
+ up: (queryInterface, Sequelize) => {
+ const tableFields = {
+ id: {
+ type: Sequelize.BIGINT,
+ autoIncrement: true,
+ allowNull: false,
+ primaryKey: true
+ },
+ realEstateId: {
+ type: Sequelize.BIGINT,
+ allowNull: false,
+ unique: "uniquePriceRealEstate",
+ references: {
+ model: "RealEstates",
+ key: "id"
+ },
+ onUpdate: "CASCADE",
+ onDelete: "SET NULL"
+ },
+ price: {
+ type: Sequelize.REAL,
+ unique: "uniquePriceRealEstate"
+ },
+ createdAt: {
+ type: Sequelize.DATE,
+ defaultValue: Sequelize.literal("NOW()")
+ },
+ updatedAt: {
+ type: Sequelize.DATE,
+ defaultValue: Sequelize.literal("NOW()")
+ }
+ };
+ return queryInterface.createTable("PriceHistory", tableFields);
+ },
+
+ down: queryInterface => {
+ return queryInterface.dropTable("PriceHistory", {});
+ }
+};
diff --git a/app/migrations/20200121094500-add-constraint-priceHistory.js b/app/migrations/20200121094500-add-constraint-priceHistory.js
new file mode 100644
index 0000000..45c83c3
--- /dev/null
+++ b/app/migrations/20200121094500-add-constraint-priceHistory.js
@@ -0,0 +1,10 @@
+"use strict";
+module.exports = {
+ up: (queryInterface, Sequelize) =>
+ queryInterface.addConstraint("PriceHistory", ["realEstateId", "price"], {
+ type: "unique",
+ name: "uniquePriceRealEstate"
+ }),
+ down: queryInterface =>
+ queryInterface.removeConstraint("PriceHistory", "uniquePriceRealEstate")
+};
diff --git a/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js b/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js
new file mode 100644
index 0000000..9173829
--- /dev/null
+++ b/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js
@@ -0,0 +1,14 @@
+"use strict";
+
+module.exports = {
+ up: (queryInterface, Sequelize) => {
+ return queryInterface.addColumn("SearchRequests", "includeWithoutPrice", {
+ type: Sequelize.BOOLEAN,
+ defaultValue: true
+ });
+ },
+
+ down: (queryInterface, Sequelize) => {
+ return queryInterface.removeColumn("SearchRequests", "includeWithoutPrice");
+ }
+};
diff --git a/app/models/priceHistory.js b/app/models/priceHistory.js
new file mode 100644
index 0000000..495be53
--- /dev/null
+++ b/app/models/priceHistory.js
@@ -0,0 +1,44 @@
+"use strict";
+
+module.exports = (sequalize, DataTypes) => {
+ const PriceHistory = sequalize.define(
+ "PriceHistory",
+ {
+ id: {
+ type: DataTypes.BIGINT,
+ autoIncrement: true,
+ primaryKey: true,
+ allowNull: false
+ },
+ realEstateId: {
+ type: DataTypes.BIGINT,
+ allowNull: false,
+ unique: "uniquePriceRealEstate",
+ references: {
+ model: "RealEstates",
+ key: "id"
+ },
+ onUpdate: "CASCADE",
+ onDelete: "SET NULL"
+ },
+ price: {
+ type: DataTypes.REAL,
+ unique: "uniquePriceRealEstate"
+ }
+ },
+ {
+ freezeTableName: true
+ }
+ );
+
+ PriceHistory.associate = models => {
+ PriceHistory.hasMany(models.RealEstate, {
+ foreignKey: "id",
+ sourceKey: "realEstateId",
+ targetKey: "id",
+ as: "realEstates"
+ });
+ };
+
+ return PriceHistory;
+};
diff --git a/app/models/searchRequest.js b/app/models/searchRequest.js
index 8a04593..0d4997f 100644
--- a/app/models/searchRequest.js
+++ b/app/models/searchRequest.js
@@ -15,7 +15,15 @@ module.exports = (sequelize, DataTypes) => {
allowNull: false,
defaultValue: {
type: "Polygon",
- coordinates: [[[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]],
+ coordinates: [
+ [
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0],
+ [0, 0]
+ ]
+ ],
crs: { type: "name", properties: { name: "EPSG:4326" } }
}
},
@@ -71,6 +79,7 @@ module.exports = (sequelize, DataTypes) => {
type: DataTypes.TEXT
},
includeIncompleteAds: DataTypes.BOOLEAN,
+ includeWithoutPrice: DataTypes.BOOLEAN,
balcony: DataTypes.BOOLEAN,
elevator: DataTypes.BOOLEAN,
newBuilding: DataTypes.BOOLEAN,
diff --git a/app/public/main.css b/app/public/main.css
index 8d128b7..2258be6 100644
--- a/app/public/main.css
+++ b/app/public/main.css
@@ -154,3 +154,7 @@ h3 {
margin-top: 2rem;
margin-bottom: 1rem;
}
+
+.estates-link {
+ color: rgba(0, 0, 0, 0.87);
+}
diff --git a/app/seeders/20200121150443-initial-price-history.js b/app/seeders/20200121150443-initial-price-history.js
new file mode 100644
index 0000000..0a9531a
--- /dev/null
+++ b/app/seeders/20200121150443-initial-price-history.js
@@ -0,0 +1,34 @@
+"use strict";
+
+const { RealEstate } = require("../models");
+
+module.exports = {
+ async up(queryInterface, Sequelize) {
+ //Reading initial data from RealEstate table in db
+ const realEstateInitialData = await RealEstate.findAll();
+ //Extruding data for table PriceHistory
+ const priceHistoryInitialData = realEstateInitialData.map(realEstate => {
+ //Null values canot be recognized by ignore duplicates in sequalize
+ //Value price = 0 indicates 'cijena na upit'
+ const priceTmp =
+ realEstate.dataValues.price === null ? 0 : realEstate.dataValues.price;
+
+ return {
+ realEstateId: realEstate.dataValues.id,
+ price: priceTmp,
+ createdAt: realEstate.dataValues.createdAt,
+ updatedAt: realEstate.dataValues.updatedAt
+ };
+ });
+
+ return queryInterface.bulkInsert(
+ "PriceHistory",
+ priceHistoryInitialData,
+ {}
+ );
+ },
+
+ async down(queryInterface, Sequelize) {
+ return queryInterface.bulkDelete("PriceHistory", null, {});
+ }
+};
diff --git a/app/services/notificationService.js b/app/services/notificationService.js
index d0f382e..15b8ce0 100644
--- a/app/services/notificationService.js
+++ b/app/services/notificationService.js
@@ -11,7 +11,8 @@ const {
} = require("../helpers/emailContentGenerator");
const {
findNotNotifiedMatches,
- findAllRequestsForCheckUp
+ findAllRequestsForCheckUp,
+ findRealEstatesForSearchRequest
} = require("../helpers/db/searchRequestMatch");
const { sendEmail } = require("../services/emailService");
@@ -43,10 +44,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(
diff --git a/app/views/realEstates.ejs b/app/views/realEstates.ejs
index a59d794..b47b744 100644
--- a/app/views/realEstates.ejs
+++ b/app/views/realEstates.ejs
@@ -1,13 +1,29 @@
-
+ <%} else { %>
+
+ <% }%>
+
+ <% } %>
+
+
diff --git a/app/views/redirect.ejs b/app/views/redirect.ejs
index 52233cb..e36e081 100644
--- a/app/views/redirect.ejs
+++ b/app/views/redirect.ejs
@@ -1,26 +1,49 @@
-