@tmdb-graphql-api/resolvers 0.1.0 → 0.1.1-unstable.0

package/src/queries/episodeTranslations.ts

@@ -1,16 +1,27 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
-import { EPISODE, SEASON, TRANSLATIONS, TV } from '../constants.ts';
-import { type Context, type RawEpisodeTranslations, type RawEpisodeWithAppendToResponse } from '../types.ts';
+import { EPISODE, TRANSLATIONS } from '../constants.ts';
+import { buildObjResolver } from '../helpers/buildObjResolver.ts';
+import {
+  type EnrichedRawEpisode,
+  type EnrichedRawEpisodeWithAppendToResponse,
+  type RawEpisodeTranslations,
+} from '../types.ts';
 
-export const resolveEpisodeTranslations = async (
-  obj: RawEpisodeWithAppendToResponse & { __headers?: Headers },
-  _args: undefined,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
-  if (obj.translations && obj.__headers) {
-    setCacheMetadata(`${EPISODE}.${TRANSLATIONS}`, obj.__headers);
-    return obj.translations.translations;
+const isEnrichedRawEpisodeWithTranslations = (
+  obj: EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers })
+): obj is EnrichedRawEpisodeWithAppendToResponse & { __headers: Headers } => TRANSLATIONS in obj && '__headers' in obj;
+
+export const resolveEpisodeTranslations = buildObjResolver<
+  EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
+  RawEpisodeTranslations['translations']
+>(EPISODE, async (obj, ctx) => {
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+
+  if (isEnrichedRawEpisodeWithTranslations(obj)) {
+    return {
+      data: obj.translations?.translations,
+      headers: obj.__headers,
+      source: 'parentNode',
+    };
   }
 
   const { data, errors, headers } = await restClient.episode<RawEpisodeTranslations>(
@@ -25,13 +36,9 @@ export const resolveEpisodeTranslations = async (
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(
-      `Failed to resolve ${TV} show ${obj.tv_show_id} ${SEASON} ${obj.season_number} ${EPISODE} ${obj.episode_number} ${TRANSLATIONS}.`,
-      { nodes: fieldNodes, originalError: errors[0] }
-    );
-  }
-
-  setCacheMetadata(`${EPISODE}.${TRANSLATIONS}`, headers);
-  return data?.translations;
-};
+  return {
+    data: data?.translations,
+    errors,
+    headers,
+  };
+});

package/src/queries/episodeVideos.test.ts

@@ -7,46 +7,43 @@ import { mockFetch } from 'fetch-mocked';
 import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
-import { type Context, type RawEpisode } from '../types.ts';
+import { TRANSLATIONS, VIDEOS } from '../constants.ts';
+import { type Context } from '../types.ts';
 import { resolveEpisodeVideos } from './episodeVideos.ts';
 
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveEpisodeVideos >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
   const tvShowId = 1399;
   const seasonNumber = 1;
   const episodeNumber = 1;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
