Skip to content

Commit

Permalink
Bug(accommodations): add slugs to accommodations
Browse files Browse the repository at this point in the history
- Adds a slug upon accommodation creation
- Formats dates to a more readable format
[Finishes#169385153]
  • Loading branch information
alainmateso committed Oct 28, 2019
1 parent 076abd4 commit 5928870
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 18 deletions.
5 changes: 5 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
"request": "^2.87.0",
"sequelize": "^5.19.1",
"sequelize-cli": "^5.5.1",
"slugify": "^1.3.5",
"swagger-jsdoc": "^3.4.0",
"swagger-ui-express": "^4.1.1",
"underscore": "^1.9.1"
Expand Down
4 changes: 3 additions & 1 deletion src/controllers/accommodationController.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import cloudinary from 'cloudinary';
import slugify from 'slugify';
import models from '../database/models';
import strings from '../utils/stringsUtil';
import responseUtil from '../utils/responseUtil';
Expand Down Expand Up @@ -29,7 +30,8 @@ export default class AccommodationController {
highlights,
amenities,
owner: req.user.payload.id,
images
images,
slug: slugify(name.toLowerCase())
};
try {
const newAccommodation = await models.accommodations.create(accommodation);
Expand Down
6 changes: 3 additions & 3 deletions src/database/migrations/20190930143254-User.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
allowNull: true
},
dob: {
type: Sequelize.DATE,
type: Sequelize.DATEONLY,
allowNull: true
},
country: {
Expand Down Expand Up @@ -69,8 +69,8 @@ module.exports = {
}
}
},
createdAt: Sequelize.DATE,
updatedAt: Sequelize.DATE,
createdAt: Sequelize.DATEONLY,
updatedAt: Sequelize.DATEONLY,
}),
down: queryInterface => queryInterface.dropTable('users')
};
4 changes: 2 additions & 2 deletions src/database/migrations/20191015081823-create-trip-types.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ module.exports = {
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
}
});
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ module.exports = {
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
}
});
},
Expand Down
4 changes: 2 additions & 2 deletions src/database/migrations/20191015082308-create-destinations.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ module.exports = {
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
}
});
},
Expand Down
4 changes: 2 additions & 2 deletions src/database/migrations/20191015091939-create-locations.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ module.exports = {
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
}
});
},
Expand Down
4 changes: 2 additions & 2 deletions src/database/migrations/20191016090432-create-role.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ module.exports = {
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
type: Sequelize.DATEONLY
}
});
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = {
amenities: { type: Sequelize.STRING},
owner: {type: Sequelize.INTEGER},
images: {type: Sequelize.JSONB},
slug: {type: Sequelize.STRING},
createdAt: {allowNull: false,type: Sequelize.DATEONLY},
updatedAt: {allowNull: false,type: Sequelize.DATEONLY}
});
Expand Down
3 changes: 2 additions & 1 deletion src/database/models/accommodations.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ module.exports = (sequelize, DataTypes) => {
highlights: DataTypes.STRING,
amenities: DataTypes.STRING,
owner: DataTypes.INTEGER,
images: DataTypes.JSONB
images: DataTypes.JSONB,
slug: DataTypes.STRING,
}, { tableName: 'accommodations' });
accommodations.associate = models => {
// associations can be defined here
Expand Down
4 changes: 2 additions & 2 deletions src/database/models/destinations.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module.exports = (sequelize, DataTypes) => {
const destinations = sequelize.define('destinations', {
locationId: DataTypes.INTEGER,
bookingId: DataTypes.INTEGER,
arrivalDate: DataTypes.DATE,
departureDate: DataTypes.DATE,
arrivalDate: DataTypes.DATEONLY,
departureDate: DataTypes.DATEONLY,
requestId: DataTypes.INTEGER,
reasons: DataTypes.STRING,
isFinal: DataTypes.BOOLEAN
Expand Down
2 changes: 1 addition & 1 deletion src/database/models/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = (sequelize, Datatypes) => {
role: Datatypes.INTEGER,
phone: Datatypes.STRING,
gender: Datatypes.STRING,
dob: Datatypes.DATE,
dob: Datatypes.DATEONLY,
country: Datatypes.STRING,
language: Datatypes.STRING,
currency: Datatypes.STRING,
Expand Down

0 comments on commit 5928870

Please sign in to comment.