adapt query submit size step for new DB design

This commit is contained in:
Bilal Catic
2019-09-13 14:40:10 +02:00
parent b4c71b93de
commit c01cb03762

View File

@@ -1,4 +1,4 @@
const { currentRERequest } = require("../helpers/url"); const { currentSearchRequest } = require("../helpers/url");
const { isValidEmail } = require("../helpers/email"); const { isValidEmail } = require("../helpers/email");
const { sendTemplatedEmail } = require("../helpers/awsEmail"); const { sendTemplatedEmail } = require("../helpers/awsEmail");
@@ -15,21 +15,13 @@ const getQuerySubmit = async (req, res) => {
}; };
const postQuerySubmit = async (req, res) => { const postQuerySubmit = async (req, res) => {
const request = await currentRERequest(req); const searchRequest = await currentSearchRequest(req);
const nextStep = req.query.nextStep || "/ponovo"; const nextStep = req.query.nextStep || "/ponovo";
const emailInput = req.body.email; const emailInput = req.body.email;
const emailConfirmInput = req.body.confirm; const emailConfirmInput = req.body.confirm;
let error = "Greška ! Unesite validan email"; let error = "Greška ! Unesite validan email";
if (!isValidEmail(emailInput) || !isValidEmail(emailConfirmInput)) {
error = "Greška ! Unesite validan email";
res.render("querySubmit", {
error
});
return;
}
if (emailInput !== emailConfirmInput) { if (emailInput !== emailConfirmInput) {
error = "Greška ! Unešeni emailovi nisu isti"; error = "Greška ! Unešeni emailovi nisu isti";
res.render("querySubmit", { res.render("querySubmit", {
@@ -38,10 +30,19 @@ const postQuerySubmit = async (req, res) => {
return; return;
} }
request.email = req.body.email; if (!isValidEmail(emailInput)) {
request.subscribed = true; error = "Greška ! Unesite validan email";
await request.save(); res.render("querySubmit", {
sendTemplatedEmail(req.body.email, request); error
});
return;
}
searchRequest.email = emailInput;
searchRequest.subscribed = true;
await searchRequest.save();
sendTemplatedEmail(req.body.email, searchRequest);
res.redirect(nextStep); res.redirect(nextStep);
}; };