senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

adapt garden size step for new DB design

Browse Source
This commit is contained in:
Bilal Catic
2019-09-13 14:30:54 +02:00
parent e26c2b6e8d
commit b4c71b93de
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/gardenSizes.js
View File

@@ -1,4 +1,4 @@
const { currentRERequest } = require("../helpers/url"); const { currentSearchRequest } = require("../helpers/url");
const { getRealEstateTypeEnum } = require("../helpers/enums"); const { getRealEstateTypeEnum } = require("../helpers/enums");
const getGardenSize = (req, res) => { const getGardenSize = (req, res) => {
@@ -23,16 +23,20 @@ const getGardenSize = (req, res) => {
}; };
const postGardenSize = async (req, res) => { const postGardenSize = async (req, res) => {
const request = await currentRERequest(req); const searchRequest = await currentSearchRequest(req);
const nextStepPage = req.query.nextStep || "cijena"; const nextStepPage = req.query.nextStep || "cijena";
const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`; const nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
const realEstateType = getRealEstateTypeEnum(request.realEstateType); const realEstateType = getRealEstateTypeEnum(searchRequest.realEstateType);
if (realEstateType && realEstateType.hasGardenSize) { if (realEstateType && realEstateType.hasGardenSize) {
request.gardenSizeMin = req.body.from; const gardenSizeMin = req.body.from || 0;
request.gardenSizeMax = req.body.to; const gardenSizeMax = req.body.to || 0;
await request.save(); //TODO: Validate input
searchRequest.gardenSizeMin = gardenSizeMin;
searchRequest.gardenSizeMax = gardenSizeMax;
await searchRequest.save();
} }
res.redirect(nextStepUrl); res.redirect(nextStepUrl);

7
app/controllers/realEstateTypes.js
View File

@@ -20,11 +20,8 @@ const postRealEstateTypes = async (req, res) => {
if (searchRequest && searchRequest.id) { if (searchRequest && searchRequest.id) {
nextStepUrl = `/${nextStepPage}/${searchRequest.id}`; nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
searchRequest.realEstateType = selectedRealEstateType; searchRequest.realEstateType = selectedRealEstateType;
if (!getRealEstateTypeEnum(selectedRealEstateType).hasGardenSize) {
searchRequest.gardenSizeMin = null; await searchRequest.save();
searchRequest.gardenSizeMax = null;
}
await request.save();
} else { } else {
try { try {
const newSearchRequest = await createSearchRequest({ const newSearchRequest = await createSearchRequest({