Merge pull request #130 from 90lucasgabriel/feature/WJ-129

WJ-129 - Fix Favorites
90lucasgabriel · Nov 20, 2020 · bab0e08 · bab0e08
2 parents 38b6508 + 12103f6
commit bab0e08
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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';