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

package/src/queries/tvRecommendations.test.ts

@@ -8,9 +8,10 @@ import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { decode } from 'js-base64';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { RECOMMENDATIONS, TV } from '../constants.ts';
-import { type Context, type RawTv, type RawTvWithAppendToResponse } from '../types.ts';
+import { type Context } from '../types.ts';
 import {
   createMakeCursors,
   createResourceResolver,
@@ -21,18 +22,27 @@ import {
 const mockedFetch = mockFetch(jest.fn);
 const id = 1399;
 
+const context = {
+  logger: createMockLogger(jest.fn),
+  restClient: createRestClient(),
+  setCacheMetadata: jest.fn(),
+  tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+} as unknown as Context;
+
+const info = {} as GraphQLResolveInfo;
+
 describe('createMakeCursors', () => {
   const GROUP_CURSOR = `${id}::${TV}::${RECOMMENDATIONS}`;
 
   it('makeGroupCursor', () => {
-    const { makeGroupCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeGroupCursor } = createMakeCursors({ id });
     const groupCursor = makeGroupCursor();
     expect(decode(groupCursor)).toBe(GROUP_CURSOR);
   });
 
   it('makeIDCursor', () => {
     const recommendationTvId = '6';
-    const { makeIDCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeIDCursor } = createMakeCursors({ id });
     const idCursor = makeIDCursor(recommendationTvId);
     expect(decode(idCursor)).toBe(`${recommendationTvId}::${GROUP_CURSOR}`);
   });
@@ -43,15 +53,8 @@ describe('createResourceResolver', () => {
     tv: jest.fn().mockReturnValue({}),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
-  const setCacheMetadata = jest.fn();
-
   it('when `restClient.tv` is called', async () => {
-    const resourceResolver = createResourceResolver({ id } as unknown as RawTvWithAppendToResponse, {}, {
-      restClient,
-      setCacheMetadata,
-      tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-    } as unknown as Context);
-
+    const resourceResolver = createResourceResolver({ id }, {}, { ...context, restClient }, info);
     await resourceResolver({ page: 1 });
 
     expect(restClient.tv).toHaveBeenCalledWith(
@@ -65,9 +68,6 @@ describe('createResourceResolver', () => {
 });
 
 describe('resolveTvRecommendations', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
-
   const mockEndpoint = (page: number, body: Jsonifiable) => {
     mockedFetch.mockGetOnce(buildEndpoint(TV_PATH, { id, type: RECOMMENDATIONS }, { page }), {
       body,
@@ -75,49 +75,29 @@ describe('resolveTvRecommendations', () => {
     });
   };
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
-
   beforeEach(() => {
     mockEndpoint(1, tvRecommendations);
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
     await cursorCache.clear();
+    jest.clearAllMocks();
   });
 
   describe('when the first 5 are requested', () => {
     it('should return the correct response', async () => {
-      await expect(
-        resolveTvRecommendations(
-          { id } as RawTvWithAppendToResponse,
-          { first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveTvRecommendations({ id }, { first: 5 }, context, info)).resolves.toMatchSnapshot();
     });
   });
 
   describe('when the second 5 are requested', () => {
     it('should return the correct response', async () => {
-      const { pageInfo } = await resolveTvRecommendations(
-        { id } as RawTvWithAppendToResponse,
-        { first: 5 },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      );
+      const { pageInfo } = await resolveTvRecommendations({ id }, { first: 5 }, context, info);
 
       await expect(
-        resolveTvRecommendations(
-          { id } as RawTvWithAppendToResponse,
-          { after: pageInfo.endCursor, first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
+        resolveTvRecommendations({ id }, { after: pageInfo.endCursor, first: 5 }, context, info)
       ).resolves.toMatchSnapshot();
     });
   });
@@ -130,18 +110,18 @@ describe('resolveTvRecommendations', () => {
 
       await expect(
         resolveTvRecommendations(
+          // @ts-expect-error minor type mismatch
           {
             ...tvDetails,
             __headers: new Headers(),
             recommendations: tvRecommendations,
-          } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+          },
           { first: 5 },
           {
+            ...context,
             restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -152,18 +132,18 @@ describe('resolveTvRecommendations', () => {
         .mockResolvedValue({ data: {} } as FetchResponse);
 
       await resolveTvRecommendations(
+        // @ts-expect-error minor type mismatch
         {
           ...tvDetails,
           __headers: new Headers(),
           recommendations: tvRecommendations,
-        } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+        },
         { first: 5 },
         {
+          ...context,
           restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(tvFetchMock).not.toHaveBeenCalled();

package/src/queries/tvRecommendations.ts

@@ -1,9 +1,8 @@
 import { Core } from '@cachemap/core';
 import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
-import { type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
+import { type CreateResourceResolver, type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
 import { type TvRecommendationsArgs } from '@tmdb-graphql-api/schema/types';
-import { type FetchResponse } from 'getta';
 import { encode } from 'js-base64';
 import { RECOMMENDATIONS, TV } from '../constants.ts';
 import { type Context, type RawTv, type RawTvRecommendations, type RawTvWithAppendToResponse } from '../types.ts';
@@ -19,24 +18,30 @@ export const createMakeCursors = (obj: RawTv) => {
   };
 };
 
-export const createResourceResolver =
-  (
-    obj: RawTvWithAppendToResponse & { __headers?: Headers },
-    _args: TvRecommendationsArgs,
-    { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context
-  ) =>
+const isRawTvWithRecommendations = (
+  obj: RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
+  page: number
+): obj is RawTvWithAppendToResponse & { __headers: Headers } =>
+  RECOMMENDATIONS in obj && obj.recommendations?.page === page && '__headers' in obj;
+
+export const createResourceResolver: CreateResourceResolver<
+  RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
+  TvRecommendationsArgs,
+  Context,
+  RawTvRecommendations
+> =
+  (obj, _args, ctx) =>
   async ({ page }: { page: number }) => {
-    if (obj.recommendations?.page === page && obj.__headers) {
-      setCacheMetadata(`${TV}.${RECOMMENDATIONS}`, obj.__headers);
+    const { requestID, restClient, tmdbGuestSessionId } = ctx;
 
+    if (isRawTvWithRecommendations(obj, page)) {
       return {
         data: obj.recommendations,
-        errors: [],
         headers: obj.__headers,
-      } as unknown as FetchResponse<RawTvRecommendations>;
+      };
     }
 
-    const result = await restClient.tv<RawTvRecommendations>(
+    const { data, errors, headers } = await restClient.tv<RawTvRecommendations>(
       {
         pathTemplateData: { id: obj.id, type: RECOMMENDATIONS },
         queryParams: { page },
@@ -44,11 +49,11 @@ export const createResourceResolver =
       { requestID, tmdbGuestSessionId }
     );
 
-    if (result.data) {
-      setCacheMetadata(`${TV}.${RECOMMENDATIONS}`, result.headers);
-    }
-
-    return result;
+    return {
+      data,
+      errors,
+      headers,
+    };
   };
 
 export const cursorCache = new Core({
@@ -59,10 +64,11 @@ export const cursorCache = new Core({
 });
 
 export const getters: Getters<RawTvRecommendations, RawTv> = {
-  nodes: ({ results }) => results,
-  page: ({ page }) => page,
-  totalPages: ({ total_pages }) => total_pages,
-  totalResults: ({ total_results }) => total_results,
+  // @ts-expect-error minor type mismatch
+  nodes: ({ results = [] }) => results,
+  page: ({ page = 0 }) => page,
+  totalPages: ({ total_pages = 0 }) => total_pages,
+  totalResults: ({ total_results = 0 }) => total_results,
 };
 
 export const resolveTvRecommendations = makeConnectionResolver({

package/src/queries/tvReviews.test.ts

@@ -8,26 +8,36 @@ import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { decode } from 'js-base64';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { REVIEWS, TV } from '../constants.ts';
-import { type Context, type RawTv, type RawTvWithAppendToResponse } from '../types.ts';
+import { type Context } from '../types.ts';
 import { createMakeCursors, createResourceResolver, cursorCache, resolveTvReviews } from './tvReviews.ts';
 
 const mockedFetch = mockFetch(jest.fn);
 const id = 1399;
 
+const context = {
+  logger: createMockLogger(jest.fn),
+  restClient: createRestClient(),
+  setCacheMetadata: jest.fn(),
+  tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+} as unknown as Context;
+
+const info = {} as GraphQLResolveInfo;
+
 describe('createMakeCursors', () => {
   const GROUP_CURSOR = `${id}::${TV}::${REVIEWS}`;
 
   it('makeGroupCursor', () => {
-    const { makeGroupCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeGroupCursor } = createMakeCursors({ id });
     const groupCursor = makeGroupCursor();
     expect(decode(groupCursor)).toBe(GROUP_CURSOR);
   });
 
   it('makeIDCursor', () => {
     const reviewId = '6';
-    const { makeIDCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeIDCursor } = createMakeCursors({ id });
     const idCursor = makeIDCursor(reviewId);
     expect(decode(idCursor)).toBe(`${reviewId}::${GROUP_CURSOR}`);
   });
@@ -38,14 +48,16 @@ describe('createResourceResolver', () => {
     tv: jest.fn().mockReturnValue({}),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
-  const setCacheMetadata = jest.fn();
-
   it('when `restClient.tv` is called', async () => {
-    const resourceResolver = createResourceResolver({ id } as RawTvWithAppendToResponse, {}, {
-      restClient,
-      setCacheMetadata,
-      tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-    } as unknown as Context);
+    const resourceResolver = createResourceResolver(
+      { id },
+      {},
+      {
+        ...context,
+        restClient,
+      },
+      info
+    );
 
     await resourceResolver({ page: 1 });
 
@@ -60,9 +72,6 @@ describe('createResourceResolver', () => {
 });
 
 describe('resolveTvReviews', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
-
   const mockEndpoint = (page: number, body: Jsonifiable) => {
     mockedFetch.mockGetOnce(buildEndpoint(TV_PATH, { id, type: REVIEWS }, { page }), {
       body,
@@ -70,49 +79,29 @@ describe('resolveTvReviews', () => {
     });
   };
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
-
   beforeEach(() => {
     mockEndpoint(1, tvReviews);
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
     await cursorCache.clear();
+    jest.clearAllMocks();
   });
 
   describe('when the first 5 are requested', () => {
     it('should return the correct response', async () => {
-      await expect(
-        resolveTvReviews(
-          { id } as RawTvWithAppendToResponse,
-          { first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveTvReviews({ id }, { first: 5 }, context, info)).resolves.toMatchSnapshot();
     });
   });
 
   describe('when the second 5 are requested', () => {
     it('should return the correct response', async () => {
-      const { pageInfo } = await resolveTvReviews(
-        { id } as RawTvWithAppendToResponse,
-        { first: 5 },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      );
+      const { pageInfo } = await resolveTvReviews({ id }, { first: 5 }, context, info);
 
       await expect(
-        resolveTvReviews(
-          { id } as RawTvWithAppendToResponse,
-          { after: pageInfo.endCursor, first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
+        resolveTvReviews({ id }, { after: pageInfo.endCursor, first: 5 }, context, info)
       ).resolves.toMatchSnapshot();
     });
   });
@@ -128,15 +117,15 @@ describe('resolveTvReviews', () => {
           {
             ...tvDetails,
             __headers: new Headers(),
+            // @ts-expect-error minor nested type mismatch
             reviews: tvReviews,
-          } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+          },
           { first: 5 },
           {
+            ...context,
             restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -150,15 +139,15 @@ describe('resolveTvReviews', () => {
         {
           ...tvDetails,
           __headers: new Headers(),
+          // @ts-expect-error minor nested type mismatch
           reviews: tvReviews,
-        } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+        },
         { first: 5 },
         {
+          ...context,
           restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(tvFetchMock).not.toHaveBeenCalled();

package/src/queries/tvReviews.ts

@@ -1,9 +1,8 @@
 import { Core } from '@cachemap/core';
 import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
-import { type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
+import { type CreateResourceResolver, type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
 import { type TvReviewsArgs } from '@tmdb-graphql-api/schema/types';
-import { type FetchResponse } from 'getta';
 import { encode } from 'js-base64';
 import { REVIEWS, TV } from '../constants.ts';
 import {
@@ -25,24 +24,28 @@ export const createMakeCursors = (obj: RawTv) => {
   };
 };
 
-export const createResourceResolver =
-  (
-    obj: RawTvWithAppendToResponse & { __headers?: Headers },
-    _args: TvReviewsArgs,
-    { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context
-  ) =>
-  async ({ page }: { page: number }) => {
-    if (obj.reviews?.page === page && obj.__headers) {
-      setCacheMetadata(`${TV}.${REVIEWS}`, obj.__headers);
+const isRawTvWithReviews = (
+  obj: RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
+  page: number
+): obj is RawTvWithAppendToResponse & { __headers: Headers } =>
+  REVIEWS in obj && obj.reviews?.page === page && '__headers' in obj;
 
+export const createResourceResolver: CreateResourceResolver<
+  RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
+  TvReviewsArgs,
+  Context,
+  RawTvReviews
+> =
+  (obj, _args, { requestID, restClient, tmdbGuestSessionId }) =>
+  async ({ page }: { page: number }) => {
+    if (isRawTvWithReviews(obj, page)) {
       return {
         data: obj.reviews,
-        errors: [],
         headers: obj.__headers,
-      } as unknown as FetchResponse<RawTvReviews>;
+      };
     }
 
-    const result = await restClient.tv<RawTvReviews>(
+    const { data, errors, headers } = await restClient.tv<RawTvReviews>(
       {
         pathTemplateData: { id: obj.id, type: REVIEWS },
         queryParams: { page },
@@ -50,11 +53,11 @@ export const createResourceResolver =
       { requestID, tmdbGuestSessionId }
     );
 
-    if (result.data) {
-      setCacheMetadata(`${TV}.${REVIEWS}`, result.headers);
-    }
-
-    return result;
+    return {
+      data,
+      errors,
+      headers,
+    };
   };
 
 export const cursorCache = new Core({
@@ -65,10 +68,11 @@ export const cursorCache = new Core({
 });
 
 export const getters: Getters<RawTvReviews, RawReview> = {
-  nodes: ({ results }: RawTvReviews) => results,
-  page: ({ page }: RawTvReviews) => page,
-  totalPages: ({ total_pages }: RawTvReviews) => total_pages,
-  totalResults: ({ total_results }: RawTvReviews) => total_results,
+  // @ts-expect-error minor type mismatch
+  nodes: ({ results = [] }: RawTvReviews) => results,
+  page: ({ page = 0 }: RawTvReviews) => page,
+  totalPages: ({ total_pages = 0 }: RawTvReviews) => total_pages,
+  totalResults: ({ total_results = 0 }: RawTvReviews) => total_results,
 };
 
 export const resolveTvReviews = makeConnectionResolver({

package/src/queries/tvSimilarTvShows.test.ts

@@ -8,26 +8,36 @@ import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { decode } from 'js-base64';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { SIMILAR, TV } from '../constants.ts';
-import { type Context, type RawTv, type RawTvWithAppendToResponse } from '../types.ts';
+import { type Context } from '../types.ts';
 import { createMakeCursors, createResourceResolver, cursorCache, resolveTvSimilarTvShows } from './tvSimilarTvShows.ts';
 
 const mockedFetch = mockFetch(jest.fn);
 const id = 1399;
 
+const context = {
+  logger: createMockLogger(jest.fn),
+  restClient: createRestClient(),
+  setCacheMetadata: jest.fn(),
+  tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+} as unknown as Context;
+
+const info = {} as GraphQLResolveInfo;
+
 describe('createMakeCursors', () => {
   const GROUP_CURSOR = `${id}::${TV}::${SIMILAR}`;
 
   it('makeGroupCursor', () => {
-    const { makeGroupCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeGroupCursor } = createMakeCursors({ id });
     const groupCursor = makeGroupCursor();
     expect(decode(groupCursor)).toBe(GROUP_CURSOR);
   });
 
   it('makeIDCursor', () => {
     const similiarTvId = '6';
-    const { makeIDCursor } = createMakeCursors({ id } as unknown as RawTv);
+    const { makeIDCursor } = createMakeCursors({ id });
     const idCursor = makeIDCursor(similiarTvId);
     expect(decode(idCursor)).toBe(`${similiarTvId}::${GROUP_CURSOR}`);
   });
@@ -38,14 +48,16 @@ describe('createResourceResolver', () => {
     tv: jest.fn().mockReturnValue({}),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
-  const setCacheMetadata = jest.fn();
-
   it('when `restClient.tv` is called', async () => {
-    const resourceResolver = createResourceResolver({ id } as RawTvWithAppendToResponse, {}, {
-      restClient,
-      setCacheMetadata,
-      tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-    } as unknown as Context);
+    const resourceResolver = createResourceResolver(
+      { id },
+      {},
+      {
+        ...context,
+        restClient,
+      },
+      info
+    );
 
     await resourceResolver({ page: 1 });
 
@@ -60,9 +72,6 @@ describe('createResourceResolver', () => {
 });
 
 describe('resolveTvSimilarTvShows', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
-
   const mockEndpoint = (page: number, body: Jsonifiable) => {
     mockedFetch.mockGetOnce(buildEndpoint(TV_PATH, { id, type: SIMILAR }, { page }), {
       body,
@@ -70,49 +79,29 @@ describe('resolveTvSimilarTvShows', () => {
     });
   };
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
-
   beforeEach(() => {
     mockEndpoint(1, tvSimilarTvShows);
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
     await cursorCache.clear();
+    jest.clearAllMocks();
   });
 
   describe('when the first 5 are requested', () => {
     it('should return the correct response', async () => {
-      await expect(
-        resolveTvSimilarTvShows(
-          { id } as RawTvWithAppendToResponse,
-          { first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveTvSimilarTvShows({ id }, { first: 5 }, context, info)).resolves.toMatchSnapshot();
     });
   });
 
   describe('when the second 5 are requested', () => {
     it('should return the correct response', async () => {
-      const { pageInfo } = await resolveTvSimilarTvShows(
-        { id } as RawTvWithAppendToResponse,
-        { first: 5 },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      );
+      const { pageInfo } = await resolveTvSimilarTvShows({ id }, { first: 5 }, context, info);
 
       await expect(
-        resolveTvSimilarTvShows(
-          { id } as RawTvWithAppendToResponse,
-          { after: pageInfo.endCursor, first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
+        resolveTvSimilarTvShows({ id }, { after: pageInfo.endCursor, first: 5 }, context, info)
       ).resolves.toMatchSnapshot();
     });
   });
@@ -128,15 +117,15 @@ describe('resolveTvSimilarTvShows', () => {
           {
             ...tvDetails,
             __headers: new Headers(),
+            // @ts-expect-error minor type mismatch
             similar: tvSimilarTvShows,
-          } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+          },
           { first: 5 },
           {
+            ...context,
             restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -150,15 +139,15 @@ describe('resolveTvSimilarTvShows', () => {
         {
           ...tvDetails,
           __headers: new Headers(),
+          // @ts-expect-error minor type mismatch
           similar: tvSimilarTvShows,
-        } as unknown as RawTvWithAppendToResponse & { __headers?: Headers },
+        },
         { first: 5 },
         {
+          ...context,
           restClient: { tv: tvFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(tvFetchMock).not.toHaveBeenCalled();