adapt price and query review steps for new DB design

app/controllers/prices.js

@@ -1,4 +1,4 @@
-const { currentRERequest } = require("../helpers/url");
+const { currentSearchRequest } = require("../helpers/url");
 
 const getPrice = (req, res) => {
   const title = "Koja Vam okvirna cijena odgovara ?";
@@ -22,14 +22,17 @@ const getPrice = (req, res) => {
 };
 
 const postPrice = async (req, res) => {
-  const request = await currentRERequest(req);
+  const searchRequest = await currentSearchRequest(req);
 
   const nextStepPage = req.query.nextStep || "pregled";
-  const nextStepUrl = `/${nextStepPage}/${request.uniqueId}`;
+  const nextStepUrl = `/${nextStepPage}/${searchRequest.id}`;
+  const priceMin = req.body.from || 0;
+  const priceMax = req.body.to || 0;
+  //TODO: price validation
 
-  request.priceMin = req.body.from;
+  searchRequest.priceMin = priceMin;
-  request.priceMax = req.body.to;
+  searchRequest.priceMax = priceMax;
-  await request.save();
+  await searchRequest.save();
 
   res.redirect(nextStepUrl);
 };

app/controllers/queryReview.js

@@ -1,4 +1,4 @@
-const { currentRERequest } = require("../helpers/url");
+const { currentSearchRequest } = require("../helpers/url");
 const {
   realEstateTypes,
   getEnumTypeTitle,
@@ -7,23 +7,23 @@ const {
 
 const getQueryReview = async (req, res) => {
   const title = "Da li je ovo to što ste tražili ?";
-  const request = await currentRERequest(req);
+  const searchRequest = await currentSearchRequest(req);
   const nextStep = req.query.nextStep;
 
-  if (!request || !request.dataValues) {
+  if (!searchRequest || !searchRequest.dataValues) {
     return null;
   }
 
   const {
+    id,
     realEstateType,
     sizeMin,
     sizeMax,
     gardenSizeMin,
     gardenSizeMax,
     priceMin,
-    priceMax,
+    priceMax
-    locationInput
+  } = searchRequest.dataValues;
-  } = request.dataValues;
 
   const realEstateTypeObject = getRealEstateTypeEnum(realEstateType);
   const enableGardenSizeEdit = realEstateTypeObject
@@ -32,58 +32,55 @@ const getQueryReview = async (req, res) => {
 
   const realEstateTypeTitle = realEstateType
     ? getEnumTypeTitle(realEstateTypes, realEstateType)
-    : null;
+    : "-";
 
-  const locationTitle = locationInput ? locationInput : "-";
+  const locationTitle = "Location description - PLACEHOLDER";
+  const sizeTitle = sizeMin && sizeMax ? `${sizeMin} - ${sizeMax} m2` : "-";
+  const gardenSizeTitle =
+    enableGardenSizeEdit && gardenSizeMin && gardenSizeMax
+      ? `${gardenSizeMin} - ${gardenSizeMax} m2`
+      : "-";
+  const priceTitle =
+    priceMin && priceMax ? `${priceMin} - ${priceMax} KM` : "-";
 
-  const sizeTitle = sizeMin ? sizeMin + "-" + sizeMax + " m2" : null;
+  const queryReviewData = [
-  const gardenSizeTitle = gardenSizeMin
-    ? gardenSizeMin + "-" + gardenSizeMax + " m2"
-    : null;
-  const priceTitle = priceMin ? priceMin + "-" + priceMax + " KM" : null;
-
-  const uniqueId = request.dataValues.uniqueId
-    ? request.dataValues.uniqueId
-    : "";
-
-  const queryData = [
     {
       id: "realEstateType",
       title: realEstateTypeTitle,
-      url: `/vrstanekretnine/${uniqueId}?nextStep=pregled`
+      url: `/vrstanekretnine/${id}?nextStep=pregled`
     },
     {
       id: "location",
       title: locationTitle,
-      url: `/lokacija/${uniqueId}?nextStep=pregled`
+      url: `/lokacija/${id}?nextStep=pregled`
     },
     {
       id: "size",
       title: sizeTitle,
-      url: `/povrsina/${uniqueId}?nextStep=pregled`
+      url: `/povrsina/${id}?nextStep=pregled`
     },
     {
       id: "gardenSize",
       title: gardenSizeTitle,
-      url: enableGardenSizeEdit ? `/okucnica/${uniqueId}?nextStep=pregled` : ""
+      url: enableGardenSizeEdit ? `/okucnica/${id}?nextStep=pregled` : ""
     },
     {
       id: "price",
       title: priceTitle,
-      url: `/cijena/${uniqueId}?nextStep=pregled`
+      url: `/cijena/${id}?nextStep=pregled`
     }
   ];
 
   res.render("queryReview", {
     nextStep,
-    queryData,
+    queryReviewData,
     title
   });
 };
 
 const postQueryReview = async (req, res) => {
-  const request = await currentRERequest(req);
+  const searchRequest = await currentSearchRequest(req);
-  const nextStep = req.query.nextStep || `/posalji/${request.uniqueId}`;
+  const nextStep = req.query.nextStep || `/posalji/${searchRequest.id}`;
 
   res.redirect(nextStep);
 };

app/views/queryReview.ejs

@@ -1,10 +1,10 @@
 <!--suppress HtmlUnknownAnchorTarget -->
-<% include partials/navBar %> 
+<% include partials/navBar %>
 
 <form method="POST" id="form-queryreview">
 <div class="row center-align">
   <ul class="collection with-header">
-    <% for(const stepData of queryData) { %>
+    <% for(const stepData of queryReviewData) { %>
       <li class="collection-item" >
         <div id="<%= stepData.id %>" ><%= stepData.title || '-' %>
           <a href="<%= stepData.url %>" class="secondary-content">