BN-173|Fix Visit Location UUID

Author: Varun-beta

apps/registration/src/pages/createPatientPage/visitTypeSelector.tsx

@@ -5,9 +5,11 @@ import {
   notificationService,
   createVisit,
   getActiveVisitByPatient,
-  type CreateVisitRequest,
+  getUserLoginLocation,
+  getVisitLocationUUID,
   dispatchAuditEvent,
   AUDIT_LOG_EVENT_DETAILS,
+  type CreateVisitRequest,
   type AuditEventType,
 } from '@bahmni-frontend/bahmni-services';
 import { useQuery } from '@tanstack/react-query';
@@ -33,6 +35,13 @@ export const VisitTypeSelector = ({ onVisitSave }: VisitTypeSelectorProps) => {
     gcTime: 10 * 60 * 1000,
   });
 
+  const { data: visitLocationUUID } = useQuery({
+    queryKey: ['visitLocationUUID'],
+    queryFn: () => getVisitLocationUUID(getUserLoginLocation().uuid),
+    staleTime: 5 * 60 * 1000,
+    gcTime: 10 * 60 * 1000,
+  });
+
   const createVisitAndLogAudit = async () => {
     const result = await createVisit(visitPayload!);
 
@@ -95,21 +104,21 @@ export const VisitTypeSelector = ({ onVisitSave }: VisitTypeSelectorProps) => {
     const patientIndex = parts.indexOf('patient');
     const uuidFromUrl = patientIndex !== -1 ? parts[patientIndex + 1] : null;
 
-    if (!patientUUID) {
+    if (!patientUUID && visitLocationUUID) {
       if (uuidFromUrl) {
         setVisitPayload({
           patient: uuidFromUrl,
           visitType: selectedItem.uuid,
-          location: '72636eba-29bf-4d6c-97c4-4b04d87a95b5',
+          location: visitLocationUUID.uuid,
         });
         setPatientUUID(uuidFromUrl);
       } else {
         const newPatientUuid = await onVisitSave();
-        if (newPatientUuid) {
+        if (newPatientUuid && visitLocationUUID) {
           setVisitPayload({
             patient: newPatientUuid,
             visitType: selectedItem.uuid,
-            location: '72636eba-29bf-4d6c-97c4-4b04d87a95b5',
+            location: visitLocationUUID.uuid,
           });
         }
         setPatientUUID(newPatientUuid);

packages/bahmni-services/src/constants/app.ts

@@ -8,3 +8,5 @@ export const OBSERVATION_FORMS_URL =
   OPENMRS_REST_V1 + '/bahmniie/form/latestPublishedForms';
 export const USER_PINNED_PREFERENCE_URL = (userUuid: string) =>
   OPENMRS_REST_V1 + `/user/${userUuid}?v=full`;
+export const VISIT_LOCATION_UUID =
+  OPENMRS_REST_V1 + '/bahmnicore/visitLocation/';

packages/bahmni-services/src/index.ts

@@ -13,6 +13,7 @@ export {
   getGenders,
   getAddressHierarchyEntries,
   getVisitTypes,
+  getVisitLocationUUID,
   type FormattedPatientData,
   type PatientSearchResult,
   type PatientSearchResultBundle,
@@ -28,6 +29,7 @@ export {
   type PatientAttribute,
   type AddressHierarchyEntry,
   type VisitType,
+  type VisitLocationResponse,
 } from './patientService';
 export { getFormattedError } from './errorHandling';
 export {

packages/bahmni-services/src/patientService/__tests__/patientService.test.ts

@@ -31,6 +31,7 @@ import {
   getVisitTypes,
   createVisit,
   getActiveVisitByPatient,
+  getVisitLocationUUID,
 } from '../patientService';
 
 // Mock the api module
@@ -1723,4 +1724,20 @@ describe('Patient Service', () => {
       expect(result).toEqual(mockResponse);
     });
   });
+  describe('getVisitLocationUUID', () => {
+    it('should fetch visit location from login location', async () => {
+      const loginLocation = 'c22a5000-3f10-11e4-adec-0800271c1b75';
+      const mockResponse = { uuid: '72636eba-29bf-4d6c-97c4-4b04d87a95b5' };
+      mockedGet.mockResolvedValueOnce(mockResponse);
+
+      const result = await getVisitLocationUUID(loginLocation);
+
+      expect(mockedGet).toHaveBeenCalledWith(
+        expect.stringContaining(
+          `/ws/rest/v1/bahmnicore/visitLocation/${loginLocation}`,
+        ),
+      );
+      expect(result).toEqual(mockResponse);
+    });
+  });
 });

packages/bahmni-services/src/patientService/constants.ts

@@ -1,5 +1,9 @@
 import { PatientSearchField } from '../configService/models/registrationConfig';
-import { OPENMRS_FHIR_R4, OPENMRS_REST_V1 } from '../constants/app';
+import {
+  OPENMRS_FHIR_R4,
+  OPENMRS_REST_V1,
+  VISIT_LOCATION_UUID,
+} from '../constants/app';
 
 export const PATIENT_RESOURCE_URL = (patientUUID: string) =>
   OPENMRS_FHIR_R4 + `/Patient/${patientUUID}`;
@@ -89,6 +93,8 @@ export const GET_ACTIVE_VISIT_URL = (patientUuid: string) =>
   OPENMRS_REST_V1 +
   `/visit?includeInactive=false&patient=${patientUuid}&v=custom:(uuid,visitType,location:(uuid))`;
 
+export const GET_VISIT_LOCATION = (loginLocation: string) =>
+  VISIT_LOCATION_UUID + `${loginLocation}`;
 export const ADDRESS_HIERARCHY_URL = (
   addressField: string,
   searchString: string,

packages/bahmni-services/src/patientService/index.ts

@@ -11,6 +11,7 @@ export {
   getGenders,
   getAddressHierarchyEntries,
   getVisitTypes,
+  getVisitLocationUUID,
 } from './patientService';
 export {
   type FormattedPatientData,
@@ -28,4 +29,5 @@ export {
   type PatientAttribute,
   type AddressHierarchyEntry,
   type VisitType,
+  type VisitLocationResponse,
 } from './models';

packages/bahmni-services/src/patientService/models.ts

@@ -154,3 +154,7 @@ export interface CreateVisitRequest {
   visitType: string;
   location: string;
 }
+
+export interface VisitLocationResponse {
+  uuid: string;
+}

packages/bahmni-services/src/patientService/patientService.ts

@@ -19,6 +19,7 @@ import {
   ADDRESS_HIERARCHY_MIN_SEARCH_LENGTH,
   UUID_PATTERN,
   VISIT_TYPES_URL,
+  GET_VISIT_LOCATION,
 } from './constants';
 import {
   FormattedPatientData,
@@ -30,6 +31,7 @@ import {
   AddressHierarchyEntry,
   VisitType,
   CreateVisitRequest,
+  VisitLocationResponse,
 } from './models';
 
 export const getPatientById = async (patientUUID: string): Promise<Patient> => {
@@ -373,3 +375,9 @@ export const getActiveVisitByPatient = async (
 ): Promise<unknown> => {
   return get<unknown>(GET_ACTIVE_VISIT_URL(patientUuid));
 };
+
+export const getVisitLocationUUID = async (
+  loginLocation: string,
+): Promise<VisitLocationResponse> => {
+  return get<VisitLocationResponse>(GET_VISIT_LOCATION(loginLocation));
+};