feat: Created the single person lookup without the credits functionality and fixed an issue where some social links weren't always available or empty.

Author: AlexMachin1997

src/app.module.ts

@@ -3,6 +3,7 @@ import { Module } from '@nestjs/common';
 import { GraphQLModule } from '@nestjs/graphql';
 
 import { MovieModule } from './movie/movie.module';
+import { PersonModule } from './person/person.module';
 import { ShowModule } from './show/show.module';
 
 @Module({
@@ -37,7 +38,8 @@ import { ShowModule } from './show/show.module';
 			]
 		}),
 		ShowModule,
-		MovieModule
+		MovieModule,
+		PersonModule
 	]
 })
 export class AppModule {}

src/entertainment/entertainment.module.ts

@@ -1,13 +1,14 @@
 /* eslint-disable import/extensions */
 import { HttpModule } from '@nestjs/axios';
 import { Module } from '@nestjs/common';
-import { UtilsModule } from 'src/utils/utils.module';
 
 import { EntertainmentService } from './entertainment.service';
+import { SocialsModule } from '../socials/socials.module';
+import { UtilsModule } from '../utils/utils.module';
 
 @Module({
 	providers: [EntertainmentService],
 	exports: [EntertainmentService],
-	imports: [HttpModule, UtilsModule]
+	imports: [HttpModule, UtilsModule, SocialsModule]
 })
 export class EntertainmentModule {}

src/entertainment/entertainment.service.ts

@@ -17,11 +17,11 @@ import {
 	TheOpenMovieDatabaseBelongsToCollection,
 	TheOpenMovieDatabaseSpokenLanguages
 } from 'src/movie/movie';
