From 12103f6a4f76137f069687b2bbbe273db22859d7 Mon Sep 17 00:00:00 2001 From: Lucas Teixeira Date: Thu, 19 Nov 2020 20:57:46 -0300 Subject: [PATCH] WJ-129 - Fix: Favorites feature; --- src/domains/Movie/api/Details/index.ts | 7 +++---- src/domains/Tv/api/Details/index.ts | 7 +++---- src/shared/helpers/Entity/getRandomBackdrop.ts | 11 +++++++++++ src/shared/helpers/Entity/index.ts | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 src/shared/helpers/Entity/getRandomBackdrop.ts diff --git a/src/domains/Movie/api/Details/index.ts b/src/domains/Movie/api/Details/index.ts index 36c26f5..d925a59 100644 --- a/src/domains/Movie/api/Details/index.ts +++ b/src/domains/Movie/api/Details/index.ts @@ -1,9 +1,10 @@ import tmdb from 'services/api/tmdb'; -import { arrayToString, randomInteger } from 'shared/helpers'; +import { arrayToString } from 'shared/helpers'; import { getBackdrop, getFeaturedImage, + getRandomBackdrop, getReleaseDate, getReleaseYear, getSubtitle, @@ -129,9 +130,7 @@ const parseResponse = (movie: RawResponse): Response => { )?.name, releaseDate: getReleaseDate(movie), - backdrop: - backdrops[randomInteger(0, backdrops.length - 1)]?.featuredImage || - getBackdrop(movie), + backdrop: getRandomBackdrop(backdrops) || getBackdrop(movie), featuredImage: getFeaturedImage(movie), releaseYear: getReleaseYear(movie), diff --git a/src/domains/Tv/api/Details/index.ts b/src/domains/Tv/api/Details/index.ts index 431b5c5..09f1d95 100644 --- a/src/domains/Tv/api/Details/index.ts +++ b/src/domains/Tv/api/Details/index.ts @@ -1,9 +1,10 @@ import tmdb from 'services/api/tmdb'; -import { arrayToString, randomInteger } from 'shared/helpers'; +import { arrayToString } from 'shared/helpers'; import { getBackdrop, getFeaturedImage, + getRandomBackdrop, getReleaseDate, getReleaseYear, getSubtitle, @@ -136,9 +137,7 @@ const parseResponse = (tv: RawResponse): Response => { creatorName: tv.created_by[0]?.name, releaseDate: getReleaseDate(tv), - backdrop: - backdrops[randomInteger(0, backdrops.length - 1)]?.featuredImage || - getBackdrop(tv), + backdrop: getRandomBackdrop(backdrops) || getBackdrop(tv), featuredImage: getFeaturedImage(tv), releaseYear: getReleaseYear(tv), diff --git a/src/shared/helpers/Entity/getRandomBackdrop.ts b/src/shared/helpers/Entity/getRandomBackdrop.ts new file mode 100644 index 0000000..1684ebc --- /dev/null +++ b/src/shared/helpers/Entity/getRandomBackdrop.ts @@ -0,0 +1,11 @@ +import { randomInteger } from 'shared/helpers'; + +const getRandomBackdrop = (backdrops: any): string | null => { + if (backdrops) { + return backdrops[randomInteger(0, backdrops?.length - 1)]?.featuredImage; + } + + return null; +}; + +export default getRandomBackdrop; diff --git a/src/shared/helpers/Entity/index.ts b/src/shared/helpers/Entity/index.ts index ef2fb89..72d6198 100644 --- a/src/shared/helpers/Entity/index.ts +++ b/src/shared/helpers/Entity/index.ts @@ -5,6 +5,7 @@ export { default as getFeaturedImage } from './getFeaturedImage'; export { default as getGender } from './getGender'; export { default as getOriginalDate } from './getOriginalDate'; export { default as getOriginalTitle } from './getOriginalTitle'; +export { default as getRandomBackdrop } from './getRandomBackdrop'; export { default as getReleaseDate } from './getReleaseDate'; export { default as getReleaseYear } from './getReleaseYear'; export { default as getSubtitle } from './getSubtitle';