Skip to content

Commit

Permalink
Merge pull request #80 from andela/fix-time-notifications-170578497
Browse files Browse the repository at this point in the history
170578497 - Fix notifications timestamp
  • Loading branch information
nakiwuge committed Jan 8, 2020
2 parents 3afcf4a + b5e234e commit cc3b8ae
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
23 changes: 23 additions & 0 deletions src/database/migrations/20200108103838-changeDateType.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
up: (queryInterface, Sequelize) => queryInterface.sequelize.transaction(t => Promise.all([
queryInterface.removeColumn('notifications', 'createdAt', { transaction: t }),
queryInterface.removeColumn('notifications', 'updatedAt', { transaction: t }),
queryInterface.addColumn('notifications', 'createdAt', {
type: Sequelize.DATE,
}, { transaction: t }),
queryInterface.addColumn('notifications', 'updatedAt', {
type: Sequelize.DATE,
}, { transaction: t }),
])),

down: (queryInterface, Sequelize) => queryInterface.sequelize.transaction(t => Promise.all([
queryInterface.removeColumn('notifications', 'createdAt', { transaction: t }),
queryInterface.removeColumn('notifications', 'updatedAt', { transaction: t }),
queryInterface.addColumn('notifications', 'createdAt', {
type: Sequelize.DATEONLY,
}, { transaction: t }),
queryInterface.addColumn('notifications', 'updatedAt', {
type: Sequelize.DATEONLY,
}, { transaction: t }),
])),
};
10 changes: 5 additions & 5 deletions src/middlewares/inputValidation.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ export default class InputValidation {

static validateAddNew(req, res, next) {
const schema = Joi.object({
name: Joi.string().trim().min(10).max(100)
name: Joi.string().trim()
.message('Name should be at least 10 character and not more than 100 characters!')
.required(),
description: Joi.string().min(10).max(250).required(),
locationId: Joi.number().integer().min(1).max(20)
description: Joi.string().required(),
locationId: Joi.number().integer().min(1)
.required(),
availableSpace: Joi.number().integer().min(1)
.required(),
cost: Joi.number().integer().min(1)
.required(),
currency: Joi.string().regex(/^(rwf|RWF|ksh|KSH|ugx|UGX|usd|USD)/).message('Currency should only be RWF, KSH, UGX or USD!')
.required(),
highlights: Joi.string().min(10).max(250).required(),
amenities: Joi.string().min(10).max(250).required()
highlights: Joi.string().required(),
amenities: Joi.string().required()
});
validation(req, res, schema, next);
}
Expand Down

0 comments on commit cc3b8ae

Please sign in to comment.