KevinMidboe/seasonedShows
1
0
Fork 0
Code Issues 20 Pull Requests 2 Packages Projects Releases 8 Wiki Activity

Api/v2 #111

Merged
KevinMidboe merged 88 commits from api/v2 into master 2019-11-04 17:01:16 +00:00
Conversation 2 Commits 88 Files Changed 89 +8 -11
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91d238de7c - Show all commits

2
seasoned_api/src/database/schemas/setup.sql
View File

@@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS request(
title text not null, title text not null,
year int not null, year int not null,
type char(10) not null, type char(10) not null,
date default current_timestamp date timestamp default (strftime('%s', 'now'))
); );

2
seasoned_api/src/webserver/app.js
View File

@@ -101,7 +101,7 @@ router.get('/v1/plex/hook', require('./controllers/plex/hookDump.js'));
* Requests * 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.get('/v1/plex/requests/all', require('./controllers/plex/fetchRequested.js'));
router.put('/v1/plex/request/:requestId', mustBeAuthenticated, require('./controllers/plex/updateRequested.js')); router.put('/v1/plex/request/:requestId', mustBeAuthenticated, require('./controllers/plex/updateRequested.js'));

15
seasoned_api/src/webserver/controllers/request/requestTmdbId.js
View File

@@ -6,14 +6,14 @@ const cache = new Cache();
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
const request = new RequestRepository(); const request = new RequestRepository();
const typeFunction = (type) => { const requestAsTmdb = (type, id) => {
if (type !== undefined) { if (type !== undefined) {
type = type.toLowerCase(); type = type.toLowerCase();
if (type === 'movie') { if (type === 'movie') {
return tmdb.movieInfo; return tmdb.movieInfo(id);
} else if (type === 'show') { } else if (type === 'show') {
return tmdb.showInfo; return tmdb.showInfo(id);
} else { } else {
throw new Error("Unprocessable Entity: Invalid type for body parameter 'type'. Allowed values: movie|show"); throw new Error("Unprocessable Entity: Invalid type for body parameter 'type'. Allowed values: movie|show");
} }
@@ -28,14 +28,11 @@ const typeFunction = (type) => {
* @returns {Callback} * @returns {Callback}
*/ */
function requestTmdbIdController(req, res) { function requestTmdbIdController(req, res) {
const requestId = req.params.id; const { id, type } = req.body;
const tmdbType = req.body.tmdbType;
Promise.resolve() Promise.resolve()
.then(() => typeFunction(tmdbType)) .then(() => requestAsTmdb(type, id))
// .then(() => checkType .then((requesAsTmdb) => request.addTmdb(requesAsTmdb))
.then(() => tmdb.movieInfo(requestId))
.then((movie) => request.addTmdb(movie))
.then(() => res.send({sucess: true, message: 'Request has been submitted.'})) .then(() => res.send({sucess: true, message: 'Request has been submitted.'}))
.catch((error) => { .catch((error) => {
res.status(404).send({ success: false, error: error.message }); res.status(404).send({ success: false, error: error.message });