From 60f74c2cde24457bb0332fea9e9159839cc09dd9 Mon Sep 17 00:00:00 2001 From: Naida Vatric Date: Fri, 20 Mar 2020 15:40:38 +0100 Subject: [PATCH] Changed editing redirection. --- app/controllers/editSuccess.js | 8 ++++++++ app/controllers/publishRealEstate.js | 17 +++++++++++++---- app/helpers/emailContentGenerator.js | 7 ++++++- app/routes/index.js | 3 +++ app/services/notificationService.js | 11 +++++++++-- app/views/editSuccess.ejs | 11 +++++++++++ app/views/publishRealEstate.ejs | 4 ++++ 7 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 app/controllers/editSuccess.js create mode 100644 app/views/editSuccess.ejs diff --git a/app/controllers/editSuccess.js b/app/controllers/editSuccess.js new file mode 100644 index 0000000..ef8c242 --- /dev/null +++ b/app/controllers/editSuccess.js @@ -0,0 +1,8 @@ +const editSuccess = async (req, res) => { + const title = "Uspjeh!"; + res.render("editSuccess", { title }); +}; + +module.exports = { + editSuccess +}; diff --git a/app/controllers/publishRealEstate.js b/app/controllers/publishRealEstate.js index 1d7378b..11ab480 100644 --- a/app/controllers/publishRealEstate.js +++ b/app/controllers/publishRealEstate.js @@ -203,8 +203,11 @@ const postPublishInputs = async (req, res) => { return; } - const nextStepPage = req.query.nextStep || "/uspjesnaobjava"; + const editingRealEstate = req.body.editingRealEstate; + const nextStepPage = editingRealEstate + ? req.query.nextStep || "/uspjesnaizmjena" + : req.query.nextStep || "/uspjesnaobjava"; //Request body //console.log("Body:", req.body); @@ -334,9 +337,15 @@ const postPublishInputs = async (req, res) => { await kiviOriginal.save(); - //Calling function to notify real estate owner that ads is published on Kivi page after 1 sec - setTimeout(notifyForNewAdPublish, 1000, realEstate, kiviOriginal); - //Calling function to notify users of new real estate after 2 min + //Calling function to notify real estate owner that ads is published or edited on Kivi page after 1 sec + setTimeout( + notifyForNewAdPublish, + 1000, + realEstate, + kiviOriginal, + editingRealEstate + ); + //Calling function to notify users of new real estate (or edited realestate) after 2 min setTimeout(notifyForNewRealEstates, 1000 * 60 * 2, [realEstate]); res.redirect(nextStepPage); diff --git a/app/helpers/emailContentGenerator.js b/app/helpers/emailContentGenerator.js index 2c5a03d..702020a 100644 --- a/app/helpers/emailContentGenerator.js +++ b/app/helpers/emailContentGenerator.js @@ -205,6 +205,7 @@ const generateCheckUpEmail = searchRequest => { const generateNewAdPublishEmail = ( realEstate, kiviOriginal, + editingRealEstate, numberOfMatchingRequests ) => { let countingPrefix; @@ -224,8 +225,12 @@ const generateNewAdPublishEmail = ( countingSufix = "zahtjeva"; } + const successIntro = editingRealEstate + ? `
Uspješno ste izmijenili oglas za Vašu nekretninu na Kivi.ba.
` + : `
Uspješno ste objavili oglas za Vašu nekretninu na Kivi.ba.
`; + return `

${stagingTag}Zdravo

-
Uspješno ste objavili oglas za Vašu nekretninu na Kivi.ba.
+ ${successIntro}
U Kivi bazi trenutno ${countingPrefix} ${numberOfMatchingRequests} ${countingSufix} za nekretninom kao sto je Vaša.

diff --git a/app/routes/index.js b/app/routes/index.js index b23655a..ae1b2cc 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -22,6 +22,7 @@ const { } = require("../controllers/queryReview"); const { getGoAgain } = require("../controllers/goAgain"); const { publishSuccess } = require("../controllers/publishSuccess"); +const { editSuccess } = require("../controllers/editSuccess"); const { getLocation, postLocation } = require("../controllers/location"); const { getUnsubscribe } = require("../controllers/unsubscribe"); const { getDeletePublishedAd } = require("../controllers/deleteRealEstate"); @@ -66,6 +67,8 @@ router.get("/ponovo", getGoAgain); router.get("/uspjesnaobjava", publishSuccess); +router.get("/uspjesnaizmjena", editSuccess); + router.get("/nekretnine/:searchRequestId", getRealEstates); router.get("/redirect/:id", getRedirect); diff --git a/app/services/notificationService.js b/app/services/notificationService.js index 4f9ff6d..d19fb75 100644 --- a/app/services/notificationService.js +++ b/app/services/notificationService.js @@ -148,11 +148,17 @@ const checkUpNotify = async () => { await Promise.all(asyncSendEmailActions); }; -const notifyForNewAdPublish = async (realEstate, kiviOriginal) => { +const notifyForNewAdPublish = async ( + realEstate, + kiviOriginal, + editingRealEstate +) => { // console.log("Real estate:", realEstate); // console.log("Kivi original:", kiviOriginal); const email = kiviOriginal.dataValues.email; - const emailSubject = `${stagingTag}Kivi - Uspješno ste objavili oglas!`; + const emailSubject = editingRealEstate + ? `${stagingTag}Kivi - Uspješno ste izmijenili oglas!` + : `${stagingTag}Kivi - Uspješno ste objavili oglas!`; const matches = await matchRealEstates([realEstate]); //Counting number of matching req let numberOfMatchingRequests = 0; @@ -163,6 +169,7 @@ const notifyForNewAdPublish = async (realEstate, kiviOriginal) => { const emailContent = generateNewAdPublishEmail( realEstate, kiviOriginal, + editingRealEstate, numberOfMatchingRequests ); diff --git a/app/views/editSuccess.ejs b/app/views/editSuccess.ejs new file mode 100644 index 0000000..7757c9d --- /dev/null +++ b/app/views/editSuccess.ejs @@ -0,0 +1,11 @@ +
+
+

Vaš oglas je izmijenjen u Kivi bazi.

+
+
+ kivi logo +
+
+

Poslali smo potvrdni email sa izmijenjenim detaljima oglasa na Vašu email adresu.

+ Nova pretraga +
\ No newline at end of file diff --git a/app/views/publishRealEstate.ejs b/app/views/publishRealEstate.ejs index 9b52038..265c1b8 100644 --- a/app/views/publishRealEstate.ejs +++ b/app/views/publishRealEstate.ejs @@ -31,6 +31,7 @@ <%- include("./publishEnd.ejs") %>
+ @@ -89,6 +90,9 @@ $(document).ready(function(){ $('.tabs').tabs(); + const editingRealEstate = <%- editingRealEstate %>; + $("#editingRealEstate").val(editingRealEstate); + // Manual dropzone init const dropzoneOptions = { url: "/photos-upload", //can be a function that returns url ?