BN-49. Lab investigation order requests shouldn't be getting duplicated when a user places an order and subsequently removes ordered requests. (#32)

arshiyaTW2021 · devsingh05298 · web-flow · commit 3b569effd3a9 · 2025-06-12T10:48:20.000+05:30
* BN-49| Add. count=100 for lab test pagination

* BN-49. Fix. Lab investigation order requests shouldn't get  duplicated when a user places an order and subsequently removes ordered requests.

* BN-49. fix: Add sort parameter to PATIENT_LAB_INVESTIGATION_RESOURCE_URL.

* BN-49| refactor: replaced FhirLabTestBundle  with the standard Bundle type and FhirLabTest with ServiceRequest from fhir/r4

* BN-49. fix: Failing tests after using Fhir Bundle and ServiceRequest instead of custom interface

---------

Co-authored-by: Dev Singh &lt;88476780+devsingh05298@users.noreply.github.com&gt;
diff --git a/src/__mocks__/labInvestigationMocks.ts b/src/__mocks__/labInvestigationMocks.ts
@@ -1,17 +1,15 @@
 import {
-  FhirLabTest,
-  FhirLabTestBundle,
   FormattedLabTest,
-  LabTestStatus,
   LabTestPriority,
   LabTestsByDate,
 } from '@types/labInvestigation';
+import { Bundle, ServiceRequest } from 'fhir/r4';
 
 // Mock patient UUID
 export const mockPatientUUID = 'test-patient-uuid';
 
 // Mock FHIR lab tests
