Skip to content

update dependencies and fix joi validation error #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BeshoyAdelW wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update dependencies and fix joi validation error #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 37 additions & 34 deletions models/movie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
const Joi = require('joi');
const mongoose = require('mongoose');
const {genreSchema} = require('./genre');
const Joi = require("joi");
const mongoose = require("mongoose");
const { genreSchema } = require("./genre");

const Movie = mongoose.model('Movies', new mongoose.Schema({
title: {
type: String,
required: true,
trim: true,
minlength: 5,
maxlength: 255
},
genre: {
type: genreSchema,
required: true
},
numberInStock: {
type: Number,
required: true,
min: 0,
max: 255
},
dailyRentalRate: {
type: Number,
required: true,
min: 0,
max: 255
}
}));
const Movie = mongoose.model(
"Movies",
new mongoose.Schema({
title: {
type: String,
required: true,
trim: true,
minlength: 5,
maxlength: 255,
},
genre: {
type: genreSchema,
required: true,
},
numberInStock: {
type: Number,
required: true,
min: 0,
max: 255,
},
dailyRentalRate: {
type: Number,
required: true,
min: 0,
max: 255,
},
})
);

function validateMovie(movie) {
const schema = {
const schema = Joi.object({
title: Joi.string().min(5).max(50).required(),
genreId: Joi.objectId().required(),
numberInStock: Joi.number().min(0).required(),
dailyRentalRate: Joi.number().min(0).required()
};
dailyRentalRate: Joi.number().min(0).required(),
});

return Joi.validate(movie, schema);
return schema.validate(movie);
}

exports.Movie = Movie;
exports.validate = validateMovie;
exports.Movie = Movie;
exports.validate = validateMovie;
34 changes: 12 additions & 22 deletions models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ const userSchema = new mongoose.Schema({
type: String,
required: true,
minlength: 2,
maxlength: 50
maxlength: 50,
},
email: {
type: String,
required: true,
minlength: 5,
maxlength: 255,
unique: true
unique: true,
},
password: {
type: String,
required: true,
minlength: 5,
maxlength: 1024
maxlength: 1024,
},
isAdmin: Boolean
isAdmin: Boolean,
});

userSchema.methods.generateAuthToken = function() {
userSchema.methods.generateAuthToken = function () {
const token = jwt.sign(
{
_id: this._id,
name: this.name,
email: this.email,
isAdmin: this.isAdmin
isAdmin: this.isAdmin,
},
config.get("jwtPrivateKey")
);
Expand All @@ -42,23 +42,13 @@ userSchema.methods.generateAuthToken = function() {
const User = mongoose.model("User", userSchema);

function validateUser(user) {
const schema = {
name: Joi.string()
.min(2)
.max(50)
.required(),
email: Joi.string()
.min(5)
.max(255)
.required()
.email(),
password: Joi.string()
.min(5)
.max(255)
.required()
};
const schema = Joi.object({
name: Joi.string().min(2).max(50).required(),
email: Joi.string().min(5).max(255).required().email(),
password: Joi.string().min(5).max(255).required(),
});

return Joi.validate(user, schema);
return schema.validate(user);
}

exports.User = User;
Expand Down
Loading