From b4c71b93dee333c86979a3c380f24b0eed160450 Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Fri, 13 Sep 2019 14:30:54 +0200
Subject: [PATCH] adapt garden size step for new DB design

---
 app/controllers/gardenSizes.js     | 18 +++++++++++-------
 app/controllers/realEstateTypes.js |  7 ++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/gardenSizes.js b/app/controllers/gardenSizes.js
index 83a8fe1..4fb5c8e 100644
--- a/app/controllers/gardenSizes.js
+++ b/app/controllers/gardenSizes.js
@@ -1,4 +1,4 @@
-const { currentRERequest } = require("../helpers/url");
+const { currentSearchRequest } = require("../helpers/url");
 const { getRealEstateTypeEnum } = require("../helpers/enums");
 
 const getGardenSize = (req, res) => {
@@ -23,16 +23,20 @@ const getGardenSize = (req, res) => {
 };
 
 const postGardenSize = async (req, res) => {
-  const request = await currentRERequest(req);
+  const searchRequest = await currentSearchRequest(req);
 
   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) {
-    request.gardenSizeMin = req.body.from;
-    request.gardenSizeMax = req.body.to;
-    await request.save();
+    const gardenSizeMin = req.body.from || 0;
+    const gardenSizeMax = req.body.to || 0;
+    //TODO: Validate input
+
+    searchRequest.gardenSizeMin = gardenSizeMin;
+    searchRequest.gardenSizeMax = gardenSizeMax;
+    await searchRequest.save();
   }
 
   res.redirect(nextStepUrl);
diff --git a/app/controllers/realEstateTypes.js b/app/controllers/realEstateTypes.js
index c02d2b9..7b84247 100644
--- a/app/controllers/realEstateTypes.js
+++ b/app/controllers/realEstateTypes.js
@@ -20,11 +20,8 @@ const postRealEstateTypes = async (req, res) => {
   if (searchRequest && searchRequest.id) {
     nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
     searchRequest.realEstateType = selectedRealEstateType;
-    if (!getRealEstateTypeEnum(selectedRealEstateType).hasGardenSize) {
-      searchRequest.gardenSizeMin = null;
-      searchRequest.gardenSizeMax = null;
-    }
-    await request.save();
+
+    await searchRequest.save();
   } else {
     try {
       const newSearchRequest = await createSearchRequest({