Fixes #3905 - better graphql mutation error reporting (#4308)

medplum · Apr 4, 2024 · ef42053 · ef42053
1 parent 4306ebc
commit ef42053
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 13 deletions.
diff --git a/packages/fhir-router/src/graphql/graphql.test.ts b/packages/fhir-router/src/graphql/graphql.test.ts
@@ -1105,6 +1105,49 @@ describe('GraphQL', () => {
  expect(retrievePatient.name?.[0].given).toEqual(['Bob']);
  });
 
+ test('Create wrong resourceType error', async () => {
+ const request: FhirRequest = {
+ method: 'POST',
+ pathname: '/fhir/R4/$graphql',
+ query: {},
+ params: {},
+ body: {
+ query: `
+ mutation {
+ PatientCreate(res: { resourceType: "ServiceRequest" }) { id }
+ }
+ `,
+ },
+ };
+ const fhirRouter = new FhirRouter();
+ const res = await graphqlHandler(request, repo, fhirRouter);
+ expect(res).toMatchObject([
+ {
+ resourceType: 'OperationOutcome',
+ id: 'ok',
+ issue: [
+ {
+ severity: 'information',
+ code: 'informational',
+ details: { text: 'All OK' },
+ },
+ ],
+ },
+ {
+ errors: [
+ {
+ message: 'Invalid resourceType',
+ locations: [{ line: 3, column: 9 }],
+ path: ['PatientCreate'],
+ },
+ ],
+ data: {
+ PatientCreate: null,
+ },
+ },
+ ]);
+ });
+
  test('Updating Patient Record', async () => {
  const patient = await repo.createResource<Patient>({
  resourceType: 'Patient',
@@ -1188,6 +1231,110 @@ describe('GraphQL', () => {
  );
  });
 
+ test('Update wrong resourceType error', async () => {
+ const patient = await repo.createResource<Patient>({ resourceType: 'Patient' });
+ const request: FhirRequest = {
+ method: 'POST',
+ pathname: '/fhir/R4/$graphql',
+ query: {},
+ params: {},
+ body: {
+ query: `
+ mutation {
+ PatientUpdate(
+ id: "${patient.id}"
+ res: {
+ resourceType: "ServiceRequest"
+ id: "${patient.id}"
+ }
+ ) {
+ id
+ }
+ }
+ `,
+ },
+ };
+ const fhirRouter = new FhirRouter();
+ const res = await graphqlHandler(request, repo, fhirRouter);
+ expect(res).toMatchObject([
+ {
+ resourceType: 'OperationOutcome',
+ id: 'ok',
+ issue: [
+ {
+ severity: 'information',
+ code: 'informational',
+ details: { text: 'All OK' },
+ },
+ ],
+ },
+ {
+ errors: [
+ {
+ message: 'Invalid resourceType',
+ locations: [{ line: 3, column: 9 }],
+ path: ['PatientUpdate'],
+ },
+ ],
+ data: {
+ PatientUpdate: null,
+ },
+ },
+ ]);
+ });
+
+ test('Update wrong ID error', async () => {
+ const patient = await repo.createResource<Patient>({ resourceType: 'Patient' });
+ const request: FhirRequest = {
+ method: 'POST',
+ pathname: '/fhir/R4/$graphql',
+ query: {},
+ params: {},
+ body: {
+ query: `
+ mutation {
+ PatientUpdate(
+ id: "${patient.id}"
+ res: {
+ resourceType: "Patient"
+ id: "${randomUUID()}"
+ }
+ ) {
+ id
+ }
+ }
+ `,
+ },
+ };
+ const fhirRouter = new FhirRouter();
+ const res = await graphqlHandler(request, repo, fhirRouter);
+ expect(res).toMatchObject([
+ {
+ resourceType: 'OperationOutcome',
+ id: 'ok',
+ issue: [
+ {
+ severity: 'information',
+ code: 'informational',
+ details: { text: 'All OK' },
+ },
+ ],
+ },
+ {
+ errors: [
+ {
+ message: 'Invalid ID',
+ locations: [{ line: 3, column: 9 }],
+ path: ['PatientUpdate'],
+ },
+ ],
+ data: {
+ PatientUpdate: null,
+ },
+ },
+ ]);
+ });
+
  test('Delete Patient Record', async () => {
  const patient = await repo.createResource<Patient>({
  resourceType: 'Patient',

diff --git a/packages/fhir-router/src/graphql/graphql.ts b/packages/fhir-router/src/graphql/graphql.ts
@@ -350,18 +350,14 @@ async function resolveByCreate(
  info: GraphQLResolveInfo
 ): Promise<any> {
  const fieldName = info.fieldName;
- // 'Create.length'=== 6 && 'Update.length' === 6
- const resourceType = fieldName.substring(0, fieldName.length - 6) as ResourceType;
+ const resourceType = fieldName.substring(0, fieldName.length - 'Create'.length) as ResourceType;
  const resourceArgs = args.res;
  if (resourceArgs.resourceType !== resourceType) {
- return [badRequest('Invalid resourceType')];
+ throw new OperationOutcomeError(badRequest('Invalid resourceType'));
  }
- const resource = await ctx.repo.createResource(resourceArgs as Resource);
- return resource;
+ return ctx.repo.createResource(resourceArgs as Resource);
 }
 
-// Mutation Resolvers
-
 /**
  * GraphQL resolver function for update requests.
  * The field name should end with "Update" (i.e., "PatientUpdate" for updating a Patient).
@@ -379,18 +375,16 @@ async function resolveByUpdate(
  info: GraphQLResolveInfo
 ): Promise<any> {
  const fieldName = info.fieldName;
- // 'Create.length'=== 6 && 'Update.length' === 6
- const resourceType = fieldName.substring(0, fieldName.length - 6) as ResourceType;
+ const resourceType = fieldName.substring(0, fieldName.length - 'Update'.length) as ResourceType;
  const resourceArgs = args.res;
  const resourceId = args.id;
  if (resourceArgs.resourceType !== resourceType) {
- return [badRequest('Invalid resourceType')];
+ throw new OperationOutcomeError(badRequest('Invalid resourceType'));
  }
  if (resourceId !== resourceArgs.id) {
- return [badRequest('Incorrect ID')];
+ throw new OperationOutcomeError(badRequest('Invalid ID'));
  }
- const resource = await ctx.repo.updateResource(resourceArgs as Resource);
- return resource;
+ return ctx.repo.updateResource(resourceArgs as Resource);
 }
 
 /**