fix: correctly deal with tmdb id duplicates between movies/series

fixes #526

server/routes/discover.ts

@@ -26,7 +26,9 @@ discoverRoutes.get('/movies', async (req, res) => {
     results: data.results.map((result) =>
       mapMovieResult(
         result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
       )
     ),
   });

server/routes/movie.ts

@@ -5,6 +5,7 @@ import { mapMovieResult } from '../models/Search';
 import Media from '../entity/Media';
 import RottenTomatoes from '../api/rottentomatoes';
 import logger from '../logger';
+import { MediaType } from '../constants/media';
 
 const movieRoutes = Router();
 
@@ -17,7 +18,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
       language: req.query.language as string,
     });
 
-    const media = await Media.getMedia(tmdbMovie.id);
+    const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
 
     return res.status(200).json(mapMovieDetails(tmdbMovie, media));
   } catch (e) {
@@ -49,7 +50,9 @@ movieRoutes.get('/:id/recommendations', async (req, res) => {
     results: results.results.map((result) =>
       mapMovieResult(
         result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
       )
     ),
   });
@@ -75,7 +78,9 @@ movieRoutes.get('/:id/similar', async (req, res) => {
     results: results.results.map((result) =>
       mapMovieResult(
         result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
+        )
       )
     ),
   });

server/routes/person.ts

@@ -45,13 +45,19 @@ personRoutes.get('/:id/combined_credits', async (req, res) => {
     cast: combinedCredits.cast.map((result) =>
       mapCastCredits(
         result,
-        castMedia.find((med) => med.tmdbId === result.id)
+        castMedia.find(
+          (med) =>
+            med.tmdbId === result.id && med.mediaType === result.media_type
+        )
       )
     ),
     crew: combinedCredits.crew.map((result) =>
       mapCrewCredits(
         result,
-        crewMedia.find((med) => med.tmdbId === result.id)
+        crewMedia.find(
+          (med) =>
+            med.tmdbId === result.id && med.mediaType === result.media_type
+        )
       )
     ),
     id: combinedCredits.id,

server/routes/request.ts

@@ -102,7 +102,7 @@ requestRoutes.post(
           : await tmdb.getTvShow({ tvId: req.body.mediaId });
 
       let media = await mediaRepository.findOne({
-        where: { tmdbId: req.body.mediaId },
+        where: { tmdbId: req.body.mediaId, mediaType: req.body.mediaType },
         relations: ['requests'],
       });
 

server/routes/tv.ts

@@ -5,6 +5,7 @@ import { mapTvResult } from '../models/Search';
 import Media from '../entity/Media';
 import RottenTomatoes from '../api/rottentomatoes';
 import logger from '../logger';
+import { MediaType } from '../constants/media';
 
 const tvRoutes = Router();
 
@@ -16,7 +17,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
       language: req.query.language as string,
     });
 
-    const media = await Media.getMedia(tv.id);
+    const media = await Media.getMedia(tv.id, MediaType.TV);
 
     return res.status(200).json(mapTvDetails(tv, media));
   } catch (e) {
@@ -60,7 +61,9 @@ tvRoutes.get('/:id/recommendations', async (req, res) => {
     results: results.results.map((result) =>
       mapTvResult(
         result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.TV
+        )
       )
     ),
   });
@@ -86,7 +89,9 @@ tvRoutes.get('/:id/similar', async (req, res) => {
     results: results.results.map((result) =>
       mapTvResult(
         result,
-        media.find((req) => req.tmdbId === result.id)
+        media.find(
+          (req) => req.tmdbId === result.id && req.mediaType === MediaType.TV
+        )
       )
     ),
   });