From 5b3491fdba0e3551dea0bbab3e7c55125b5ee0c9 Mon Sep 17 00:00:00 2001
From: Naida Vatric <naida.dozic@gmail.com>
Date: Thu, 23 Jan 2020 10:12:56 +0100
Subject: [PATCH] Added migration and model change for searchReq table.

---
 .prettierignore                                    |  1 +
 app/controllers/realEstateFilters.js               |  8 ++++++--
 ...-includeWithoutPrice-to-searchRequests-table.js | 14 ++++++++++++++
 app/models/searchRequest.js                        | 11 ++++++++++-
 app/views/standardFilters.ejs                      | 10 ++++++++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 .prettierignore
 create mode 100644 app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..82435b1
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+*.ejs
\ No newline at end of file
diff --git a/app/controllers/realEstateFilters.js b/app/controllers/realEstateFilters.js
index 17f5e58..252ac46 100644
--- a/app/controllers/realEstateFilters.js
+++ b/app/controllers/realEstateFilters.js
@@ -35,7 +35,8 @@ const getFilters = async (req, res) => {
     balcony,
     elevator,
     newBuilding,
-    accessRoadType
+    accessRoadType,
+    includeWithoutPrice
   } = searchRequest;
   const category = AD_CATEGORY[realEstateType] || AD_CATEGORY.FLAT;
 
@@ -115,7 +116,8 @@ const getFilters = async (req, res) => {
     advancedSegmentSelectFilterValues,
     advancedRangeFilterObjects,
     advancedRangeFilterValues,
-    includeIncompleteAds
+    includeIncompleteAds,
+    includeWithoutPrice
   });
 };
 
@@ -191,6 +193,7 @@ const postFilters = async (req, res) => {
   });
 
   const includeIncompleteAds = req.body.includeIncompleteAds === "on";
+  const includeWithoutPrice = req.body.includeWithoutPrice === "on";
 
   const balcony = req.body.balcony === "on";
   const elevator = req.body.elevator === "on";
@@ -217,6 +220,7 @@ const postFilters = async (req, res) => {
   searchRequest.newBuilding = newBuilding;
 
   searchRequest.includeIncompleteAds = includeIncompleteAds;
+  searchRequest.includeWithoutPrice = includeWithoutPrice;
 
   searchRequest.accessRoadType = accessRoadType;
 
diff --git a/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js b/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js
new file mode 100644
index 0000000..c118d92
--- /dev/null
+++ b/app/migrations/20200123085754-add-column-includeWithoutPrice-to-searchRequests-table.js
@@ -0,0 +1,14 @@
+"use strict";
+
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.addColumn("SearchRequests", "includeWithoutPrice", {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false
+    });
+  },
+
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.removeColumn("SearchRequests", "includeWithoutPrice");
+  }
+};
diff --git a/app/models/searchRequest.js b/app/models/searchRequest.js
index 8a04593..0d4997f 100644
--- a/app/models/searchRequest.js
+++ b/app/models/searchRequest.js
@@ -15,7 +15,15 @@ module.exports = (sequelize, DataTypes) => {
       allowNull: false,
       defaultValue: {
         type: "Polygon",
-        coordinates: [[[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]],
+        coordinates: [
+          [
+            [0, 0],
+            [0, 0],
+            [0, 0],
+            [0, 0],
+            [0, 0]
+          ]
+        ],
         crs: { type: "name", properties: { name: "EPSG:4326" } }
       }
     },
@@ -71,6 +79,7 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.TEXT
     },
     includeIncompleteAds: DataTypes.BOOLEAN,
+    includeWithoutPrice: DataTypes.BOOLEAN,
     balcony: DataTypes.BOOLEAN,
     elevator: DataTypes.BOOLEAN,
     newBuilding: DataTypes.BOOLEAN,
diff --git a/app/views/standardFilters.ejs b/app/views/standardFilters.ejs
index 27a6bba..e0526b4 100644
--- a/app/views/standardFilters.ejs
+++ b/app/views/standardFilters.ejs
@@ -18,6 +18,16 @@
   </div>
 </div>
 
+<br />
+<p class="distinguished">
+  <label class="checkbox-label">
+    <input type="checkbox" class="filled-in" name="includeWithoutPrice"
+      <% if (includeWithoutPrice) { %>
+           checked
+      <% } %>>
+    <span>Uključi i oglase bez cijene</span>
+  </label>
+</p>
 <br />
 
 <div class="row center-align">