feat(api): decouple media requests from media info

server/models/Movie.ts

@@ -10,6 +10,7 @@ import {
   ExternalIds,
   mapExternalIds,
 } from './common';
+import Media from '../entity/Media';
 
 export interface MovieDetails {
   id: number;
@@ -46,13 +47,13 @@ export interface MovieDetails {
     cast: Cast[];
     crew: Crew[];
   };
-  request?: MediaRequest;
+  mediaInfo?: Media;
   externalIds: ExternalIds;
 }
 
 export const mapMovieDetails = (
   movie: TmdbMovieDetails,
-  request?: MediaRequest
+  media?: Media
 ): MovieDetails => ({
   id: movie.id,
   adult: movie.adult,
@@ -88,5 +89,5 @@ export const mapMovieDetails = (
     crew: movie.credits.crew.map(mapCrew),
   },
   externalIds: mapExternalIds(movie.external_ids),
-  request,
+  mediaInfo: media,
 });

server/models/Search.ts

@@ -4,6 +4,7 @@ import type {
   TmdbTvResult,
 } from '../api/themoviedb';
 import type { MediaRequest } from '../entity/MediaRequest';
+import Media from '../entity/Media';
 
 export type MediaType = 'tv' | 'movie' | 'person';
 
@@ -18,7 +19,7 @@ interface SearchResult {
   genreIds: number[];
   overview: string;
   originalLanguage: string;
-  request?: MediaRequest;
+  mediaInfo?: Media;
 }
 
 export interface MovieResult extends SearchResult {
@@ -28,7 +29,7 @@ export interface MovieResult extends SearchResult {
   releaseDate: string;
   adult: boolean;
   video: boolean;
-  request?: MediaRequest;
+  mediaInfo?: Media;
 }
 
 export interface TvResult extends SearchResult {
@@ -53,7 +54,7 @@ export type Results = MovieResult | TvResult | PersonResult;
 
 export const mapMovieResult = (
   movieResult: TmdbMovieResult,
-  request?: MediaRequest
+  media?: Media
 ): MovieResult => ({
   id: movieResult.id,
   mediaType: 'movie',
@@ -70,12 +71,12 @@ export const mapMovieResult = (
   voteCount: movieResult.vote_count,
   backdropPath: movieResult.backdrop_path,
   posterPath: movieResult.poster_path,
-  request,
+  mediaInfo: media,
 });
 
 export const mapTvResult = (
   tvResult: TmdbTvResult,
-  request?: MediaRequest
+  media?: Media
 ): TvResult => ({
   id: tvResult.id,
   firstAirDate: tvResult.first_air_Date,
@@ -92,7 +93,7 @@ export const mapTvResult = (
   voteCount: tvResult.vote_count,
   backdropPath: tvResult.backdrop_path,
   posterPath: tvResult.poster_path,
-  request,
+  mediaInfo: media,
 });
 
 export const mapPersonResult = (
@@ -115,19 +116,19 @@ export const mapPersonResult = (
 
 export const mapSearchResults = (
   results: (TmdbMovieResult | TmdbTvResult | TmdbPersonResult)[],
-  requests?: MediaRequest[]
+  media?: Media[]
 ): Results[] =>
   results.map((result) => {
     switch (result.media_type) {
       case 'movie':
         return mapMovieResult(
           result,
-          requests?.find((req) => req.mediaId === result.id)
+          media?.find((req) => req.tmdbId === result.id)
         );
       case 'tv':
         return mapTvResult(
           result,
-          requests?.find((req) => req.mediaId === result.id)
+          media?.find((req) => req.tmdbId === result.id)
         );
       default:
         return mapPersonResult(result);

server/models/Tv.ts

@@ -8,12 +8,12 @@ import {
   ExternalIds,
   mapExternalIds,
 } from './common';
-import { MediaRequest } from '../entity/MediaRequest';
 import {
   TmdbTvEpisodeDetails,
   TmdbTvSeasonDetails,
   TmdbTvDetails,
 } from '../api/themoviedb';
+import type Media from '../entity/Media';
 
 interface Episode {
   id: number;
@@ -78,7 +78,7 @@ export interface TvDetails {
     crew: Crew[];
   };
   externalIds: ExternalIds;
-  request?: MediaRequest;
+  mediaInfo?: Media;
 }
 
 const mapEpisodeDetails = (episode: TmdbTvEpisodeDetails): Episode => ({
@@ -107,7 +107,7 @@ const mapSeasonDetails = (season: TmdbTvSeasonDetails): Season => ({
 
 export const mapTvDetails = (
   show: TmdbTvDetails,
-  request?: MediaRequest
+  media?: Media
 ): TvDetails => ({
   createdBy: show.created_by,
   episodeRunTime: show.episode_run_time,
@@ -159,5 +159,5 @@ export const mapTvDetails = (
     crew: show.credits.crew.map(mapCrew),
   },
   externalIds: mapExternalIds(show.external_ids),
-  request,
+  mediaInfo: media,
 });