+import { SocialsService } from 'src/socials/socials.service';
 import { UtilsService } from 'src/utils/utils.service';
 
 import {
 	ICreditsQueryResponse,
-	IExternalIdsQueryResponse,
 	IKeywordsQueryResponse,
 	IReviewQuery,
 	IVdoesQueryResponse
@@ -37,7 +37,8 @@ interface IEntertainmentCommonArguments {
 export class EntertainmentService {
 	constructor(
 		private readonly httpService: HttpService,
-		private readonly utilService: UtilsService
+		private readonly utilService: UtilsService,
+		private readonly socialsService: SocialsService
 	) {}
 
 	async getReview({
@@ -198,26 +199,10 @@ export class EntertainmentService {
 		entertainmentType,
 		entertainmentId
 	}: IEntertainmentCommonArguments): Promise<Social> {
-		const { data } = await firstValueFrom(
-			this.httpService.get<IExternalIdsQueryResponse>(
-				`https://api.themoviedb.org/3/${entertainmentType.toLowerCase()}/${entertainmentId}/external_ids?language=en-U`,
-				{
-					headers: {
-						Accept: 'application/json',
-						Authorization:
-							// eslint-disable-next-line max-len
-							'Bearer eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI1NDMwNWQxNmE1ZThkN2E3ZWMwZmM2NTk5MzZiY2EzMCIsInN1YiI6IjViMzE0MjQ1OTI1MTQxM2M5MTAwNTIwNCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.iqdLKFCSgeWG3SYso7Rqj297FORviPf9hDdn2kKygTA'
-					}
-				}
-			)
-		);
-
-		return {
-			facebook: `https://www.facebook.com/${data.facebook_id}`,
-			homepage: ``,
-			instagram: `https://www.instagram.com/${data.facebook_id}`.toLowerCase(),
-			twitter: `https://www.twitter.com/${data.twitter_id}`
-		};
+		return this.socialsService.getSocials({
+			resourceId: entertainmentId,
+			resourceType: entertainmentType
+		});
 	}
 
 	getCollection = (

src/entertainment/entertainment.ts

@@ -54,15 +54,6 @@ export interface IKeywordsQueryResponse {
 	keywords: Keyword[];
 }
 
-export interface IExternalIdsQueryResponse {
-	id: number;
-	imdb_id: string;
-	wikidata_id: string;
-	facebook_id: string;
-	instagram_id: string;
-	twitter_id: string;
-}
-
 export interface IVideosQueryResult {
 	iso_639_1: string;
 	iso_3166_1: string;

src/graphql.schema.ts

@@ -99,6 +99,7 @@ export interface IQuery {
     __typename?: 'IQuery';
     movie(id: number): Nullable<Movie> | Promise<Nullable<Movie>>;
     show(id: number): Nullable<Show> | Promise<Nullable<Show>>;
+    person(id: number): Nullable<Person> | Promise<Nullable<Person>>;
 }
 
 export interface CurrentSeason {
@@ -223,6 +224,7 @@ export interface Social {
     instagram?: Nullable<string>;
     twitter?: Nullable<string>;
     homepage?: Nullable<string>;
+    tiktok?: Nullable<string>;
 }
 
 export interface Video {

src/models/Query.graphql

@@ -1,4 +1,5 @@
 type Query {
 	movie(id: Int!): Movie
 	show(id: Int!): Show
+	person(id: Int!): Person
 }

src/models/entertainment/Social.graphql

@@ -3,4 +3,5 @@ type Social {
 	instagram: String
 	twitter: String
 	homepage: String
+	tiktok: String
 }

src/person/person.resolver.ts

@@ -1,4 +1,29 @@
-import { Resolver } from '@nestjs/graphql';
+import { Args, Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';
 
-@Resolver()
-export class PersonResolver {}
+import { PersonService } from './person.service';
+import { Person } from '../graphql.schema';
+
+// import { Person } from '../graphql.schema';
+
+@Resolver('Person')
+export class PersonResolver {
+	constructor(private readonly personService: PersonService) {}
+
+	@Query()
+	async person(@Args('id') personId: number) {
+		return this.personService.getPerson(personId);
+	}
+
+	@ResolveField()
+	async social(@Parent() person: Person) {
+		// Get the external social url (The homepage isn't set here as it's already apart of the original Movie query)
+		const socials = await this.personService.getSocials(person.id ?? 0);
+
+		return {
+			...socials,
+
+			// Since the homepage is apart of the original query append it to the homepage property
+			homepage: person.homepage
+		};
+	}
+}

src/person/person.service.ts

@@ -3,7 +3,6 @@ import { Injectable } from '@nestjs/common';
 import { firstValueFrom } from 'rxjs';
 
 import { TheOpenMovieDatabasePerson, TheOpenMovieDatabasePersonGender } from './person';
-import { Person, Social } from '../graphql.schema';
 import { SocialsService } from '../socials/socials.service';
 import { UtilsService } from '../utils/utils.service';
 
@@ -61,7 +60,7 @@ export class PersonService {
 		}
 	}
 
-	async getPerson(personId: number): Promise<Person> {
+	async getPerson(personId: number) {
 		const { data } = await firstValueFrom(
 			this.httpService.get<TheOpenMovieDatabasePerson>(
 				`https://api.themoviedb.org/3/person/${personId}?language=en-U`,
@@ -90,7 +89,7 @@ export class PersonService {
 		};
 	}
 
-	async getSocials(personId: number): Promise<Social> {
+	async getSocials(personId: number) {
 		return this.socialService.getSocials({
 			resourceId: personId,
 			resourceType: 'PERSON'

src/socials/socials.service.ts

@@ -16,8 +16,6 @@ export class SocialsService {
 		resourceType: ENTERTAINMENT_TYPES | 'PERSON';
 		resourceId: number;
 	}): Promise<Social> {
-		console.log('getting socials..');
-
 		const { data } = await firstValueFrom(
 			this.httpService.get<IExternalIdsQueryResponse>(
 				`https://api.themoviedb.org/3/${resourceType.toLowerCase()}/${resourceId}/external_ids?language=en-U`,
@@ -32,12 +30,34 @@ export class SocialsService {
 			)
 		);
 
+		console.log('social', data);
+
+		let facebook = null;
+		let instagram = null;
+		let twitter = null;
+		let tiktok = null;
+
+		if (data.facebook_id) {
+			facebook = `https://www.facebook.com/${data.facebook_id}`;
+		}
+
+		if (data.instagram_id) {
+			instagram = `https://www.instagram.com/${data.instagram_id}`.toLowerCase();
+		}
+
+		if (data.twitter_id) {
+			twitter = `https://www.twitter.com/${data.twitter_id}`;
+		}
+
+		if (data.tiktok_id) {
+			tiktok = `https://www.tiktok.com/@${data.tiktok_id}/`;
+		}
+
 		return {
-			facebook: `https://www.facebook.com/${data.facebook_id}`,
-			homepage: ``,
-			instagram: `https://www.instagram.com/${data.instagram_id}`.toLowerCase(),
-			twitter: `https://www.twitter.com/${data.twitter_id}`
-			// tiktok: `https://www.tiktok.com/@${data.tiktok_id}/`
+			facebook,
+			instagram,
+			twitter,
+			tiktok
 		};
 	}
 }