senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'change-migrations-use-string-instead-of-enums' into 'master'

Browse Source 
Change migrations - use string instead of enum

See merge request saburly/marketalarm/web!7
This commit was merged in pull request #7.
This commit is contained in:
Nedim Uka
2019-05-24 13:50:55 +00:00
parent 315a29749c 126da48852
commit 89a3c9e355
5 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/migrations/20190417035707-create-real-estate-request.js
View File

@@ -12,8 +12,7 @@ module.exports = {
type: Sequelize.UUID type: Sequelize.UUID
}, },
realEstateType: { realEstateType: {
type: Sequelize.ENUM, type: Sequelize.STRING
values: ['kuca','stan','vikendica','plac','poslovni_prostor','apartman','garaza']
}, },
email: { email: {
type: Sequelize.STRING type: Sequelize.STRING

3
app/migrations/20190517072957-add-size-to-real-estate-request.js
View File

@@ -6,8 +6,7 @@ module.exports = {
'RealEstateRequests', 'RealEstateRequests',
'size', 'size',
{ {
type: Sequelize.ENUM, type: Sequelize.STRING
values: ['50m2', '75m2', '100m2', '150m2', '200m2', 'moreThan200m2']
} }
); );
}, },

3
app/migrations/20190517090015-add-gardenSize-to-real-estate-request.js
View File

@@ -6,8 +6,7 @@ module.exports = {
'RealEstateRequests', 'RealEstateRequests',
'gardenSize', 'gardenSize',
{ {
type: Sequelize.ENUM, type: Sequelize.STRING
values: ['100m2', '500m2', '1000m2', '2000m2', '3000m2', 'moreThan3000m2']
} }
); );
}, },

3
app/migrations/20190517092716-add-price-to-real-estate-request.js
View File

@@ -6,8 +6,7 @@ module.exports = {
'RealEstateRequests', 'RealEstateRequests',
'price', 'price',
{ {
type: Sequelize.ENUM, type: Sequelize.STRING
values: ['50kKM', '100kKM', '150kKM', '200kKM', '250kKM', 'moreThan250kKM']
} }
); );
}, },

26
app/models/realestaterequest.js
View File

@@ -1,38 +1,20 @@
'use strict'; 'use strict';
const {realEstateTypes, sizes, gardenSizes, prices } = require('../helpers/enums');
module.exports = (sequelize, DataTypes) => { 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', { const RealEstateRequest = sequelize.define('RealEstateRequest', {
uniqueId: { uniqueId: {
type: DataTypes.UUID, type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4, defaultValue: DataTypes.UUIDV4,
allowNull: false allowNull: false
}, },
realEstateType: { realEstateType: DataTypes.STRING,
type: DataTypes.ENUM,
values: realEstateTypeValues,
},
email: DataTypes.STRING, email: DataTypes.STRING,
region: DataTypes.STRING, region: DataTypes.STRING,
municipality: DataTypes.STRING, municipality: DataTypes.STRING,
size: { size: DataTypes.STRING,
type: DataTypes.ENUM, gardenSize: DataTypes.STRING,
values: sizeValues, price: DataTypes.STRING,
},
gardenSize: {
type: DataTypes.ENUM,
values: gardenSizeValues,
},
price: {
type: DataTypes.ENUM,
values: priceValues,
}
}, {}); }, {});
RealEstateRequest.associate = function(models) { RealEstateRequest.associate = function(models) {
// associations can be defined here // associations can be defined here