From 65c9ece0730d3e2114890baa24e0a865bb179d46 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Tue, 10 Sep 2019 05:45:58 +0200 Subject: [PATCH] change bounding box column name from snake case to camel case --- app/helpers/db/dbHelper.js | 2 +- ...nding-box-from-snake-case-to-camel-case.js | 19 +++++++++++++++++++ app/models/realestaterequest.js | 5 +++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 app/migrations/20190910033923-change-bounding-box-from-snake-case-to-camel-case.js diff --git a/app/helpers/db/dbHelper.js b/app/helpers/db/dbHelper.js index b606cbb..0d56f48 100644 --- a/app/helpers/db/dbHelper.js +++ b/app/helpers/db/dbHelper.js @@ -90,7 +90,7 @@ const getMarketAlertById = async id => { */ const findPointInsideBoundingBox = async (latLng, email, uniqueId) => { return await db.sequelize.query( - `SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND "uniqueId" = '${uniqueId}' AND subscribed = true AND ST_Contains("RealEstateRequests".bounding_box, ST_GEOMFROMTEXT('POINT (${ + `SELECT * FROM "RealEstateRequests" WHERE email = '${email}' AND "uniqueId" = '${uniqueId}' AND subscribed = true AND ST_Contains("RealEstateRequests".boundingBox, ST_GEOMFROMTEXT('POINT (${ latLng[0] } ${latLng[1]})'))` ); diff --git a/app/migrations/20190910033923-change-bounding-box-from-snake-case-to-camel-case.js b/app/migrations/20190910033923-change-bounding-box-from-snake-case-to-camel-case.js new file mode 100644 index 0000000..1c77e5d --- /dev/null +++ b/app/migrations/20190910033923-change-bounding-box-from-snake-case-to-camel-case.js @@ -0,0 +1,19 @@ +"use strict"; + +module.exports = { + up: (queryInterface, Sequelize) => { + return queryInterface.renameColumn( + "RealEstateRequests", + "bounding_box", + "boundingBox" + ); + }, + + down: (queryInterface, Sequelize) => { + return queryInterface.renameColumn( + "RealEstateRequests", + "boundingBox", + "bounding_box" + ); + } +}; diff --git a/app/models/realestaterequest.js b/app/models/realestaterequest.js index 8cedce9..b4671b8 100644 --- a/app/models/realestaterequest.js +++ b/app/models/realestaterequest.js @@ -19,8 +19,9 @@ module.exports = (sequelize, DataTypes) => { gardenSizeMax: DataTypes.INTEGER, priceMin: DataTypes.INTEGER, priceMax: DataTypes.INTEGER, - bounding_box: DataTypes.GEOMETRY("POINT", 4326), - subscribed: DataTypes.BOOLEAN + boundingBox: DataTypes.GEOMETRY("POINT", 4326), + subscribed: DataTypes.BOOLEAN, + locationInput: DataTypes.STRING }, {} );