-export const mockFhirLabTests: FhirLabTest[] = [
+export const mockFhirLabTests: ServiceRequest[] = [
   {
     resourceType: 'ServiceRequest',
     id: 'lab-test-1',
@@ -29,7 +27,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         valueString: 'Panel',
       },
     ],
-    status: 'Pending',
+    status: 'completed',
     intent: 'order',
     category: [
       {
@@ -43,7 +41,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         text: 'Laboratory',
       },
     ],
-    priority: 'Routine',
+    priority: 'routine',
     code: {
       coding: [
         {
@@ -94,7 +92,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         valueString: 'Panel',
       },
     ],
-    status: 'Pending',
+    status: 'revoked',
     intent: 'order',
     category: [
       {
@@ -108,7 +106,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         text: 'Laboratory',
       },
     ],
-    priority: 'Stat',
+    priority: 'stat',
     code: {
       coding: [
         {
@@ -158,7 +156,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         valueString: 'Test',
       },
     ],
-    status: 'Pending',
+    status: 'completed',
     intent: 'order',
     category: [
       {
@@ -172,7 +170,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
         text: 'Laboratory',
       },
     ],
-    priority: 'Routine',
+    priority: 'routine',
     code: {
       coding: [
         {
@@ -208,7 +206,7 @@ export const mockFhirLabTests: FhirLabTest[] = [
 ];
 
 // Mock FHIR lab test bundle
-export const mockFhirLabTestBundle: FhirLabTestBundle = {
+export const mockFhirLabTestBundle: Bundle = {
   resourceType: 'Bundle',
   id: 'test-bundle',
   meta: {
@@ -233,7 +231,6 @@ export const mockFormattedLabTests: FormattedLabTest[] = [
   {
     id: 'lab-test-1',
     testName: 'Complete Blood Count',
-    status: LabTestStatus.Pending,
     priority: LabTestPriority.routine,
     orderedBy: 'Dr. John Doe',
     orderedDate: '2025-03-25T06:48:32.000+00:00',
@@ -243,7 +240,6 @@ export const mockFormattedLabTests: FormattedLabTest[] = [
   {
     id: 'lab-test-2',
     testName: 'Lipid Panel',
-    status: LabTestStatus.Pending,
     priority: LabTestPriority.stat,
     orderedBy: 'Dr. Jane Smith',
     orderedDate: '2025-03-25T06:48:32.000+00:00',
@@ -253,7 +249,6 @@ export const mockFormattedLabTests: FormattedLabTest[] = [
   {
     id: 'lab-test-3',
     testName: 'Glucose Test',
-    status: LabTestStatus.Pending,
     priority: LabTestPriority.routine,
     orderedBy: 'Dr. John Doe',
     orderedDate: '2025-03-24T06:48:32.000+00:00',
@@ -277,7 +272,7 @@ export const mockLabTestsByDate: LabTestsByDate[] = [
 ];
 
 // Mock lab test with missing optional fields
-export const mockLabTestWithMissingFields: FhirLabTest = {
+export const mockLabTestWithMissingFields: ServiceRequest = {
   resourceType: 'ServiceRequest',
   id: 'lab-test-incomplete',
   meta: {
@@ -290,7 +285,7 @@ export const mockLabTestWithMissingFields: FhirLabTest = {
       valueString: 'Test',
     },
   ],
-  status: 'Pending',
+  status: 'completed',
   intent: 'order',
   category: [
     {
@@ -304,7 +299,7 @@ export const mockLabTestWithMissingFields: FhirLabTest = {
       text: 'Laboratory',
     },
   ],
-  priority: 'Routine',
+  priority: 'routine',
   code: {
     coding: [
       {
@@ -337,7 +332,6 @@ export const mockLabTestWithMissingFields: FhirLabTest = {
 export const mockFormattedLabTestWithMissingFields: FormattedLabTest = {
   id: 'lab-test-incomplete',
   testName: 'Incomplete Test',
-  status: LabTestStatus.Pending,
   priority: LabTestPriority.routine,
   orderedBy: 'Unknown Doctor',
   orderedDate: '2025-03-25T06:48:32.000+00:00',
diff --git a/src/constants/app.ts b/src/constants/app.ts
@@ -27,7 +27,7 @@ export const PATIENT_VISITS_URL = (patientUUID: string) =>
   OPENMRS_FHIR_R4 + `/Encounter?subject:Patient=${patientUUID}&_tag=visit`;
 export const PATIENT_LAB_INVESTIGATION_RESOURCE_URL = (patientUUID: string) =>
   OPENMRS_FHIR_R4 +
-  `/ServiceRequest?category=${LAB_ORDER_TYPE_UUID}&patient=${patientUUID}&numberOfVisits=5`;
+  `/ServiceRequest?category=${LAB_ORDER_TYPE_UUID}&patient=${patientUUID}&numberOfVisits=5&_count=100&_sort=_lastUpdated`;
 export const DASHBOARD_CONFIG_URL = (dashboardURL: string) =>
   `/bahmni_config/openmrs/apps/clinical/v2/dashboards/${dashboardURL}`;
 export const PATIENT_DIAGNOSIS_RESOURCE_URL = (patientUUID: string) =>
diff --git a/src/displayControls/labinvestigation/__tests__/LabInvestigationControl.test.tsx b/src/displayControls/labinvestigation/__tests__/LabInvestigationControl.test.tsx
@@ -5,7 +5,6 @@ import useLabInvestigations from '@hooks/useLabInvestigations';
 import { groupLabTestsByDate } from '@services/labInvestigationService';
 import {
   LabTestsByDate,
-  LabTestStatus,
   LabTestPriority,
   FormattedLabTest,
 } from '@types/labInvestigation';
@@ -25,7 +24,6 @@ jest.mock('../LabInvestigationItem', () => ({
   default: ({ test }: { test: FormattedLabTest }) => (
     <div data-testid="lab-investigation-item">
       <span data-testid="test-name">{test.testName}</span>
-      <span data-testid="test-status">{test.status}</span>
       <span data-testid="test-priority">{test.priority}</span>
     </div>
   ),
@@ -72,7 +70,6 @@ describe('LabInvestigationControl', () => {
     {
       id: 'test-1',
       testName: 'Complete Blood Count',
-      status: LabTestStatus.Normal,
       priority: LabTestPriority.routine,
       orderedBy: 'Dr. Smith',
       orderedDate: '2025-05-08T12:44:24+00:00',
@@ -83,7 +80,6 @@ describe('LabInvestigationControl', () => {
     {
       id: 'test-2',
       testName: 'Lipid Panel',
-      status: LabTestStatus.Abnormal,
       priority: LabTestPriority.stat,
       orderedBy: 'Dr. Johnson',
       orderedDate: '2025-04-09T13:21:22+00:00',
@@ -94,7 +90,6 @@ describe('LabInvestigationControl', () => {
     {
       id: 'test-3',
       testName: 'Liver Function',
-      status: LabTestStatus.Pending,
       priority: LabTestPriority.routine,
       orderedBy: 'Dr. Williams',
       orderedDate: '2025-04-09T13:21:22+00:00',
@@ -171,13 +166,6 @@ describe('LabInvestigationControl', () => {
     expect(testNames[1].textContent).toBe('Lipid Panel');
     expect(testNames[2].textContent).toBe('Liver Function');
 
-    // Check that the test statuses are displayed
-    const testStatuses = screen.getAllByTestId('test-status');
-    expect(testStatuses).toHaveLength(3);
-    expect(testStatuses[0].textContent).toBe(LabTestStatus.Normal);
-    expect(testStatuses[1].textContent).toBe(LabTestStatus.Abnormal);
-    expect(testStatuses[2].textContent).toBe(LabTestStatus.Pending);
-
     // Check that the test priorities are displayed
     const testPriorities = screen.getAllByTestId('test-priority');
     expect(testPriorities).toHaveLength(3);
diff --git a/src/displayControls/labinvestigation/__tests__/LabInvestigationItem.test.tsx b/src/displayControls/labinvestigation/__tests__/LabInvestigationItem.test.tsx
@@ -1,11 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import LabInvestigationItem from '../LabInvestigationItem';
-import {
-  FormattedLabTest,
-  LabTestStatus,
-  LabTestPriority,
-} from '@types/labInvestigation';
+import { FormattedLabTest, LabTestPriority } from '@types/labInvestigation';
 import { useTranslation } from 'react-i18next';
 
 // Mock the BahmniIcon component
@@ -26,7 +22,6 @@ describe('LabInvestigationItem', () => {
   const mockLabTest: FormattedLabTest = {
     id: 'test-123',
     testName: 'Complete Blood Count',
-    status: LabTestStatus.Normal,
     priority: LabTestPriority.routine,
     orderedBy: 'Dr. Smith',
     orderedDate: '2025-05-08T12:44:24+00:00',
diff --git a/src/hooks/__tests__/useLabInvestigations.test.tsx b/src/hooks/__tests__/useLabInvestigations.test.tsx
@@ -5,7 +5,6 @@ import { getLabTests, formatLabTests } from '@services/labInvestigationService';
 import { usePatientUUID } from '@hooks/usePatientUUID';
 import {
   FormattedLabTest,
-  LabTestStatus,
   LabTestPriority,
 } from '../../types/labInvestigation';
 
@@ -35,7 +34,6 @@ describe('useLabInvestigations', () => {
     {
       id: 'aba2a637-05f5-44c6-9021-c5cd05548342',
       testName: 'CD8%',
-      status: LabTestStatus.Normal,
       priority: LabTestPriority.routine,
       orderedBy: 'Super Man',
       orderedDate: '2025-05-08T12:44:24+00:00',
@@ -46,7 +44,6 @@ describe('useLabInvestigations', () => {
     {
       id: '29e240ce-5a3d-4643-8d4b-ca5b4cbf665d',
       testName: 'Absolute eosinophil count test',
-      status: LabTestStatus.Normal,
       priority: LabTestPriority.routine,
       orderedBy: 'Super Man',
       orderedDate: '2025-04-09T13:21:22+00:00',
@@ -57,7 +54,6 @@ describe('useLabInvestigations', () => {
     {
       id: 'e7eca932-1d6f-44a4-bd94-e1105860ab77',
       testName: 'Clotting Panel',
-      status: LabTestStatus.Normal,
       priority: LabTestPriority.routine,
       orderedBy: 'Super Man',
       orderedDate: '2025-04-09T13:21:22+00:00',
diff --git a/src/services/__tests__/labInvestigationService.internal.test.ts b/src/services/__tests__/labInvestigationService.internal.test.ts
@@ -1,16 +1,12 @@
-import {
-  FhirLabTest,
-  LabTestStatus,
-  LabTestPriority,
-} from '../../types/labInvestigation';
+import { LabTestPriority } from '../../types/labInvestigation';
 import { getFormattedError } from '../../utils/common';
 import notificationService from '../notificationService';
 import {
-  mapLabTestStatus,
   mapLabTestPriority,
   getPatientLabTestsByDate,
 } from '../labInvestigationService';
 import * as api from '../api';
+import { ServiceRequest } from 'fhir/r4';
 
 // Mock dependencies
 jest.mock('../../utils/common');
@@ -26,44 +22,22 @@ describe('labInvestigationService internal functions', () => {
     });
   });
 
-  describe('mapLabTestStatus', () => {
-    it('should map known status values correctly', () => {
-      const pendingTest = { status: 'Pending' } as FhirLabTest;
-      const abnormalTest = { status: 'Abnormal' } as FhirLabTest;
-      const normalTest = { status: 'Normal' } as FhirLabTest;
-
-      expect(mapLabTestStatus(pendingTest)).toBe(LabTestStatus.Pending);
-      expect(mapLabTestStatus(abnormalTest)).toBe(LabTestStatus.Abnormal);
-      expect(mapLabTestStatus(normalTest)).toBe(LabTestStatus.Normal);
-    });
-
-    it('should default to Normal for unknown, null, or undefined status', () => {
-      const unknownTest = { status: 'Unknown' } as FhirLabTest;
-      const nullTest = { status: null } as unknown as FhirLabTest;
-      const undefinedTest = { status: undefined } as unknown as FhirLabTest;
-      const emptyTest = {} as FhirLabTest;
-
-      expect(mapLabTestStatus(unknownTest)).toBe(LabTestStatus.Normal);
-      expect(mapLabTestStatus(nullTest)).toBe(LabTestStatus.Normal);
-      expect(mapLabTestStatus(undefinedTest)).toBe(LabTestStatus.Normal);
-      expect(mapLabTestStatus(emptyTest)).toBe(LabTestStatus.Normal);
-    });
-  });
-
   describe('mapLabTestPriority', () => {
     it('should map known priority values correctly', () => {
-      const routineTest = { priority: 'routine' } as FhirLabTest;
-      const statTest = { priority: 'stat' } as FhirLabTest;
+      const routineTest = { priority: 'routine' } as ServiceRequest;
+      const statTest = { priority: 'stat' } as ServiceRequest;
 
       expect(mapLabTestPriority(routineTest)).toBe(LabTestPriority.routine);
       expect(mapLabTestPriority(statTest)).toBe(LabTestPriority.stat);
     });
 
     it('should default to routine for unknown, null, or undefined priority', () => {
-      const unknownTest = { priority: 'unknown' } as FhirLabTest;
-      const nullTest = { priority: null } as unknown as FhirLabTest;
-      const undefinedTest = { priority: undefined } as unknown as FhirLabTest;
-      const emptyTest = {} as FhirLabTest;
+      const unknownTest = { priority: 'unknown' } as unknown as ServiceRequest;
+      const nullTest = { priority: null } as unknown as ServiceRequest;
+      const undefinedTest = {
+        priority: undefined,
+      } as unknown as ServiceRequest;
+      const emptyTest = {} as ServiceRequest;
 
       expect(mapLabTestPriority(unknownTest)).toBe(LabTestPriority.routine);
       expect(mapLabTestPriority(nullTest)).toBe(LabTestPriority.routine);
diff --git a/src/services/__tests__/labInvestigationService.test.ts b/src/services/__tests__/labInvestigationService.test.ts
diff --git a/src/services/labInvestigationService.ts b/src/services/labInvestigationService.ts
diff --git a/src/types/labInvestigation.ts b/src/types/labInvestigation.ts
