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

Read and pass adult search query param consistently for movie, show & person info

Browse Source
This commit is contained in:
Kevin
2022-03-06 11:57:45 +01:00
parent 61b59ae3ea
commit 5036f4ca36
4 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
seasoned_api/src/tmdb/tmdb.js
View File

@@ -176,13 +176,13 @@ class TMDB {
* @param {Number} page representing pagination of results * @param {Number} page representing pagination of results
* @returns {Promise} dict with query results, current page and total_pages * @returns {Promise} dict with query results, current page and total_pages
*/ */
movieSearch(query, page=1, adult=true) { movieSearch(search_query, page = 1, include_adult = true) {
const tmdbquery = { query: query, page: page, adult: adult }; const tmdbquery = { query: search_query, page, include_adult };
const cacheKey = `tmdb/${this.cacheTags.movieSearch}:${page}:${query}:${adult}`; const cacheKey = `tmdb/${this.cacheTags.movieSearch}:${page}:${search_query}:${include_adult}`;
return this.getFromCacheOrFetchFromTmdb(cacheKey, 'searchMovie', query) return this.getFromCacheOrFetchFromTmdb(cacheKey, "searchMovie", tmdbquery)
.then(response => this.cache.set(cacheKey, response, this.defaultTTL)) .then(response => this.cache.set(cacheKey, response, this.defaultTTL))
.then(response => this.mapResults(response, 'movie')) .then(response => this.mapResults(response, "movie"));
} }
/** /**
@@ -191,13 +191,13 @@ class TMDB {
* @param {Number} page representing pagination of results * @param {Number} page representing pagination of results
* @returns {Promise} dict with query results, current page and total_pages * @returns {Promise} dict with query results, current page and total_pages
*/ */
showSearch(query, page=1) { showSearch(search_query, page = 1, include_adult = true) {
const tmdbquery = { query: query, page: page }; const tmdbquery = { query: search_query, page, include_adult };
const cacheKey = `tmdb/${this.cacheTags.showSearch}:${page}:${query}`; const cacheKey = `tmdb/${this.cacheTags.showSearch}:${page}:${search_query}:${include_adult}`;
return this.getFromCacheOrFetchFromTmdb(cacheKey, 'searchTv', query) return this.getFromCacheOrFetchFromTmdb(cacheKey, "searchTv", tmdbquery)
.then(response => this.cache.set(cacheKey, response, this.defaultTTL)) .then(response => this.cache.set(cacheKey, response, this.defaultTTL))
.then(response => this.mapResults(response, 'show')) .then(response => this.mapResults(response, "show"));
} }
/** /**
@@ -206,14 +206,13 @@ class TMDB {
* @param {Number} page representing pagination of results * @param {Number} page representing pagination of results
* @returns {Promise} dict with query results, current page and total_pages * @returns {Promise} dict with query results, current page and total_pages
*/ */
personSearch(query, page=1) { personSearch(search_query, page = 1, include_adult = true) {
const tmdbquery = { query: search_query, page, include_adult };
const cacheKey = `tmdb/${this.cacheTags.personSearch}:${page}:${search_query}:${include_adult}`;
const tmdbquery = { query: query, page: page, include_adult: true }; return this.getFromCacheOrFetchFromTmdb(cacheKey, "searchPerson", tmdbquery)
const cacheKey = `tmdb/${this.cacheTags.personSearch}:${page}:${query}:${include_adult}`;
return this.getFromCacheOrFetchFromTmdb(cacheKey, 'searchPerson', query)
.then(response => this.cache.set(cacheKey, response, this.defaultTTL)) .then(response => this.cache.set(cacheKey, response, this.defaultTTL))
.then(response => this.mapResults(response, 'person')) .then(response => this.mapResults(response, "person"));
} }
movieList(listname, page = 1) { movieList(listname, page = 1) {

9
seasoned_api/src/webserver/controllers/search/movieSearch.js
View File

@@ -11,15 +11,16 @@ const searchHistory = new SearchHistory();
* @returns {Callback} * @returns {Callback}
*/ */
function movieSearchController(req, res) { function movieSearchController(req, res) {
const { query, page } = req.query; const { query, page, adult } = req.query;
const username = req.loggedInUser ? req.loggedInUser.username : null; const username = req.loggedInUser ? req.loggedInUser.username : null;
const includeAdult = adult == "true" ? true : false;
if (username) { if (username) {
return searchHistory.create(username, query); searchHistory.create(username, query);
} }
tmdb return tmdb
.movieSearch(query, page) .movieSearch(query, page, includeAdult)
.then(movieSearchResults => res.send(movieSearchResults)) .then(movieSearchResults => res.send(movieSearchResults))
.catch(error => { .catch(error => {
const { status, message } = error; const { status, message } = error;

13
seasoned_api/src/webserver/controllers/search/personSearch.js
View File

@@ -11,18 +11,17 @@ const searchHistory = new SearchHistory();
* @returns {Callback} * @returns {Callback}
*/ */
function personSearchController(req, res) { function personSearchController(req, res) {
const { query, page } = req.query; const { query, page, adult } = req.query;
const username = req.loggedInUser ? req.loggedInUser.username : null; const username = req.loggedInUser ? req.loggedInUser.username : null;
const includeAdult = adult == "true" ? true : false;
if (username) { if (username) {
return searchHistory.create(username, query); searchHistory.create(username, query);
} }
tmdb return tmdb
.personSearch(query, page) .personSearch(query, page, includeAdult)
.then(person => { .then(persons => res.send(persons))
res.send(person);
})
.catch(error => { .catch(error => {
const { status, message } = error; const { status, message } = error;

17
seasoned_api/src/webserver/controllers/search/showSearch.js
View File

@@ -11,17 +11,16 @@ const searchHistory = new SearchHistory();
* @returns {Callback} * @returns {Callback}
*/ */
function showSearchController(req, res) { function showSearchController(req, res) {
const { query, page } = req.query; const { query, page, adult } = req.query;
const username = req.loggedInUser ? req.loggedInUser.username : null; const username = req.loggedInUser ? req.loggedInUser.username : null;
const includeAdult = adult == "true" ? true : false;
Promise.resolve() if (username) {
.then(() => { searchHistory.create(username, query);
if (username) { }
return searchHistory.create(username, query);
} return tmdb
return null; .showSearch(query, page, includeAdult)
})
.then(() => tmdb.showSearch(query, page))
.then(shows => { .then(shows => {
res.send(shows); res.send(shows);
}) })