From 844f02bac98816dba4b960c723e14ad5c6e3ad14 Mon Sep 17 00:00:00 2001
From: David Ludwig <davidludwigii@gmail.com>
Date: Mon, 10 May 2021 18:11:36 +0000
Subject: [PATCH] Adjust movie search schema

---
 api/search/src/schema.ts                    | 10 +++---
 services/search/src/services/MovieSearch.ts | 36 +++++++++------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/api/search/src/schema.ts b/api/search/src/schema.ts
index 3f07ed0..b42edf9 100644
--- a/api/search/src/schema.ts
+++ b/api/search/src/schema.ts
@@ -14,15 +14,13 @@ export interface IMovieLanguage {
 
 export interface IMovie {
 	backdropPath    : string | null,
-	originalLanguage: string,
-	originalTitle   : string,
+	originalLanguage: string | null,
+	originalTitle   : string | null,
 	overview        : string | null,
 	posterPath      : string | null,
-	releaseDate     : string,
+	releaseDate     : string | null,
 	title           : string,
-	tmdbId          : number,
-	voteAverage     : number,
-	voteCount       : number
+	tmdbId          : number
 }
 
 export interface IMovieDetails extends IMovie {
diff --git a/services/search/src/services/MovieSearch.ts b/services/search/src/services/MovieSearch.ts
index af2858d..005cdae 100644
--- a/services/search/src/services/MovieSearch.ts
+++ b/services/search/src/services/MovieSearch.ts
@@ -78,16 +78,14 @@ export default class MovieSearch extends InternalService
 	 */
 	protected formatMovie(movie: IMovieSearchResult) {
 		return <IMovie> {
-			backdropPath    : movie.backdrop_path,
-			originalLanguage: movie.original_language,
-			originalTitle   : movie.original_title,
-			overview        : movie.overview,
-			posterPath      : movie.poster_path,
-			releaseDate     : movie.release_date,
+			backdropPath    : movie.backdrop_path     || null,
+			originalLanguage: movie.original_language || null,
+			originalTitle   : movie.original_title    || null,
+			overview        : movie.overview          || null,
+			posterPath      : movie.poster_path       || null,
+			releaseDate     : movie.release_date      || null,
 			title           : movie.title,
-			tmdbId          : movie.id,
-			voteAverage     : movie.vote_average,
-			voteCount       : movie.vote_count
+			tmdbId          : movie.id
 		}
 	}
 
@@ -96,20 +94,18 @@ export default class MovieSearch extends InternalService
 	 */
 	protected formatMovieDetails(tmdbId: number, movie: IRawMovieDetails) {
 		return <IMovieDetails> {
-			backdropPath    : movie.backdrop_path,
-			imdbId          : movie.imdb_id,
-			originalLanguage: movie.original_language,
-			originalTitle   : movie.original_title,
-			overview        : movie.overview,
-			posterPath      : movie.poster_path,
-			releaseDate     : movie.release_date,
-			runtime         : movie.runtime,
+			backdropPath    : movie.backdrop_path     || null,
+			imdbId          : movie.imdb_id           || null,
+			originalLanguage: movie.original_language || null,
+			originalTitle   : movie.original_title    || null,
+			overview        : movie.overview          || null,
+			posterPath      : movie.poster_path       || null,
+			releaseDate     : movie.release_date      || null,
+			runtime         : movie.runtime           || null,
 			spokenLanguages : movie.spoken_languages,
 			status          : movie.status,
-			tagline         : movie.tagline,
+			tagline         : movie.tagline || null,
 			title           : movie.title,
-			voteAverage     : movie.vote_average,
-			voteCount       : movie.vote_count,
 			tmdbId
 		}
 	}