From d8d801d3141041ce9b398bbc2e0287dd1986763f Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Fri, 27 Sep 2019 18:20:16 +0200 Subject: [PATCH] use single ENUMS; change old realEstateType enums --- app/controllers/realEstateTypes.js | 5 ++- ...adType-in-searchRequests-table-to-SALE.js} | 0 ...-realEstateType-in-searchRequests-table.js | 31 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) rename app/migrations/{20190923185802-change-adType-in-searchRequests-table-to-SALE.js => 20190927121449-change-adType-in-searchRequests-table-to-SALE.js} (100%) create mode 100644 app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js diff --git a/app/controllers/realEstateTypes.js b/app/controllers/realEstateTypes.js index 7b84247..3b5f864 100644 --- a/app/controllers/realEstateTypes.js +++ b/app/controllers/realEstateTypes.js @@ -1,10 +1,13 @@ const { currentSearchRequest } = require("../helpers/url"); const { createSearchRequest } = require("../helpers/db/searchRequest"); -const { realEstateTypes, getRealEstateTypeEnum } = require("../helpers/enums"); +const { AD_CATEGORY } = require("../common/enums"); const getRealEstateTypes = (req, res) => { const title = "Koju nekretninu tražite?"; + const realEstateTypes = Object.keys(AD_CATEGORY).map( + category => AD_CATEGORY[category] + ); res.render("realEstateType", { realEstateTypes, title }); }; diff --git a/app/migrations/20190923185802-change-adType-in-searchRequests-table-to-SALE.js b/app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js similarity index 100% rename from app/migrations/20190923185802-change-adType-in-searchRequests-table-to-SALE.js rename to app/migrations/20190927121449-change-adType-in-searchRequests-table-to-SALE.js diff --git a/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js b/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js new file mode 100644 index 0000000..9e5876d --- /dev/null +++ b/app/migrations/20190927180101-change-change-realEstateType-in-searchRequests-table.js @@ -0,0 +1,31 @@ +"use strict"; + +module.exports = { + up: (queryInterface, Sequelize) => { + return Promise.all([ + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'HOUSE' WHERE "realEstateType" = 'kuca';` + ), + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'FLAT' WHERE "realEstateType" = 'stan';` + ), + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'COTTAGE' WHERE "realEstateType" = 'vikendica';` + ) + ]); + }, + + down: (queryInterface, Sequelize) => { + return Promise.all([ + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'kuca' WHERE "realEstateType" = 'HOUSE';` + ), + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'stan' WHERE "realEstateType" = 'FLAT';` + ), + queryInterface.sequelize.query( + `UPDATE "SearchRequests" SET "realEstateType" = 'vikendica' WHERE "realEstateType" = 'COTTAGE';` + ) + ]); + } +};