BN-173|Fix models for Active Visit and tests

Author: Varun-beta

apps/registration/src/pages/createPatientPage/__tests__/index.test.tsx

@@ -65,6 +65,16 @@ jest.mock('@bahmni-frontend/bahmni-services', () => ({
   getGenders: jest.fn(),
   createPatient: jest.fn(),
   getAddressHierarchyEntries: jest.fn(),
+  getUserLoginLocation: jest.fn(() => ({
+    uuid: 'test-location-uuid',
+    name: 'Test Location',
+  })),
+  getVisitLocationUUID: jest.fn(() =>
+    Promise.resolve({ uuid: '72636eba-29bf-4d6c-97c4-4b04d87a95b5' }),
+  ),
+  getVisitTypes: jest.fn(() => Promise.resolve([])),
+  getActiveVisitByPatient: jest.fn(() => Promise.resolve({ results: [] })),
+  createVisit: jest.fn(() => Promise.resolve({})),
   notificationService: {
     showSuccess: jest.fn(),
     showError: jest.fn(),

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

@@ -9,6 +9,7 @@ const mockGetVisitTypes = jest.fn();
 const mockCreateVisit = jest.fn();
 const mockGetUserLoginLocation = jest.fn();
 const mockGetActiveVisitByPatient = jest.fn();
+const mockGetVisitLocationUUID = jest.fn();
 
 const mockNotificationService = {
   showError: jest.fn(),
@@ -21,6 +22,8 @@ jest.mock('@bahmni-frontend/bahmni-services', () => ({
   getUserLoginLocation: () => mockGetUserLoginLocation(),
   getActiveVisitByPatient: (patientUuid: string) =>
     mockGetActiveVisitByPatient(patientUuid),
+  getVisitLocationUUID: (loginLocation: string) =>
+    mockGetVisitLocationUUID(loginLocation),
   get notificationService() {
     return mockNotificationService;
   },
@@ -67,6 +70,9 @@ describe('VisitTypeSelector', () => {
     mockGetUserLoginLocation.mockReturnValue(mockLoginLocation);
     mockGetVisitTypes.mockResolvedValue(mockVisitTypes);
     mockGetActiveVisitByPatient.mockResolvedValue({ results: [] });
+    mockGetVisitLocationUUID.mockResolvedValue({
+      uuid: '72636eba-29bf-4d6c-97c4-4b04d87a95b5',
+    });
     mockCreateVisit.mockResolvedValue({
       location: mockLoginLocation.uuid,
       patient: '9891a8b4-7404-4c05-a207-5ec9d34fc719',

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

@@ -36,7 +36,7 @@ export const VisitTypeSelector = ({ onVisitSave }: VisitTypeSelectorProps) => {
   });
 
   const { data: visitLocationUUID } = useQuery({
-    queryKey: ['visitLocationUUID'],
+    queryKey: ['visitLocationUUID', getUserLoginLocation().uuid],
     queryFn: () => getVisitLocationUUID(getUserLoginLocation().uuid),
     staleTime: 5 * 60 * 1000,
     gcTime: 10 * 60 * 1000,

packages/bahmni-services/src/index.ts

@@ -30,6 +30,7 @@ export {
   type AddressHierarchyEntry,
   type VisitType,
   type VisitLocationResponse,
+  type ActiveVisit,
 } from './patientService';
 export { getFormattedError } from './errorHandling';
 export {

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

@@ -30,4 +30,5 @@ export {
   type AddressHierarchyEntry,
   type VisitType,
   type VisitLocationResponse,
+  type ActiveVisit,
 } from './models';

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

@@ -158,3 +158,7 @@ export interface CreateVisitRequest {
 export interface VisitLocationResponse {
   uuid: string;
 }
+
+export interface ActiveVisit {
+  results: unknown[];
+}

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

@@ -32,6 +32,7 @@ import {
   VisitType,
   CreateVisitRequest,
   VisitLocationResponse,
+  ActiveVisit,
 } from './models';
 
 export const getPatientById = async (patientUUID: string): Promise<Patient> => {
@@ -359,6 +360,11 @@ export const getVisitTypes = async (): Promise<VisitType[]> => {
   }));
 };
 
+/**
+ * Create a new visit for a patient
+ * @param visitData - The visit data including patient UUID, visit type, and location
+ * @returns Promise<unknown> - The created visit object
+ */
 export const createVisit = async (
   visitData: CreateVisitRequest,
 ): Promise<unknown> => {
@@ -368,14 +374,19 @@ export const createVisit = async (
 /**
  * Get active visits for a patient
  * @param patientUuid - The UUID of the patient
- * @returns Promise<unknown> - The active visit data
+ * @returns Promise<ActiveVisit> - The active visit data
  */
 export const getActiveVisitByPatient = async (
   patientUuid: string,
-): Promise<unknown> => {
-  return get<unknown>(GET_ACTIVE_VISIT_URL(patientUuid));
+): Promise<ActiveVisit> => {
+  return get<ActiveVisit>(GET_ACTIVE_VISIT_URL(patientUuid));
 };
 
+/**
+ * Get visit location UUID for a given login location
+ * @param loginLocation - The login location UUID
+ * @returns Promise<VisitLocationResponse> - The visit location details including UUID
+ */
 export const getVisitLocationUUID = async (
   loginLocation: string,
 ): Promise<VisitLocationResponse> => {