Linted all controllers

This commit is contained in:
2018-02-07 13:51:57 +01:00
parent 81aeed86ef
commit 34982c14fe
20 changed files with 195 additions and 186 deletions

View File

@@ -3,13 +3,13 @@ const GitRepository = require('src/git/gitRepository');
const gitRepository = new GitRepository(); const gitRepository = new GitRepository();
function dumpHookController(req, res) { function dumpHookController(req, res) {
gitRepository.dumpHook(req.body) gitRepository.dumpHook(req.body)
.then(() => { .then(() => {
res.status(200); res.status(200);
}) })
.catch((error) => { .catch((error) => {
res.status(500); res.status(500);
}); });
} }
module.exports = dumpHookController; module.exports = dumpHookController;

View File

@@ -9,15 +9,15 @@
const PirateRepository = require('src/pirate/pirateRepository'); const PirateRepository = require('src/pirate/pirateRepository');
function updateRequested(req, res) { function updateRequested(req, res) {
const magnet = req.body.magnet; const magnet = req.body.magnet;
PirateRepository.AddMagnet(magnet) PirateRepository.AddMagnet(magnet)
.then((result) => { .then((result) => {
res.send(result); res.send(result);
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = updateRequested; module.exports = updateRequested;

View File

@@ -15,15 +15,15 @@ const PirateRepository = require('src/pirate/pirateRepository');
* @returns {Callback} * @returns {Callback}
*/ */
function updateRequested(req, res) { function updateRequested(req, res) {
const { query, page, type } = req.query; const { query, page, type } = req.query;
PirateRepository.SearchPiratebay(query, page, type) PirateRepository.SearchPiratebay(query, page, type)
.then((result) => { .then((result) => {
res.send({ success: true, torrents: result }); res.send({ success: true, torrents: result });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = updateRequested; module.exports = updateRequested;

View File

@@ -9,15 +9,15 @@ const requestRepository = new RequestRepository();
* @returns {Callback} * @returns {Callback}
*/ */
function historyController(req, res) { function historyController(req, res) {
const user = req.loggedInUser; // const user = req.loggedInUser;
requestRepository.fetchRequested() requestRepository.fetchRequested()
.then((requestedItems) => { .then((requestedItems) => {
res.send({ success: true, results: requestedItems, total_results: requestedItems.length }); res.send({ success: true, results: requestedItems, total_results: requestedItems.length });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = historyController; module.exports = historyController;

View File

@@ -2,13 +2,11 @@
* @Author: KevinMidboe * @Author: KevinMidboe
* @Date: 2017-05-03 23:26:46 * @Date: 2017-05-03 23:26:46
* @Last Modified by: KevinMidboe * @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) { function hookDumpController(req, res) {
console.log(req); console.log(req);
} }
module.exports = hookDumpController; module.exports = hookDumpController;

View File

@@ -1,14 +1,15 @@
const PlexRepository = require('src/plex/plexRepository'); const PlexRepository = require('src/plex/plexRepository');
const plexRepository = new PlexRepository(); const plexRepository = new PlexRepository();
function playingController(req, res) { function playingController(req, res) {
plexRepository.nowPlaying() plexRepository.nowPlaying()
.then((movies) => { .then((movies) => {
res.send(movies); res.send(movies);
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}) });
} }
module.exports = playingController; module.exports = playingController;

View File

@@ -1,4 +1,5 @@
const RequestRepository = require('src/plex/requestRepository'); const RequestRepository = require('src/plex/requestRepository');
const requestRepository = new RequestRepository(); const requestRepository = new RequestRepository();
/** /**
@@ -8,14 +9,14 @@ const requestRepository = new RequestRepository();
* @returns {Callback} * @returns {Callback}
*/ */
function readRequestController(req, res) { function readRequestController(req, res) {
const mediaId = req.params.mediaId; const mediaId = req.params.mediaId;
const { type } = req.query; const { type } = req.query;
requestRepository.lookup(mediaId, type) requestRepository.lookup(mediaId, type)
.then((movies) => { .then((movies) => {
res.send(movies); res.send(movies);
}).catch((error) => { }).catch((error) => {
res.status(404).send({ success: false, error: error.message }); res.status(404).send({ success: false, error: error.message });
}); });
} }
module.exports = readRequestController; module.exports = readRequestController;

View File

@@ -1,27 +1,28 @@
const PlexRepository = require('src/plex/plexRepository'); const PlexRepository = require('src/plex/plexRepository');
const plexRepository = new 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 * in plex by query and page
* @param {Request} req http request variable * @param {Request} req http request variable
* @param {Response} res * @param {Response} res
* @returns {Callback} * @returns {Callback}
*/ */
function searchMediaController(req, res) { function searchMediaController(req, res) {
const { query, page } = req.query; const { query } = req.query;
plexRepository.searchMedia(query) plexRepository.search(query)
.then((media) => { .then((media) => {
if (media !== undefined || media.length > 0) { if (media !== undefined || media.length > 0) {
res.send(media); res.send(media);
} else { } else {
res.status(404).send({ success: false, error: 'Search query did not return any results.'}) res.status(404).send({ success: false, error: 'Search query did not return any results.' });
} }
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}) });
} }
module.exports = searchMediaController; module.exports = searchMediaController;

View File

@@ -1,24 +1,25 @@
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const Cache = require('src/tmdb/cache'); const Cache = require('src/tmdb/cache');
const RequestRepository = require('src/plex/requestRepository.js'); const RequestRepository = require('src/plex/requestRepository.js');
const cache = new Cache(); const cache = new Cache();
const requestRepository = new RequestRepository(cache); const requestRepository = new RequestRepository(cache);
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
function searchRequestController(req, res) { function searchRequestController(req, res) {
const user = req.headers.loggedinuser; const user = req.headers.loggedinuser;
const { query, page, type } = req.query; const { query, page, type } = req.query;
Promise.resolve() Promise.resolve()
.then(() => searchHistory.create(user, query)) .then(() => searchHistory.create(user, query))
.then(() => requestRepository.search(query, page, type)) .then(() => requestRepository.search(query, page, type))
.then((searchResult) => { .then((searchResult) => {
res.send(searchResult); res.send(searchResult);
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}) });
} }
module.exports = searchRequestController; module.exports = searchRequestController;

View File

@@ -1,4 +1,5 @@
const RequestRepository = require('src/plex/requestRepository.js'); const RequestRepository = require('src/plex/requestRepository.js');
const requestRepository = new RequestRepository(); const requestRepository = new RequestRepository();
/** /**
@@ -9,20 +10,20 @@ const requestRepository = new RequestRepository();
*/ */
function submitRequestController(req, res) { function submitRequestController(req, res) {
// This is the id that is the param of the url // This is the id that is the param of the url
const id = req.params.mediaId; const id = req.params.mediaId;
const type = req.query.type; const type = req.query.type;
const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
const user_agent = req.headers['user-agent'] const user_agent = req.headers['user-agent'];
const user = req.headers.loggedinuser; const user = req.headers.loggedinuser;
requestRepository.sendRequest(id, type, ip, user_agent, user) requestRepository.sendRequest(id, type, ip, user_agent, user)
.then(() => { .then(() => {
res.send({ success: true, message: 'Media item sucessfully requested!' }); res.send({ success: true, message: 'Media item sucessfully requested!' });
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({ success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}); });
} }
module.exports = submitRequestController; module.exports = submitRequestController;

View File

@@ -1,4 +1,5 @@
const RequestRepository = require('src/plex/requestRepository'); const RequestRepository = require('src/plex/requestRepository');
const requestRepository = new RequestRepository(); const requestRepository = new RequestRepository();
/** /**
@@ -8,17 +9,17 @@ const requestRepository = new RequestRepository();
* @returns {Callback} * @returns {Callback}
*/ */
function updateRequested(req, res) { function updateRequested(req, res) {
const id = req.params.requestId; const id = req.params.requestId;
const type = req.body.type; const type = req.body.type;
const status = req.body.status; const status = req.body.status;
requestRepository.updateRequestedById(id, type, status) requestRepository.updateRequestedById(id, type, status)
.then(() => { .then(() => {
res.send({ success: true }); res.send({ success: true });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = updateRequested; module.exports = updateRequested;

View File

@@ -1,16 +1,17 @@
const StrayRepository = require('src/seasoned/strayRepository'); const StrayRepository = require('src/seasoned/strayRepository');
const strayRepository = new StrayRepository(); const strayRepository = new StrayRepository();
function readStraysController(req, res) { function readStraysController(req, res) {
const { verified, page } = req.query; const { verified, page } = req.query;
strayRepository.readAll(verified, page) strayRepository.readAll(verified, page)
.then((strays) => { .then((strays) => {
res.send(strays); res.send(strays);
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}); });
} }
module.exports = readStraysController; module.exports = readStraysController;

View File

@@ -1,17 +1,17 @@
const configuration = require('src/config/configuration').getInstance();
const StrayRepository = require('src/seasoned/strayRepository'); const StrayRepository = require('src/seasoned/strayRepository');
const strayRepository = new StrayRepository(); const strayRepository = new StrayRepository();
function strayByIdController(req, res) { function strayByIdController(req, res) {
const id = req.params.strayId; const id = req.params.strayId;
strayRepository.read(id) strayRepository.read(id)
.then((stray) => { .then((stray) => {
res.send(stray); res.send(stray);
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({ success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}); });
} }
module.exports = strayByIdController; module.exports = strayByIdController;

View File

@@ -3,15 +3,15 @@ const StrayRepository = require('src/seasoned/strayRepository');
const strayRepository = new StrayRepository(); const strayRepository = new StrayRepository();
function verifyStrayController(req, res) { function verifyStrayController(req, res) {
const id = req.params.strayId; const id = req.params.strayId;
strayRepository.verifyStray(id) strayRepository.verifyStray(id)
.then(() => { .then(() => {
res.send({ success: true, message: 'Episode verified' }); res.send({ success: true, message: 'Episode verified' });
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({ success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}); });
} }
module.exports = verifyStrayController; module.exports = verifyStrayController;

View File

@@ -1,10 +1,10 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache'); const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const cache = new Cache();
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
/** /**
* Controller: Retrieve nowplaying movies / now airing shows * Controller: Retrieve nowplaying movies / now airing shows
* @param {Request} req http request variable * @param {Request} req http request variable
@@ -12,15 +12,14 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
* @returns {Callback} * @returns {Callback}
*/ */
function listSearchController(req, res) { function listSearchController(req, res) {
const listname = req.params.listname; const listname = req.params.listname;
const { type, id, page } = req.query; const { type, id, page } = req.query;
console.log(listname, type, id, page) tmdb.listSearch(listname, type, id, page)
tmdb.listSearch(listname, type, id, page) .then((results) => {
.then((results) => { res.send(results);
res.send(results); }).catch((error) => {
}).catch((error) => { res.status(404).send({ success: false, error: error.message });
res.status(404).send({ success: false, error: error.message }); });
});
} }
module.exports = listSearchController; module.exports = listSearchController;

View File

@@ -1,6 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache'); const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const cache = new Cache();
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
@@ -11,14 +12,14 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
* @returns {Callback} * @returns {Callback}
*/ */
function readMediaController(req, res) { function readMediaController(req, res) {
const mediaId = req.params.mediaId; const mediaId = req.params.mediaId;
const { type } = req.query; const { type } = req.query;
tmdb.lookup(mediaId, type) tmdb.lookup(mediaId, type)
.then((movies) => { .then((movies) => {
res.send(movies); res.send(movies);
}).catch((error) => { }).catch((error) => {
res.status(404).send({ success: false, error: error.message }); res.status(404).send({ success: false, error: error.message });
}); });
} }
module.exports = readMediaController; module.exports = readMediaController;

View File

@@ -1,6 +1,7 @@
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const Cache = require('src/tmdb/cache'); const Cache = require('src/tmdb/cache');
const TMDB = require('src/tmdb/tmdb'); const TMDB = require('src/tmdb/tmdb');
const cache = new Cache(); const cache = new Cache();
const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey')); const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
@@ -11,20 +12,20 @@ const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
* @returns {Callback} * @returns {Callback}
*/ */
function searchMediaController(req, res) { function searchMediaController(req, res) {
const { query, page, type } = req.query; const { query, page, type } = req.query;
Promise.resolve() Promise.resolve()
.then(() => tmdb.search(query, page, type)) .then(() => tmdb.search(query, page, type))
.then((movies) => { .then((movies) => {
if (movies !== undefined || movies.length > 0) { if (movies !== undefined || movies.length > 0) {
res.send(movies); res.send(movies);
} else { } else {
res.status(404).send({ success: false, error: 'Search query did not return any results.'}) res.status(404).send({ success: false, error: 'Search query did not return any results.' });
} }
}) })
.catch((error) => { .catch((error) => {
res.status(500).send({ success: false, error: error.message }); res.status(500).send({ success: false, error: error.message });
}); });
} }
module.exports = searchMediaController; module.exports = searchMediaController;

View File

@@ -1,4 +1,5 @@
const SearchHistory = require('src/searchHistory/searchHistory'); const SearchHistory = require('src/searchHistory/searchHistory');
const searchHistory = new SearchHistory(); const searchHistory = new SearchHistory();
/** /**
@@ -8,15 +9,15 @@ const searchHistory = new SearchHistory();
* @returns {Callback} * @returns {Callback}
*/ */
function historyController(req, res) { function historyController(req, res) {
const user = req.loggedInUser; const user = req.loggedInUser;
searchHistory.read(user) searchHistory.read(user)
.then((searchQueries) => { .then((searchQueries) => {
res.send({ success: true, searchQueries }); res.send({ success: true, searchQueries });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = historyController; module.exports = historyController;

View File

@@ -2,6 +2,7 @@ const User = require('src/user/user');
const Token = require('src/user/token'); const Token = require('src/user/token');
const UserSecurity = require('src/user/userSecurity'); const UserSecurity = require('src/user/userSecurity');
const configuration = require('src/config/configuration').getInstance(); const configuration = require('src/config/configuration').getInstance();
const secret = configuration.get('authentication', 'secret'); const secret = configuration.get('authentication', 'secret');
const userSecurity = new UserSecurity(); const userSecurity = new UserSecurity();
@@ -12,17 +13,17 @@ const userSecurity = new UserSecurity();
* @returns {Callback} * @returns {Callback}
*/ */
function loginController(req, res) { function loginController(req, res) {
const user = new User(req.body.username); const user = new User(req.body.username);
const password = req.body.password; const password = req.body.password;
userSecurity.login(user, password) userSecurity.login(user, password)
.then(() => { .then(() => {
const token = new Token(user).toString(secret); const token = new Token(user).toString(secret);
res.send({ success: true, token }); res.send({ success: true, token });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = loginController; module.exports = loginController;

View File

@@ -1,5 +1,6 @@
const User = require('src/user/user'); const User = require('src/user/user');
const UserSecurity = require('src/user/userSecurity'); const UserSecurity = require('src/user/userSecurity');
const userSecurity = new UserSecurity(); const userSecurity = new UserSecurity();
/** /**
@@ -9,16 +10,16 @@ const userSecurity = new UserSecurity();
* @returns {Callback} * @returns {Callback}
*/ */
function registerController(req, res) { function registerController(req, res) {
const user = new User(req.body.username, req.body.email); const user = new User(req.body.username, req.body.email);
const password = req.body.password; const password = req.body.password;
userSecurity.createNewUser(user, password) userSecurity.createNewUser(user, password)
.then(() => { .then(() => {
res.send({ success: true, message: 'Welcome to Seasoned!' }); res.send({ success: true, message: 'Welcome to Seasoned!' });
}) })
.catch((error) => { .catch((error) => {
res.status(401).send({ success: false, error: error.message }); res.status(401).send({ success: false, error: error.message });
}); });
} }
module.exports = registerController; module.exports = registerController;