diff --git a/seasoned_api/src/database/schemas/setup.sql b/seasoned_api/src/database/schemas/setup.sql index 88a0a8c..91bfc3e 100644 --- a/seasoned_api/src/database/schemas/setup.sql +++ b/seasoned_api/src/database/schemas/setup.sql @@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS request( title text not null, year int not null, type char(10) not null, - date default current_timestamp + date timestamp default (strftime('%s', 'now')) ); diff --git a/seasoned_api/src/webserver/app.js b/seasoned_api/src/webserver/app.js index 342b65a..17ea14c 100644 --- a/seasoned_api/src/webserver/app.js +++ b/seasoned_api/src/webserver/app.js @@ -101,7 +101,7 @@ router.get('/v1/plex/hook', require('./controllers/plex/hookDump.js')); * Requests */ -router.post('/v2/request/:id', require('./controllers/request/requestTmdbId.js')); +router.post('/v2/request', require('./controllers/request/requestTmdbId.js')); router.get('/v1/plex/requests/all', require('./controllers/plex/fetchRequested.js')); router.put('/v1/plex/request/:requestId', mustBeAuthenticated, require('./controllers/plex/updateRequested.js')); diff --git a/seasoned_api/src/webserver/controllers/request/requestTmdbId.js b/seasoned_api/src/webserver/controllers/request/requestTmdbId.js index 46ad956..354b8bf 100644 --- a/seasoned_api/src/webserver/controllers/request/requestTmdbId.js +++ b/seasoned_api/src/webserver/controllers/request/requestTmdbId.js @@ -6,14 +6,14 @@ const cache = new Cache(); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); const request = new RequestRepository(); -const typeFunction = (type) => { +const requestAsTmdb = (type, id) => { if (type !== undefined) { type = type.toLowerCase(); if (type === 'movie') { - return tmdb.movieInfo; + return tmdb.movieInfo(id); } else if (type === 'show') { - return tmdb.showInfo; + return tmdb.showInfo(id); } else { throw new Error("Unprocessable Entity: Invalid type for body parameter 'type'. Allowed values: movie|show"); } @@ -28,14 +28,11 @@ const typeFunction = (type) => { * @returns {Callback} */ function requestTmdbIdController(req, res) { - const requestId = req.params.id; - const tmdbType = req.body.tmdbType; + const { id, type } = req.body; Promise.resolve() - .then(() => typeFunction(tmdbType)) - // .then(() => checkType - .then(() => tmdb.movieInfo(requestId)) - .then((movie) => request.addTmdb(movie)) + .then(() => requestAsTmdb(type, id)) + .then((requesAsTmdb) => request.addTmdb(requesAsTmdb)) .then(() => res.send({sucess: true, message: 'Request has been submitted.'})) .catch((error) => { res.status(404).send({ success: false, error: error.message });