diff --git a/app/controllers/redirect.js b/app/controllers/redirect.js
index 6cf5d35..49ea271 100644
--- a/app/controllers/redirect.js
+++ b/app/controllers/redirect.js
@@ -11,6 +11,30 @@ const redirect = async (req, res) => {
}
};
-module.exports = {
- redirect
+const getRedirect = async (req, res) => {
+ const id = req.params.id || null;
+ let error = false;
+ let redirectUrl = undefined;
+ if (!id) {
+ error = true;
+ } else {
+ const realEstate = await getRealEstateById(id);
+ if (!realEstate) {
+ error = true;
+ } else {
+ redirectUrl = realEstate.url;
+ }
+ }
+
+ if (error) {
+ const title = "";
+ res.render("notFound", { title });
+ } else {
+ const title = "Preusmjeravanje";
+ res.render("redirect", { title, redirectUrl });
+ }
+};
+
+module.exports = {
+ getRedirect
};
diff --git a/app/crawler/savers/postgres.js b/app/crawler/savers/postgres.js
index 9ba3391..344e4ac 100644
--- a/app/crawler/savers/postgres.js
+++ b/app/crawler/savers/postgres.js
@@ -10,8 +10,6 @@ class PostgresSaver {
}
async save(results) {
- console.log("[POSTGRES] Saving...");
-
const savedRecords = await bulkUpsertRealEstates(results);
if (Array.isArray(savedRecords)) {
diff --git a/app/crawler/specific/olx.js b/app/crawler/specific/olx.js
index cbeacbc..02bb330 100644
--- a/app/crawler/specific/olx.js
+++ b/app/crawler/specific/olx.js
@@ -55,7 +55,6 @@ class OlxCrawler {
}
async crawl() {
- console.log("[OLX] Crawler started");
const crawlAdCategories = this.crawlerAdCategories;
const newRealEstates = [];
@@ -123,7 +122,6 @@ class OlxCrawler {
await this.sleep(this.delayBetweenPages);
}
}
- console.log("[OLX] Crawler finished");
return newRealEstates;
}
diff --git a/app/routes/index.js b/app/routes/index.js
index ef1fea9..807f594 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -18,7 +18,7 @@ const { getGoAgain } = require("../controllers/goAgain");
const { getLocation, postLocation } = require("../controllers/location");
const { getUnsubscribe } = require("../controllers/unsubscribe");
const { getRealEstates } = require("../controllers/realEstates");
-const { redirect } = require("../controllers/redirect");
+const { getRedirect } = require("../controllers/redirect");
const router = express.Router();
@@ -50,6 +50,6 @@ router.get("/ponovo", getGoAgain);
router.get("/nekretnine/:searchRequestId", getRealEstates);
-router.get("/redirect/:id", redirect);
+router.get("/redirect/:id", getRedirect);
module.exports = router;
diff --git a/app/services/notificationService.js b/app/services/notificationService.js
index b0c84ff..c81dbcc 100644
--- a/app/services/notificationService.js
+++ b/app/services/notificationService.js
@@ -40,9 +40,7 @@ const notifyMatches = async matches => {
const sendEmailPromise = sendEmail(email, "Nove nekretnine", emailContent);
asyncSendEmailActions.push(sendEmailPromise);
- sendEmailPromise
- .then(res => console.log(res))
- .catch(err => console.log(err));
+ sendEmailPromise.catch(err => console.log("[Email Sending Failed]", err));
}
await Promise.all(asyncSendEmailActions);
diff --git a/app/views/layout.ejs b/app/views/layout.ejs
index 042b2e2..1b8ff32 100644
--- a/app/views/layout.ejs
+++ b/app/views/layout.ejs
@@ -1,6 +1,15 @@
+
+
+
+
diff --git a/app/views/notFound.ejs b/app/views/notFound.ejs
new file mode 100644
index 0000000..e66b342
--- /dev/null
+++ b/app/views/notFound.ejs
@@ -0,0 +1,9 @@
+
+<% include partials/navBar %>
+
+
+
Ups...stranica ne postoji
+
+
diff --git a/app/views/redirect.ejs b/app/views/redirect.ejs
new file mode 100644
index 0000000..db97191
--- /dev/null
+++ b/app/views/redirect.ejs
@@ -0,0 +1,28 @@
+
+<% include partials/navBar %>
+
+
+
+
+
+