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

Removed filtering of items when searching tmdb. Also added total_results object to all return statements.

Browse Source
This commit is contained in:
Kevin
2018-02-05 22:46:10 +01:00
parent 6f626d410d
commit d8b2cef18f
1 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,29 +43,11 @@ class TMDB {
.catch(() => this.tmdb(methodTypes[type], query)) .catch(() => this.tmdb(methodTypes[type], query))
.catch(() => { throw new Error('Could not search for movies/shows at tmdb.'); }) .catch(() => { throw new Error('Could not search for movies/shows at tmdb.'); })
.then((response) => this.cache.set(cacheKey, response)) .then((response) => this.cache.set(cacheKey, response))
.then((response) => { .then((response) => this.mapResults(response))
try { .catch((error) => { throw new Error(error); })
let filteredTmdbItems = response.results.filter(function(tmdbResultItem) { .then(([mappedResults, pagenumber, totalpages, total_results]) => {
return ((tmdbResultItem.vote_count >= 10 || tmdbResultItem.popularity > 2) && (tmdbResultItem.release_date !== undefined || tmdbResultItem.first_air_date !== undefined)) return {'results': mappedResults, 'page': pagenumber, 'total_results': total_results, 'total_pages': totalpages}
}) })
let seasonedItems = filteredTmdbItems.map((tmdbItem) => {
if (type === 'movie')
return convertTmdbToSeasoned(tmdbItem, 'movie');
else if (type === 'show')
return convertTmdbToSeasoned(tmdbItem, 'show');
else
return convertTmdbToSeasoned(tmdbItem);
});
// TODO add page number if results are larger than 20
return { 'results': seasonedItems, 'number_of_items_on_page': seasonedItems.length,
'page': 1, 'total_pages': 1 };
} catch (parseError) {
throw new Error('Could not parse result.');
}
});
} }
@@ -140,7 +122,7 @@ class TMDB {
const mappedResults = response.results.map((result) => { const mappedResults = response.results.map((result) => {
return convertTmdbToSeasoned(result, type) return convertTmdbToSeasoned(result, type)
}) })
return [mappedResults, response.page, response.total_pages] return [mappedResults, response.page, response.total_pages, response.total_results]
}) })
.catch((error) => { throw new Error(error)}) .catch((error) => { throw new Error(error)})
@@ -164,8 +146,8 @@ class TMDB {
.then((response) => this.cache.set(cacheKey, response)) .then((response) => this.cache.set(cacheKey, response))
.then((response) => this.mapResults(response, media_type)) .then((response) => this.mapResults(response, media_type))
.catch((error) => { throw new Error(error); }) .catch((error) => { throw new Error(error); })
.then(([mappedResults, pagenumber, totalpages]) => { .then(([mappedResults, pagenumber, totalpages, total_results]) => {
return {'results': mappedResults, 'page': pagenumber, 'total_pages': totalpages} return {'results': mappedResults, 'page': pagenumber, 'total_pages': totalpages, 'total_results': total_results}
}) })
} }