+
+  const info = { fieldName: TRANSLATIONS } as GraphQLResolveInfo;
 
   beforeEach(() => {
-    mockedFetch.mockGetOnce(
-      buildEndpoint(EPISODE_PATH, { episodeNumber, id: tvShowId, seasonNumber, type: 'videos' }),
-      {
-        body: episodeVideos,
-      }
-    );
+    mockedFetch.mockGetOnce(buildEndpoint(EPISODE_PATH, { episodeNumber, id: tvShowId, seasonNumber, type: VIDEOS }), {
+      body: episodeVideos,
+    });
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   it('should return the episode videos', async () => {
-    await expect(
-      resolveEpisodeVideos(
-        episodeDetails as RawEpisode,
-        undefined,
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      )
-    ).resolves.toMatchSnapshot();
+    // @ts-expect-error arg is slightly modified version of episode details
+    await expect(resolveEpisodeVideos(episodeDetails, undefined, context, info)).resolves.toMatchSnapshot();
   });
 
   describe('when raw episode data has videos', () => {
@@ -59,14 +56,14 @@ describe('resolveEpisodeVideos >', () => {
 
       await expect(
         resolveEpisodeVideos(
+          // @ts-expect-error arg is slightly modified version of episode details
           { ...episodeDetails, __headers: new Headers(), videos: rest },
           undefined,
           {
+            ...context,
             restClient: { episode: episodeFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -79,14 +76,14 @@ describe('resolveEpisodeVideos >', () => {
       const { id, ...rest } = episodeVideos;
 
       await resolveEpisodeVideos(
+        // @ts-expect-error arg is slightly modified version of episode details
         { ...episodeDetails, __headers: new Headers(), videos: rest },
         undefined,
         {
+          ...context,
           restClient: { episode: episodeFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(episodeFetchMock).not.toHaveBeenCalled();

package/src/queries/episodeVideos.ts

@@ -1,16 +1,27 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
-import { EPISODE, SEASON, TV, VIDEOS } from '../constants.ts';
-import { type Context, type RawEpisodeVideos, type RawEpisodeWithAppendToResponse } from '../types.ts';
+import { EPISODE, VIDEOS } from '../constants.ts';
+import { buildObjResolver } from '../helpers/buildObjResolver.ts';
+import {
+  type EnrichedRawEpisode,
+  type EnrichedRawEpisodeWithAppendToResponse,
+  type RawEpisodeVideos,
+} from '../types.ts';
 
-export const resolveEpisodeVideos = async (
-  obj: RawEpisodeWithAppendToResponse & { __headers?: Headers },
-  _args: undefined,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
-  if (obj.videos && obj.__headers) {
-    setCacheMetadata(`${EPISODE}.${VIDEOS}`, obj.__headers);
-    return obj.videos.results;
+const isEnrichedRawEpisodeWithVideos = (
+  obj: EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers })
+): obj is EnrichedRawEpisodeWithAppendToResponse & { __headers: Headers } => VIDEOS in obj && '__headers' in obj;
+
+export const resolveEpisodeVideos = buildObjResolver<
+  EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
+  RawEpisodeVideos['results']
+>(EPISODE, async (obj, ctx) => {
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+
+  if (isEnrichedRawEpisodeWithVideos(obj)) {
+    return {
+      data: obj.videos?.results,
+      headers: obj.__headers,
+      source: 'parentNode',
+    };
   }
 
   const { data, errors, headers } = await restClient.episode<RawEpisodeVideos>(
@@ -25,13 +36,9 @@ export const resolveEpisodeVideos = async (
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(
-      `Failed to resolve ${TV} show ${obj.tv_show_id} ${SEASON} ${obj.season_number} ${EPISODE} ${obj.episode_number} ${VIDEOS}.`,
-      { nodes: fieldNodes, originalError: errors[0] }
-    );
-  }
-
-  setCacheMetadata(`${EPISODE}.${VIDEOS}`, headers);
-  return data?.results;
-};
+  return {
+    data: data?.results,
+    errors,
+    headers,
+  };
+});

package/src/queries/find.test.ts

@@ -1,11 +1,11 @@
 import { jest } from '@jest/globals';
-import { FIND_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
+import { FIND_PATH } from '@tmdb-graphql-api/rest-client';
 import { type ExternalSource } from '@tmdb-graphql-api/schema/types';
 import findResults from '@tmdb-graphql-api/test-utils/responses/themoviedb/find/results.json';
 import { mockFetch } from 'fetch-mocked';
-import { type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { snakeCasePropNames } from '../helpers/snakeCasePropNames.ts';
 import { type Context } from '../types.ts';
@@ -14,14 +14,17 @@ import { resolveFind } from './find.ts';
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveFind >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
   const id = 'nm0000129';
   const source = 'imdb_id' as ExternalSource;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
+
+  const info = {} as GraphQLResolveInfo;
 
   beforeEach(() => {
     mockedFetch.mockGetOnce(buildEndpoint(FIND_PATH, { id }, snakeCasePropNames({ externalSource: source })), {
@@ -31,17 +34,11 @@ describe('resolveFind >', () => {
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   it('should return the correct find results', async () => {
-    await expect(
-      resolveFind(
-        undefined,
-        { id, source },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      )
-    ).resolves.toMatchSnapshot();
+    await expect(resolveFind(undefined, { id, source }, context, info)).resolves.toMatchSnapshot();
   });
 });

package/src/queries/find.ts

@@ -1,34 +1,37 @@
 import { type QueryFindArgs } from '@tmdb-graphql-api/schema/types';
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
 import { FIND } from '../constants.ts';
+import { buildArgsResolver } from '../helpers/buildArgsResolver.ts';
 import { snakeCasePropNames } from '../helpers/snakeCasePropNames.ts';
-import { type Context, type RawFind } from '../types.ts';
+import { type RawEpisode, type RawFind, type RawMovie, type RawPerson, type RawSeason, type RawTv } from '../types.ts';
+
+type Data = {
+  episodes?: RawEpisode[];
+  movies?: RawMovie[];
+  people?: RawPerson[];
+  seasons?: RawSeason[];
+  tv?: RawTv[];
+};
+
+export const resolveFind = buildArgsResolver<QueryFindArgs, Data>(FIND, async (args, ctx) => {
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
 
-export const resolveFind = async (
-  _obj: undefined,
-  { id, source }: QueryFindArgs,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
   const { data, errors, headers } = await restClient.find<RawFind>(
     {
-      pathTemplateData: { id },
-      queryParams: { ...snakeCasePropNames({ externalSource: source }) },
+      pathTemplateData: { id: args.id },
+      queryParams: { ...snakeCasePropNames({ externalSource: args.source }) },
     },
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(`Failed to resolve ${FIND} ${id}.`, { nodes: fieldNodes, originalError: errors[0] });
-  }
-
-  setCacheMetadata(FIND, headers);
-
   return {
-    episodes: data?.tv_episode_results,
-    movies: data?.movie_results,
-    people: data?.person_results,
-    seasons: data?.tv_season_results,
-    tv: data?.tv_results,
+    data: {
+      episodes: data?.tv_episode_results,
+      movies: data?.movie_results,
+      people: data?.person_results,
+      seasons: data?.tv_season_results,
+      tv: data?.tv_results,
+    },
+    errors,
+    headers,
   };
-};
+});

package/src/queries/genres.test.ts

@@ -1,12 +1,12 @@
 import { jest } from '@jest/globals';
-import { GENRE_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
+import { GENRE_PATH } from '@tmdb-graphql-api/rest-client';
 import { ScreenType } from '@tmdb-graphql-api/schema/types';
 import movieGenres from '@tmdb-graphql-api/test-utils/responses/themoviedb/genres/movies.json';
 import tvGenres from '@tmdb-graphql-api/test-utils/responses/themoviedb/genres/tv.json';
 import { mockFetch } from 'fetch-mocked';
-import { type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { type Context } from '../types.ts';
 import { resolveGenres } from './genres.ts';
@@ -14,16 +14,19 @@ import { resolveGenres } from './genres.ts';
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveGenres >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const info = {} as GraphQLResolveInfo;
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   describe("when the screenType is 'MOVIE' >", () => {
@@ -35,12 +38,7 @@ describe('resolveGenres >', () => {
 
     it('should return the movie genres', async () => {
       await expect(
-        resolveGenres(
-          undefined,
-          { screenType: ScreenType.Movie },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
+        resolveGenres(undefined, { screenType: ScreenType.Movie }, context, info)
       ).resolves.toMatchSnapshot();
     });
   });
@@ -53,14 +51,7 @@ describe('resolveGenres >', () => {
     });
 
     it('should return the tv genres', async () => {
-      await expect(
-        resolveGenres(
-          undefined,
-          { screenType: ScreenType.Tv },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveGenres(undefined, { screenType: ScreenType.Tv }, context, info)).resolves.toMatchSnapshot();
     });
   });
 });

package/src/queries/genres.ts

@@ -1,28 +1,22 @@
 import { type QueryGenresArgs } from '@tmdb-graphql-api/schema/types';
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
 import { GENRES } from '../constants.ts';
-import { type Context, type RawGenre } from '../types.ts';
+import { buildArgsResolver } from '../helpers/buildArgsResolver.ts';
+import { type RawGenres } from '../types.ts';
 
-export const resolveGenres = async (
-  _obj: undefined,
-  { screenType }: QueryGenresArgs,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
-  const { data, errors, headers } = await restClient.genres<{ genres?: RawGenre[] }>(
+export const resolveGenres = buildArgsResolver<QueryGenresArgs, RawGenres['genres']>(GENRES, async (args, ctx) => {
+  const { screenType } = args;
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+
+  const { data, errors, headers } = await restClient.genres<RawGenres>(
     {
       pathTemplateData: { type: screenType.toLowerCase() },
     },
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(`Failed to resolve ${screenType} ${GENRES}.`, {
-      nodes: fieldNodes,
-      originalError: errors[0],
-    });
-  }
-
-  setCacheMetadata(GENRES, headers);
-  return data?.genres;
-};
+  return {
+    data: data?.genres,
+    errors,
+    headers,
+  };
+});

package/src/queries/keyword.test.ts

@@ -1,10 +1,10 @@
 import { jest } from '@jest/globals';
-import { KEYWORD_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
+import { KEYWORD_PATH } from '@tmdb-graphql-api/rest-client';
 import keywordDetails from '@tmdb-graphql-api/test-utils/responses/themoviedb/keyword/details.json';
 import { mockFetch } from 'fetch-mocked';
-import { type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { type Context } from '../types.ts';
 import { resolveKeyword } from './keyword.ts';
@@ -12,13 +12,16 @@ import { resolveKeyword } from './keyword.ts';
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveKeyword >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
   const id = 2;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
+
+  const info = {} as GraphQLResolveInfo;
 
   beforeEach(() => {
     mockedFetch.mockGetOnce(buildEndpoint(KEYWORD_PATH, { id }), {
@@ -28,17 +31,11 @@ describe('resolveKeyword >', () => {
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   it('should return the correct keyword details', async () => {
-    await expect(
-      resolveKeyword(
-        undefined,
-        { id },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      )
-    ).resolves.toMatchSnapshot();
+    await expect(resolveKeyword(undefined, { id: String(id) }, context, info)).resolves.toMatchSnapshot();
   });
 });

package/src/queries/keyword.ts

@@ -1,15 +1,13 @@
 import { type QueryKeywordArgs } from '@tmdb-graphql-api/schema/types';
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
 import { KEYWORD } from '../constants.ts';
+import { buildArgsResolver } from '../helpers/buildArgsResolver.ts';
 import { snakeCasePropNames } from '../helpers/snakeCasePropNames.ts';
-import { type Context, type RawKeyword } from '../types.ts';
+import { type RawKeyword } from '../types.ts';
+
+export const resolveKeyword = buildArgsResolver<QueryKeywordArgs, RawKeyword>(KEYWORD, async (args, ctx) => {
+  const { id, includeAdult } = args;
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
 
-export const resolveKeyword = async (
-  _obj: undefined,
-  { id, includeAdult }: QueryKeywordArgs,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
   const { data, errors, headers } = await restClient.keyword<RawKeyword>(
     {
       pathTemplateData: { id },
@@ -18,10 +16,9 @@ export const resolveKeyword = async (
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(`Failed to resolve ${KEYWORD} ${id}.`, { nodes: fieldNodes, originalError: errors[0] });
-  }
-
-  setCacheMetadata(KEYWORD, headers);
-  return data;
-};
+  return {
+    data,
+    errors,
+    headers,
+  };
+});

package/src/queries/movie.test.ts

@@ -9,6 +9,7 @@ import { mockFetch } from 'fetch-mocked';
 import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { MOVIE } from '../constants.ts';
 import { type Context } from '../types.ts';
@@ -17,13 +18,14 @@ import { resolveMovie } from './movie.ts';
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveMovie >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
   const id = 1891;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
 
   beforeEach(() => {
     mockedFetch.mockGetOnce(buildEndpoint(MOVIE_PATH, { id }), {
@@ -33,26 +35,21 @@ describe('resolveMovie >', () => {
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   it('should return the correct movie details', async () => {
     const operationDefinition = getOperationDefinitions(parse(movieDetailsQuery()), OperationTypeNode.QUERY)[0]!;
     const { fieldNode } = getChildFields(operationDefinition, { name: MOVIE })![0]!;
-
-    await expect(
-      resolveMovie(
-        undefined,
-        { id },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo
-      )
-    ).resolves.toMatchSnapshot();
+    const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
+    await expect(resolveMovie(undefined, { id: String(id) }, context, info)).resolves.toMatchSnapshot();
   });
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(movieDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
     const { fieldNode } = getChildFields(operationDefinition, { name: MOVIE })![0]!;
+    const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const movieFetchMock = jest
       .fn<(...args: PlainArray) => Promise<FetchResponse>>()
@@ -60,13 +57,12 @@ describe('resolveMovie >', () => {
 
     await resolveMovie(
       undefined,
-      { id },
+      { id: String(id) },
       {
+        ...context,
         restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-        setCacheMetadata,
-        tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-      } as unknown as Context,
-      { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo
+      },
+      info
     );
 
     expect(movieFetchMock.mock.calls[0]![0]).toEqual(