From 34982c14fe7040f2427311b26bf1819d76699e91 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Wed, 7 Feb 2018 13:51:57 +0100 Subject: [PATCH] Linted all controllers --- .../src/webserver/controllers/git/dumpHook.js | 14 ++++----- .../webserver/controllers/pirate/addMagnet.js | 16 +++++----- .../controllers/pirate/searchTheBay.js | 16 +++++----- .../controllers/plex/fetchRequested.js | 16 +++++----- .../webserver/controllers/plex/hookDump.js | 8 ++--- .../webserver/controllers/plex/plexPlaying.js | 17 ++++++----- .../webserver/controllers/plex/readRequest.js | 17 ++++++----- .../webserver/controllers/plex/searchMedia.js | 29 ++++++++++--------- .../controllers/plex/searchRequest.js | 25 ++++++++-------- .../controllers/plex/submitRequest.js | 29 ++++++++++--------- .../controllers/plex/updateRequested.js | 21 +++++++------- .../controllers/seasoned/readStrays.js | 19 ++++++------ .../controllers/seasoned/strayById.js | 18 ++++++------ .../controllers/seasoned/verifyStray.js | 16 +++++----- .../webserver/controllers/tmdb/listSearch.js | 19 ++++++------ .../webserver/controllers/tmdb/readMedia.js | 17 ++++++----- .../webserver/controllers/tmdb/searchMedia.js | 27 ++++++++--------- .../src/webserver/controllers/user/history.js | 17 ++++++----- .../src/webserver/controllers/user/login.js | 21 +++++++------- .../webserver/controllers/user/register.js | 19 ++++++------ 20 files changed, 195 insertions(+), 186 deletions(-) diff --git a/seasoned_api/src/webserver/controllers/git/dumpHook.js b/seasoned_api/src/webserver/controllers/git/dumpHook.js index c05ada6..cfc1637 100644 --- a/seasoned_api/src/webserver/controllers/git/dumpHook.js +++ b/seasoned_api/src/webserver/controllers/git/dumpHook.js @@ -3,13 +3,13 @@ const GitRepository = require('src/git/gitRepository'); const gitRepository = new GitRepository(); function dumpHookController(req, res) { - gitRepository.dumpHook(req.body) - .then(() => { - res.status(200); - }) - .catch((error) => { - res.status(500); - }); + gitRepository.dumpHook(req.body) + .then(() => { + res.status(200); + }) + .catch((error) => { + res.status(500); + }); } module.exports = dumpHookController; diff --git a/seasoned_api/src/webserver/controllers/pirate/addMagnet.js b/seasoned_api/src/webserver/controllers/pirate/addMagnet.js index 66d7e74..9899831 100644 --- a/seasoned_api/src/webserver/controllers/pirate/addMagnet.js +++ b/seasoned_api/src/webserver/controllers/pirate/addMagnet.js @@ -9,15 +9,15 @@ const PirateRepository = require('src/pirate/pirateRepository'); function updateRequested(req, res) { - const magnet = req.body.magnet; + const magnet = req.body.magnet; - PirateRepository.AddMagnet(magnet) - .then((result) => { - res.send(result); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + PirateRepository.AddMagnet(magnet) + .then((result) => { + res.send(result); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = updateRequested; diff --git a/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js b/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js index 6ee8eee..4f85f69 100644 --- a/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js +++ b/seasoned_api/src/webserver/controllers/pirate/searchTheBay.js @@ -15,15 +15,15 @@ const PirateRepository = require('src/pirate/pirateRepository'); * @returns {Callback} */ function updateRequested(req, res) { - const { query, page, type } = req.query; + const { query, page, type } = req.query; - PirateRepository.SearchPiratebay(query, page, type) - .then((result) => { - res.send({ success: true, torrents: result }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + PirateRepository.SearchPiratebay(query, page, type) + .then((result) => { + res.send({ success: true, torrents: result }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = updateRequested; diff --git a/seasoned_api/src/webserver/controllers/plex/fetchRequested.js b/seasoned_api/src/webserver/controllers/plex/fetchRequested.js index 673e306..1602aba 100644 --- a/seasoned_api/src/webserver/controllers/plex/fetchRequested.js +++ b/seasoned_api/src/webserver/controllers/plex/fetchRequested.js @@ -9,15 +9,15 @@ const requestRepository = new RequestRepository(); * @returns {Callback} */ function historyController(req, res) { - const user = req.loggedInUser; + // const user = req.loggedInUser; - requestRepository.fetchRequested() - .then((requestedItems) => { - res.send({ success: true, results: requestedItems, total_results: requestedItems.length }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + requestRepository.fetchRequested() + .then((requestedItems) => { + res.send({ success: true, results: requestedItems, total_results: requestedItems.length }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = historyController; diff --git a/seasoned_api/src/webserver/controllers/plex/hookDump.js b/seasoned_api/src/webserver/controllers/plex/hookDump.js index 1761757..82d4e69 100644 --- a/seasoned_api/src/webserver/controllers/plex/hookDump.js +++ b/seasoned_api/src/webserver/controllers/plex/hookDump.js @@ -2,13 +2,11 @@ * @Author: KevinMidboe * @Date: 2017-05-03 23:26:46 * @Last Modified by: KevinMidboe -* @Last Modified time: 2017-05-03 23:27:59 +* @Last Modified time: 2018-02-06 20:54:22 */ -const configuration = require('src/config/configuration').getInstance(); - function hookDumpController(req, res) { - console.log(req); + console.log(req); } -module.exports = hookDumpController; \ No newline at end of file +module.exports = hookDumpController; diff --git a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js index 2670ea0..a14ec6a 100644 --- a/seasoned_api/src/webserver/controllers/plex/plexPlaying.js +++ b/seasoned_api/src/webserver/controllers/plex/plexPlaying.js @@ -1,14 +1,15 @@ const PlexRepository = require('src/plex/plexRepository'); + const plexRepository = new PlexRepository(); function playingController(req, res) { - plexRepository.nowPlaying() - .then((movies) => { - res.send(movies); - }) - .catch((error) => { - res.status(500).send({success: false, error: error.message }); - }) + plexRepository.nowPlaying() + .then((movies) => { + res.send(movies); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } -module.exports = playingController; \ No newline at end of file +module.exports = playingController; diff --git a/seasoned_api/src/webserver/controllers/plex/readRequest.js b/seasoned_api/src/webserver/controllers/plex/readRequest.js index 0524a2f..351dae6 100644 --- a/seasoned_api/src/webserver/controllers/plex/readRequest.js +++ b/seasoned_api/src/webserver/controllers/plex/readRequest.js @@ -1,4 +1,5 @@ const RequestRepository = require('src/plex/requestRepository'); + const requestRepository = new RequestRepository(); /** @@ -8,14 +9,14 @@ const requestRepository = new RequestRepository(); * @returns {Callback} */ function readRequestController(req, res) { - const mediaId = req.params.mediaId; - const { type } = req.query; - requestRepository.lookup(mediaId, type) - .then((movies) => { - res.send(movies); - }).catch((error) => { - res.status(404).send({ success: false, error: error.message }); - }); + const mediaId = req.params.mediaId; + const { type } = req.query; + requestRepository.lookup(mediaId, type) + .then((movies) => { + res.send(movies); + }).catch((error) => { + res.status(404).send({ success: false, error: error.message }); + }); } module.exports = readRequestController; diff --git a/seasoned_api/src/webserver/controllers/plex/searchMedia.js b/seasoned_api/src/webserver/controllers/plex/searchMedia.js index bef7f26..3351f6c 100644 --- a/seasoned_api/src/webserver/controllers/plex/searchMedia.js +++ b/seasoned_api/src/webserver/controllers/plex/searchMedia.js @@ -1,27 +1,28 @@ const PlexRepository = require('src/plex/plexRepository'); + const plexRepository = new PlexRepository(); /** - * Controller: Search for media and check existence + * Controller: Search for media and check existence * in plex by query and page * @param {Request} req http request variable * @param {Response} res * @returns {Callback} */ function searchMediaController(req, res) { - const { query, page } = req.query; + const { query } = req.query; - plexRepository.searchMedia(query) - .then((media) => { - if (media !== undefined || media.length > 0) { - res.send(media); - } else { - res.status(404).send({ success: false, error: 'Search query did not return any results.'}) - } - }) - .catch((error) => { - res.status(500).send({success: false, error: error.message }); - }) + plexRepository.search(query) + .then((media) => { + if (media !== undefined || media.length > 0) { + res.send(media); + } else { + res.status(404).send({ success: false, error: 'Search query did not return any results.' }); + } + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } -module.exports = searchMediaController; \ No newline at end of file +module.exports = searchMediaController; diff --git a/seasoned_api/src/webserver/controllers/plex/searchRequest.js b/seasoned_api/src/webserver/controllers/plex/searchRequest.js index 8be256a..e5b038c 100644 --- a/seasoned_api/src/webserver/controllers/plex/searchRequest.js +++ b/seasoned_api/src/webserver/controllers/plex/searchRequest.js @@ -1,24 +1,25 @@ const SearchHistory = require('src/searchHistory/searchHistory'); const Cache = require('src/tmdb/cache'); const RequestRepository = require('src/plex/requestRepository.js'); + const cache = new Cache(); const requestRepository = new RequestRepository(cache); const searchHistory = new SearchHistory(); function searchRequestController(req, res) { - const user = req.headers.loggedinuser; - const { query, page, type } = req.query; + const user = req.headers.loggedinuser; + const { query, page, type } = req.query; - Promise.resolve() - .then(() => searchHistory.create(user, query)) - .then(() => requestRepository.search(query, page, type)) - .then((searchResult) => { - res.send(searchResult); - }) - .catch((error) => { - res.status(500).send({success: false, error: error.message }); - }) + Promise.resolve() + .then(() => searchHistory.create(user, query)) + .then(() => requestRepository.search(query, page, type)) + .then((searchResult) => { + res.send(searchResult); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } -module.exports = searchRequestController; \ No newline at end of file +module.exports = searchRequestController; diff --git a/seasoned_api/src/webserver/controllers/plex/submitRequest.js b/seasoned_api/src/webserver/controllers/plex/submitRequest.js index 08f4ca3..6afb085 100644 --- a/seasoned_api/src/webserver/controllers/plex/submitRequest.js +++ b/seasoned_api/src/webserver/controllers/plex/submitRequest.js @@ -1,4 +1,5 @@ const RequestRepository = require('src/plex/requestRepository.js'); + const requestRepository = new RequestRepository(); /** @@ -9,20 +10,20 @@ const requestRepository = new RequestRepository(); */ function submitRequestController(req, res) { - // This is the id that is the param of the url - const id = req.params.mediaId; - const type = req.query.type; - const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; - const user_agent = req.headers['user-agent'] - const user = req.headers.loggedinuser; + // This is the id that is the param of the url + const id = req.params.mediaId; + const type = req.query.type; + const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; + const user_agent = req.headers['user-agent']; + const user = req.headers.loggedinuser; - requestRepository.sendRequest(id, type, ip, user_agent, user) - .then(() => { - res.send({ success: true, message: 'Media item sucessfully requested!' }); - }) - .catch((error) => { - res.status(500).send({ success: false, error: error.message }); - }); + requestRepository.sendRequest(id, type, ip, user_agent, user) + .then(() => { + res.send({ success: true, message: 'Media item sucessfully requested!' }); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } -module.exports = submitRequestController; \ No newline at end of file +module.exports = submitRequestController; diff --git a/seasoned_api/src/webserver/controllers/plex/updateRequested.js b/seasoned_api/src/webserver/controllers/plex/updateRequested.js index 57b2638..6057bf4 100644 --- a/seasoned_api/src/webserver/controllers/plex/updateRequested.js +++ b/seasoned_api/src/webserver/controllers/plex/updateRequested.js @@ -1,4 +1,5 @@ const RequestRepository = require('src/plex/requestRepository'); + const requestRepository = new RequestRepository(); /** @@ -8,17 +9,17 @@ const requestRepository = new RequestRepository(); * @returns {Callback} */ function updateRequested(req, res) { - const id = req.params.requestId; - const type = req.body.type; - const status = req.body.status; + const id = req.params.requestId; + const type = req.body.type; + const status = req.body.status; - requestRepository.updateRequestedById(id, type, status) - .then(() => { - res.send({ success: true }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + requestRepository.updateRequestedById(id, type, status) + .then(() => { + res.send({ success: true }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = updateRequested; diff --git a/seasoned_api/src/webserver/controllers/seasoned/readStrays.js b/seasoned_api/src/webserver/controllers/seasoned/readStrays.js index 5e5193b..1f87b31 100644 --- a/seasoned_api/src/webserver/controllers/seasoned/readStrays.js +++ b/seasoned_api/src/webserver/controllers/seasoned/readStrays.js @@ -1,16 +1,17 @@ const StrayRepository = require('src/seasoned/strayRepository'); + const strayRepository = new StrayRepository(); function readStraysController(req, res) { - const { verified, page } = req.query; - strayRepository.readAll(verified, page) - .then((strays) => { - res.send(strays); - }) - .catch((error) => { - res.status(500).send({success: false, error: error.message }); - }); + const { verified, page } = req.query; + strayRepository.readAll(verified, page) + .then((strays) => { + res.send(strays); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } -module.exports = readStraysController; \ No newline at end of file +module.exports = readStraysController; diff --git a/seasoned_api/src/webserver/controllers/seasoned/strayById.js b/seasoned_api/src/webserver/controllers/seasoned/strayById.js index e86e2ed..9cdd57c 100644 --- a/seasoned_api/src/webserver/controllers/seasoned/strayById.js +++ b/seasoned_api/src/webserver/controllers/seasoned/strayById.js @@ -1,17 +1,17 @@ -const configuration = require('src/config/configuration').getInstance(); const StrayRepository = require('src/seasoned/strayRepository'); + const strayRepository = new StrayRepository(); function strayByIdController(req, res) { - const id = req.params.strayId; + const id = req.params.strayId; - strayRepository.read(id) - .then((stray) => { - res.send(stray); - }) - .catch((error) => { - res.status(500).send({ success: false, error: error.message }); - }); + strayRepository.read(id) + .then((stray) => { + res.send(stray); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } module.exports = strayByIdController; diff --git a/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js b/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js index 3f5bf92..79c807c 100644 --- a/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js +++ b/seasoned_api/src/webserver/controllers/seasoned/verifyStray.js @@ -3,15 +3,15 @@ const StrayRepository = require('src/seasoned/strayRepository'); const strayRepository = new StrayRepository(); function verifyStrayController(req, res) { - const id = req.params.strayId; + const id = req.params.strayId; - strayRepository.verifyStray(id) - .then(() => { - res.send({ success: true, message: 'Episode verified' }); - }) - .catch((error) => { - res.status(500).send({ success: false, error: error.message }); - }); + strayRepository.verifyStray(id) + .then(() => { + res.send({ success: true, message: 'Episode verified' }); + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } module.exports = verifyStrayController; diff --git a/seasoned_api/src/webserver/controllers/tmdb/listSearch.js b/seasoned_api/src/webserver/controllers/tmdb/listSearch.js index 276fd12..103f94c 100644 --- a/seasoned_api/src/webserver/controllers/tmdb/listSearch.js +++ b/seasoned_api/src/webserver/controllers/tmdb/listSearch.js @@ -1,10 +1,10 @@ const configuration = require('src/config/configuration').getInstance(); const Cache = require('src/tmdb/cache'); const TMDB = require('src/tmdb/tmdb'); + const cache = new Cache(); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); - /** * Controller: Retrieve nowplaying movies / now airing shows * @param {Request} req http request variable @@ -12,15 +12,14 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); * @returns {Callback} */ function listSearchController(req, res) { - const listname = req.params.listname; - const { type, id, page } = req.query; - console.log(listname, type, id, page) - tmdb.listSearch(listname, type, id, page) - .then((results) => { - res.send(results); - }).catch((error) => { - res.status(404).send({ success: false, error: error.message }); - }); + const listname = req.params.listname; + const { type, id, page } = req.query; + tmdb.listSearch(listname, type, id, page) + .then((results) => { + res.send(results); + }).catch((error) => { + res.status(404).send({ success: false, error: error.message }); + }); } module.exports = listSearchController; diff --git a/seasoned_api/src/webserver/controllers/tmdb/readMedia.js b/seasoned_api/src/webserver/controllers/tmdb/readMedia.js index d9d86a4..d2c7294 100644 --- a/seasoned_api/src/webserver/controllers/tmdb/readMedia.js +++ b/seasoned_api/src/webserver/controllers/tmdb/readMedia.js @@ -1,6 +1,7 @@ const configuration = require('src/config/configuration').getInstance(); const Cache = require('src/tmdb/cache'); const TMDB = require('src/tmdb/tmdb'); + const cache = new Cache(); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); @@ -11,14 +12,14 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); * @returns {Callback} */ function readMediaController(req, res) { - const mediaId = req.params.mediaId; - const { type } = req.query; - tmdb.lookup(mediaId, type) - .then((movies) => { - res.send(movies); - }).catch((error) => { - res.status(404).send({ success: false, error: error.message }); - }); + const mediaId = req.params.mediaId; + const { type } = req.query; + tmdb.lookup(mediaId, type) + .then((movies) => { + res.send(movies); + }).catch((error) => { + res.status(404).send({ success: false, error: error.message }); + }); } module.exports = readMediaController; diff --git a/seasoned_api/src/webserver/controllers/tmdb/searchMedia.js b/seasoned_api/src/webserver/controllers/tmdb/searchMedia.js index 4443bde..5d5910e 100644 --- a/seasoned_api/src/webserver/controllers/tmdb/searchMedia.js +++ b/seasoned_api/src/webserver/controllers/tmdb/searchMedia.js @@ -1,6 +1,7 @@ const configuration = require('src/config/configuration').getInstance(); const Cache = require('src/tmdb/cache'); const TMDB = require('src/tmdb/tmdb'); + const cache = new Cache(); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); @@ -11,20 +12,20 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); * @returns {Callback} */ function searchMediaController(req, res) { - const { query, page, type } = req.query; + const { query, page, type } = req.query; - Promise.resolve() - .then(() => tmdb.search(query, page, type)) - .then((movies) => { - if (movies !== undefined || movies.length > 0) { - res.send(movies); - } else { - res.status(404).send({ success: false, error: 'Search query did not return any results.'}) - } - }) - .catch((error) => { - res.status(500).send({ success: false, error: error.message }); - }); + Promise.resolve() + .then(() => tmdb.search(query, page, type)) + .then((movies) => { + if (movies !== undefined || movies.length > 0) { + res.send(movies); + } else { + res.status(404).send({ success: false, error: 'Search query did not return any results.' }); + } + }) + .catch((error) => { + res.status(500).send({ success: false, error: error.message }); + }); } module.exports = searchMediaController; diff --git a/seasoned_api/src/webserver/controllers/user/history.js b/seasoned_api/src/webserver/controllers/user/history.js index e619d19..a396c1d 100644 --- a/seasoned_api/src/webserver/controllers/user/history.js +++ b/seasoned_api/src/webserver/controllers/user/history.js @@ -1,4 +1,5 @@ const SearchHistory = require('src/searchHistory/searchHistory'); + const searchHistory = new SearchHistory(); /** @@ -8,15 +9,15 @@ const searchHistory = new SearchHistory(); * @returns {Callback} */ function historyController(req, res) { - const user = req.loggedInUser; + const user = req.loggedInUser; - searchHistory.read(user) - .then((searchQueries) => { - res.send({ success: true, searchQueries }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + searchHistory.read(user) + .then((searchQueries) => { + res.send({ success: true, searchQueries }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = historyController; diff --git a/seasoned_api/src/webserver/controllers/user/login.js b/seasoned_api/src/webserver/controllers/user/login.js index 4fe7755..e839276 100644 --- a/seasoned_api/src/webserver/controllers/user/login.js +++ b/seasoned_api/src/webserver/controllers/user/login.js @@ -2,6 +2,7 @@ const User = require('src/user/user'); const Token = require('src/user/token'); const UserSecurity = require('src/user/userSecurity'); const configuration = require('src/config/configuration').getInstance(); + const secret = configuration.get('authentication', 'secret'); const userSecurity = new UserSecurity(); @@ -12,17 +13,17 @@ const userSecurity = new UserSecurity(); * @returns {Callback} */ function loginController(req, res) { - const user = new User(req.body.username); - const password = req.body.password; + const user = new User(req.body.username); + const password = req.body.password; - userSecurity.login(user, password) - .then(() => { - const token = new Token(user).toString(secret); - res.send({ success: true, token }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + userSecurity.login(user, password) + .then(() => { + const token = new Token(user).toString(secret); + res.send({ success: true, token }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = loginController; diff --git a/seasoned_api/src/webserver/controllers/user/register.js b/seasoned_api/src/webserver/controllers/user/register.js index b7e081a..6ca3663 100644 --- a/seasoned_api/src/webserver/controllers/user/register.js +++ b/seasoned_api/src/webserver/controllers/user/register.js @@ -1,5 +1,6 @@ const User = require('src/user/user'); const UserSecurity = require('src/user/userSecurity'); + const userSecurity = new UserSecurity(); /** @@ -9,16 +10,16 @@ const userSecurity = new UserSecurity(); * @returns {Callback} */ function registerController(req, res) { - const user = new User(req.body.username, req.body.email); - const password = req.body.password; + const user = new User(req.body.username, req.body.email); + const password = req.body.password; - userSecurity.createNewUser(user, password) - .then(() => { - res.send({ success: true, message: 'Welcome to Seasoned!' }); - }) - .catch((error) => { - res.status(401).send({ success: false, error: error.message }); - }); + userSecurity.createNewUser(user, password) + .then(() => { + res.send({ success: true, message: 'Welcome to Seasoned!' }); + }) + .catch((error) => { + res.status(401).send({ success: false, error: error.message }); + }); } module.exports = registerController;