From 58ae4305649a68b8ff429080fde4e3c93ca94553 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Mon, 20 May 2019 19:23:37 +0200 Subject: [PATCH 1/2] modify migrations - use string instead of enum --- app/migrations/20190417035707-create-real-estate-request.js | 3 +-- .../20190517072957-add-size-to-real-estate-request.js | 3 +-- .../20190517090015-add-gardenSize-to-real-estate-request.js | 3 +-- .../20190517092716-add-price-to-real-estate-request.js | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/migrations/20190417035707-create-real-estate-request.js b/app/migrations/20190417035707-create-real-estate-request.js index 1beda2f..49be61f 100644 --- a/app/migrations/20190417035707-create-real-estate-request.js +++ b/app/migrations/20190417035707-create-real-estate-request.js @@ -12,8 +12,7 @@ module.exports = { type: Sequelize.UUID }, realEstateType: { - type: Sequelize.ENUM, - values: ['kuca','stan','vikendica','plac','poslovni_prostor','apartman','garaza'] + type: Sequelize.STRING }, email: { type: Sequelize.STRING diff --git a/app/migrations/20190517072957-add-size-to-real-estate-request.js b/app/migrations/20190517072957-add-size-to-real-estate-request.js index a41c12f..7f28585 100644 --- a/app/migrations/20190517072957-add-size-to-real-estate-request.js +++ b/app/migrations/20190517072957-add-size-to-real-estate-request.js @@ -6,8 +6,7 @@ module.exports = { 'RealEstateRequests', 'size', { - type: Sequelize.ENUM, - values: ['50m2', '75m2', '100m2', '150m2', '200m2', 'moreThan200m2'] + type: Sequelize.STRING } ); }, diff --git a/app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js b/app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js index e65f9d5..84e2319 100644 --- a/app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js +++ b/app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js @@ -6,8 +6,7 @@ module.exports = { 'RealEstateRequests', 'gardenSize', { - type: Sequelize.ENUM, - values: ['100m2', '500m2', '1000m2', '2000m2', '3000m2', 'moreThan3000m2'] + type: Sequelize.STRING } ); }, diff --git a/app/migrations/20190517092716-add-price-to-real-estate-request.js b/app/migrations/20190517092716-add-price-to-real-estate-request.js index 87b2d18..13bcae6 100644 --- a/app/migrations/20190517092716-add-price-to-real-estate-request.js +++ b/app/migrations/20190517092716-add-price-to-real-estate-request.js @@ -6,8 +6,7 @@ module.exports = { 'RealEstateRequests', 'price', { - type: Sequelize.ENUM, - values: ['50kKM', '100kKM', '150kKM', '200kKM', '250kKM', 'moreThan250kKM'] + type: Sequelize.STRING } ); }, From 126da4885273105b7b21c46e92404531610f7ba1 Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Mon, 20 May 2019 19:25:05 +0200 Subject: [PATCH 2/2] modify realEstateRequest model to use String instead of enum --- app/models/realestaterequest.js | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/app/models/realestaterequest.js b/app/models/realestaterequest.js index 08ed040..4f48367 100644 --- a/app/models/realestaterequest.js +++ b/app/models/realestaterequest.js @@ -1,38 +1,20 @@ 'use strict'; -const {realEstateTypes, sizes, gardenSizes, prices } = require('../helpers/enums'); module.exports = (sequelize, DataTypes) => { - const realEstateTypeValues = realEstateTypes.map(realEstateType => realEstateType.id); - const sizeValues = sizes.map(size => size.id); - const gardenSizeValues = gardenSizes.map(gardenSize => gardenSize.id); - const priceValues = prices.map(price => price.id); - const RealEstateRequest = sequelize.define('RealEstateRequest', { uniqueId: { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, allowNull: false }, - realEstateType: { - type: DataTypes.ENUM, - values: realEstateTypeValues, - }, + realEstateType: DataTypes.STRING, email: DataTypes.STRING, region: DataTypes.STRING, municipality: DataTypes.STRING, - size: { - type: DataTypes.ENUM, - values: sizeValues, - }, - gardenSize: { - type: DataTypes.ENUM, - values: gardenSizeValues, - }, - price: { - type: DataTypes.ENUM, - values: priceValues, - } + size: DataTypes.STRING, + gardenSize: DataTypes.STRING, + price: DataTypes.STRING, }, {}); RealEstateRequest.associate = function(models) { // associations can be defined here