Add example of extraction test for aboriginal form

Author: ruscoder

apps/smart-forms-app/src/test/aboriginalFormExtraction.test.tsx

@@ -1,6 +1,8 @@
-import { render } from '@testing-library/react';
-import { AboriginalForm, runExtract } from './aboriginalFormUtils';
-import { condition, patient, resolvedCondition } from './aboriginalFormIntegrationData';
+import { vi, beforeAll } from 'vitest';
+import { render, waitFor } from '@testing-library/react';
+import { AboriginalForm } from './aboriginalFormUtils';
+import { nonSnomedCondition, patient } from './aboriginalFormIntegrationData';
+import { findByLinkIdOrLabel, inputDate, inputText, invokeExtract, selectTab } from './testUtils';
 import { FhirResource } from 'fhir/r4';
 
 vi.mock('fhirclient', () => ({
@@ -17,20 +19,32 @@ beforeAll(() => {
 
 describe('Extraction workflow for', () => {
   test('Conditions', async () => {
-    const { container } = render(<AboriginalForm patient={patient} requestDefinitions={[]} />);
-
-    // Fill condition table with data from condition
-    // Fill condition table with data from resolvedCondition
-
-    const extractedBundle = await runExtract({}, {});
-    expect(extractedBundle.entry).toHaveLength(2);
-
-    expect(extractedBundle.entry?.[0]?.resource).toStrictEqual(removeId(condition));
-    expect(extractedBundle.entry?.[1]?.resource).toStrictEqual(removeId(resolvedCondition));
+    const onExtractResult = vi.fn();
+    const { container } = render(
+      <AboriginalForm patient={patient} requestDefinitions={[]} onExtractResult={onExtractResult} />
+    );
+    await waitFor(() => expect(container.innerHTML).toContain('Patient Details'), {
+      timeout: 5000
+    });
+    await selectTab(container, 'Medical history and current problems');
+    const newDiagnosisContainer = await findByLinkIdOrLabel(container, 'New diagnosis');
+    await inputText(newDiagnosisContainer, 'Condition', 'Non-SNOMED condition');
+    await inputDate(newDiagnosisContainer, 'Onset date', '10/10/2025');
+    await inputText(newDiagnosisContainer, 'Comment', 'Test comment');
+    
+    const extractedBundle = await invokeExtract(container, onExtractResult);
+    expect(extractedBundle.entry).toHaveLength(1);
+    // Verification status is not extracted
+    expect(extractedBundle.entry?.[0]?.resource).toStrictEqual(
+      omitResourceFields(nonSnomedCondition, ['id', 'verificationStatus'])
+    );
   });
 });
 
-function removeId(resource: FhirResource) {
-  const { id, ...resourceWithoutId } = resource;
-  return resourceWithoutId;
+function omitResourceFields<T extends FhirResource>(resource: T, fieldsToRemove: (keyof T)[]) {
+  const resourceCopy = { ...resource };
+  fieldsToRemove.forEach((field) => {
+    delete resourceCopy[field];
+  });
+  return resourceCopy;
 }

apps/smart-forms-app/src/test/aboriginalFormIntegrationData.ts

@@ -211,8 +211,8 @@ export const patient: Patient = {
   ]
 };
 
-const onsetDateTime = '2025-10-10T00:00:00.000Z';
-const abatementDateTime = '2026-01-01T00:00:00.000Z';
+const onsetDateTime = '2025-10-10';
+const abatementDateTime = '2026-01-01';
 
 export const condition: Condition = {
   resourceType: 'Condition',
@@ -261,13 +261,6 @@ export const nonSnomedCondition: Condition = {
   subject: { reference: `Patient/${patient.id}` },
   onsetDateTime,
   code: {
-    coding: [
-      {
-        system: 'http://loinc.org',
-        code: '78910',
-        display: 'Non-SNOMED condition'
-      }
-    ],
     text: 'Non-SNOMED condition'
   },
   clinicalStatus: {
@@ -294,6 +287,11 @@ export const nonSnomedCondition: Condition = {
         }
       ]
     }
+  ],
+  note: [
+    {
+      text: 'Test comment'
+    }
   ]
 };
 

apps/smart-forms-app/src/test/aboriginalFormUtils.tsx

@@ -2,16 +2,19 @@ import {
   BaseRenderer,
   buildForm,
   RendererThemeProvider,
+  useQuestionnaireResponseStore,
+  useQuestionnaireStore,
   useRendererQueryClient
 } from '@aehrc/smart-forms-renderer';
 
 import aboriginalForm from '../data/resources/Questionnaire/Questionnaire-AboriginalTorresStraitIslanderHealthCheckAssembled-0.4.0.json';
-import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import type { Questionnaire } from 'fhir/r4';
 import { QueryClientProvider } from '@tanstack/react-query';
 import type { Patient } from 'fhir/r4';
 import { populateQuestionnaire } from '@aehrc/sdc-populate';
 import { useEffect, useState } from 'react';
-import { extractResultIsOperationOutcome, inAppExtract } from '@aehrc/sdc-template-extract';
+import { inAppExtract, type InAppExtractOutput } from '@aehrc/sdc-template-extract';
+import Button from '@mui/material/Button';
 const terminologyServerUrl = 'https://r4.ontoserver.csiro.au/fhir';
 
 export type RequestDefinition = {
@@ -23,6 +26,7 @@ export type RequestDefinition = {
 interface AboriginalFormProps {
   patient?: Patient;
   requestDefinitions?: RequestDefinition[];
+  onExtractResult?: (extractResult: InAppExtractOutput) => void;
 }
 
 export function AboriginalForm(props: AboriginalFormProps) {
@@ -91,6 +95,7 @@ function BuildFormWrapperWithPopulate(props: BuildFormWrapperWithPopulateProps)
     <RendererThemeProvider>
       <QueryClientProvider client={queryClient}>
         <BaseRenderer />
+        <SaveControl onExtractResult={props.onExtractResult} />
       </QueryClientProvider>
     </RendererThemeProvider>
   );
@@ -127,20 +132,23 @@ function buildFetchResourceCallback(requestDefinitions: RequestDefinition[]) {
   };
 }
 
-export async function runExtract(
-  questionnaireResponse: QuestionnaireResponse,
-  questionnaire: Questionnaire
-) {
-  const inAppExtractOutput = await inAppExtract(questionnaireResponse, questionnaire, null);
+function SaveControl({
+  onExtractResult
+}: {
+  onExtractResult?: (extractResult: InAppExtractOutput) => void;
+}) {
+  const qr = useQuestionnaireResponseStore.use.updatableResponse();
+  const q = useQuestionnaireStore.use.sourceQuestionnaire();
 
-  if (!inAppExtractOutput.extractSuccess) {
-    throw new Error('Extract failed');
-  }
-
-  const extractResult = inAppExtractOutput.extractResult;
-  if (extractResultIsOperationOutcome(extractResult)) {
-    throw new Error('Extract failed');
-  }
-
-  return extractResult.extractedBundle;
-}
+  return (
+    <Button
+      data-testid="save-button"
+      onClick={async () => {
+        const result = await inAppExtract(qr, q, null);
+
+        onExtractResult?.(result);
+      }}>
+      Save
+    </Button>
+  );
+}

apps/smart-forms-app/src/test/testUtils.ts

@@ -21,9 +21,12 @@
 // 2. Prevent it from showing up in typedoc in the documentation site, which will affect docs search
 
 import { evaluate } from 'fhirpath';
+import type { Mock } from 'storybook/internal/test';
 import { fireEvent, screen, userEvent, waitFor } from 'storybook/internal/test';
 import { questionnaireResponseStore } from '@aehrc/smart-forms-renderer';
 import { act } from 'react';
+import type { ExtractResult, InAppExtractOutput } from '@aehrc/sdc-template-extract';
+import { extractResultIsOperationOutcome } from '@aehrc/sdc-template-extract';
 
 export async function inputText(
   canvasElement: HTMLElement,
@@ -431,3 +434,36 @@ export function getBirthDateForAge(ageInYears: number): string {
   const birthDate = new Date(today.getFullYear() - ageInYears, today.getMonth(), today.getDate());
   return birthDate.toISOString().slice(0, 10);
 }
+
+export async function invokeExtract(
+  canvasElement: HTMLElement,
+  onExtractResultMock: Mock<(extractResult: InAppExtractOutput) => void>
+) {
+  const button = canvasElement.querySelector('button[data-testid="save-button"]');
+  if (!button) {
+    throw new Error('Save button not found');
+  }
+  await act(async () => {
+    fireEvent.click(button);
+  });
+
+  await waitFor(() => expect(onExtractResultMock.mock.lastCall).toBeDefined(), {
+    timeout: 5000
+  });
+
+  const lastCall = onExtractResultMock.mock.lastCall;
+  if (!lastCall) {
+    throw new Error('Expected onExtractResult to be called');
+  }
+  console.log('lastCall', lastCall[0]);
+
+  return getExtractResultBundle(lastCall[0]);
+}
+
+function getExtractResultBundle(extractResultOutput: InAppExtractOutput) {
+  expect(extractResultOutput.extractSuccess).toBe(true);
+  const extractResult = extractResultOutput.extractResult as ExtractResult;
+  expect(extractResultIsOperationOutcome(extractResult)).toBe(false);
+
+  return extractResult.extractedBundle;
+}