From aaf61f3810e6d57c5130af959bd2860df32775e7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 24 Jun 2016 17:42:51 +0200 Subject: Video model refractoring -> use mongoose api --- server/middlewares/reqValidators/videos.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'server/middlewares/reqValidators/videos.js') diff --git a/server/middlewares/reqValidators/videos.js b/server/middlewares/reqValidators/videos.js index f31fd93a2..452fbc859 100644 --- a/server/middlewares/reqValidators/videos.js +++ b/server/middlewares/reqValidators/videos.js @@ -1,11 +1,13 @@ 'use strict' +const mongoose = require('mongoose') + const checkErrors = require('./utils').checkErrors const constants = require('../../initializers/constants') const customValidators = require('../../helpers/customValidators') const logger = require('../../helpers/logger') -const videos = require('../../lib/videos') -const Videos = require('../../models/videos') + +const Video = mongoose.model('Video') const reqValidatorsVideos = { videosAdd: videosAdd, @@ -26,7 +28,7 @@ function videosAdd (req, res, next) { checkErrors(req, res, function () { const videoFile = req.files.videofile[0] - videos.getVideoDuration(videoFile.path, function (err, duration) { + Video.getDurationFromFile(videoFile.path, function (err, duration) { if (err) { return res.status(400).send('Cannot retrieve metadata of the file.') } @@ -47,14 +49,13 @@ function videosGet (req, res, next) { logger.debug('Checking videosGet parameters', { parameters: req.params }) checkErrors(req, res, function () { - Videos.get(req.params.id, function (err, video) { + Video.load(req.params.id, function (err, video) { if (err) { logger.error('Error in videosGet request validator.', { error: err }) return res.sendStatus(500) } - const state = videos.getVideoState(video) - if (state.exist === false) return res.status(404).send('Video not found') + if (!video) return res.status(404).send('Video not found') next() }) @@ -67,15 +68,14 @@ function videosRemove (req, res, next) { logger.debug('Checking videosRemove parameters', { parameters: req.params }) checkErrors(req, res, function () { - Videos.get(req.params.id, function (err, video) { + Video.load(req.params.id, function (err, video) { if (err) { logger.error('Error in videosRemove request validator.', { error: err }) return res.sendStatus(500) } - const state = videos.getVideoState(video) - if (state.exist === false) return res.status(404).send('Video not found') - else if (state.owned === false) return res.status(403).send('Cannot remove video of another pod') + if (!video) return res.status(404).send('Video not found') + else if (video.isOwned() === false) return res.status(403).send('Cannot remove video of another pod') next() }) -- cgit v1.2.3