Skip to content

Remove undefined entities when executing Fetch of query plan #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 31, 2021
Merged

Remove undefined entities when executing Fetch of query plan #612

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f6b0fa0
Remove undefined entities from fetch
michael-watson Mar 26, 2021
bdc6eaa
Optimization should only happen when all entities are undefined
michael-watson Mar 27, 2021
37cb0e9
Filter out null or undefined entities when executing fetch
martijnwalraven Mar 28, 2021
c51941a
Address comment r603031025
michael-watson Mar 29, 2021
c13d797
Initial Test
michael-watson Mar 30, 2021
95a8edb
Update gateway-js/src/__tests__/executeQueryPlan.test.ts
michael-watson Mar 30, 2021
8c6d1b8
Update gateway-js/src/__tests__/executeQueryPlan.test.ts
michael-watson Mar 30, 2021
f19769f
expose reviewsData from fixture to be used in a new test scenario
michael-watson Mar 30, 2021
1edc95e
Fix test for undefined entities to hit the actual issue
martijnwalraven Mar 31, 2021
3f9f0d4
Add test for additional scenario and fix issue
martijnwalraven Mar 31, 2021
75abe79
Add CHANGELOG.md for #612.
abernix Mar 31, 2021
c351330
Apply the export fixtures data pattern uniformly across other fixture…
abernix Mar 31, 2021
7bbb5df
Remove now-unused change in previous commit and the unused import. ;)
abernix Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions gateway-js/src/executeQueryPlan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
getResponseName
} from '@apollo/query-planner';
import { deepMerge } from './utilities/deepMerge';
import { isNotNullOrUndefined } from '@apollographql/apollo-tools';

export type ServiceMap = {
[serviceName: string]: GraphQLDataSource;
Expand Down Expand Up @@ -192,7 +193,7 @@ async function executeNode<TContext>(
async function executeFetch<TContext>(
context: ExecutionContext<TContext>,
fetch: FetchNode,
results: ResultMap | ResultMap[],
results: ResultMap | (ResultMap | null | undefined)[],
_path: ResponsePath,
traceNode: Trace.QueryPlanNode.FetchNode | null,
): Promise<void> {
Expand All @@ -202,7 +203,14 @@ async function executeFetch<TContext>(
throw new Error(`Couldn't find service with name "${fetch.serviceName}"`);
}

const entities = Array.isArray(results) ? results : [results];
let entities: ResultMap[];
if (Array.isArray(results)) {
// Remove null or undefined entities from the list
entities = results.filter(isNotNullOrUndefined);
} else {
entities = [results];
}

if (entities.length < 1) return;

let variables = Object.create(null);
Expand Down