BN-173 | Refactor.Models to NewVi

sitData and Tests

Author: Aishwarya-thoughtworks

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

@@ -40,13 +40,13 @@ jest.mock('@bahmni-frontend/bahmni-services', () => ({
   dispatchAuditEvent: jest.fn(),
 }));
 
-const mockVisitTypes = [
-  { name: 'EMERGENCY', uuid: '493ebb53-b2bd-4ced-b444-e0965804d771' },
-  { name: 'OPD', uuid: '54f43754-c6ce-4472-890e-0f28acaeaea6' },
-  { name: 'IPD', uuid: 'b7494a80-fdf9-49bb-bb40-396c47b40343' },
-  { name: 'Special OPD', uuid: 'f3185c75-2c8c-476a-bf95-c77e8bb42edd' },
-  { name: 'Follow Up', uuid: '9772f68d-9fc5-4470-9b87-2b6139011cad' },
-];
+const mockVisitTypes = {
+  visitTypes: {
+    EMERGENCY: '493ebb53-b2bd-4ced-b444-e0965804d771',
+    OPD: '54f43754-c6ce-4472-890e-0f28acaeaea6',
+    IPD: 'b7494a80-fdf9-49bb-bb40-396c47b40343',
+  },
+};
 
 const mockLoginLocation = {
   name: 'Support',
@@ -117,7 +117,7 @@ describe('VisitTypeSelector', () => {
 
     await waitFor(() => {
       const options = screen.getAllByRole('option');
-      expect(options).toHaveLength(4);
+      expect(options).toHaveLength(2);
     });
   });
 

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

@@ -10,7 +10,7 @@ import {
   dispatchAuditEvent,
   AUDIT_LOG_EVENT_DETAILS,
   getRegistrationConfig,
-  type CreateVisitRequest,
+  type NewVisitData,
   type AuditEventType,
 } from '@bahmni-frontend/bahmni-services';
 import { useQuery } from '@tanstack/react-query';
@@ -27,7 +27,7 @@ export const VisitTypeSelector = ({
   patientUuid,
 }: VisitTypeSelectorProps) => {
   const { t } = useTranslation();
-  const [visitPayload, setVisitPayload] = useState<CreateVisitRequest>();
+  const [visitPayload, setVisitPayload] = useState<NewVisitData>();
   const [patientUUID, setPatientUUID] = useState<string | null>(null);
 
   useEffect(() => {
@@ -36,7 +36,7 @@ export const VisitTypeSelector = ({
     }
   }, [patientUuid, patientUUID]);
   const {
-    data: visitTypesFromApi = [],
+    data: visitTypes,
     isLoading: isLoadingVisitTypes,
     error: visitTypesError,
   } = useQuery({
@@ -60,16 +60,23 @@ export const VisitTypeSelector = ({
     gcTime: 10 * 60 * 1000,
   });
 
+  const visitTypesArray = visitTypes?.visitTypes
+    ? Object.entries(visitTypes.visitTypes).map(([name, uuid]) => ({
+        name,
+        uuid,
+      }))
+    : [];
+
   const defaultVisitType =
-    visitTypesFromApi.find(
+    visitTypesArray.find(
       (vt) => vt.name === registrationConfig?.defaultVisitType,
-    ) ?? visitTypesFromApi[0];
+    ) ?? visitTypesArray[0];
 
   const createVisitAndLogAudit = async () => {
     const result = await createVisit(visitPayload!);
 
     if (visitPayload) {
-      const visitType = visitTypesFromApi.find(
+      const visitType = visitTypesArray.find(
         (vt) => vt.uuid === visitPayload.visitType,
       );
       if (visitType) {
@@ -94,7 +101,7 @@ export const VisitTypeSelector = ({
     gcTime: 10 * 60 * 1000,
   });
 
-  const { data: visitStarted, error: getVisitError } = useQuery({
+  const { data: activeVisit, error: getVisitError } = useQuery({
     queryKey: [
       'getActiveVisitByPatient',
       visitPayload?.patient,
@@ -138,15 +145,14 @@ export const VisitTypeSelector = ({
     }
   };
 
-  const hasActiveVisit =
-    visitStarted?.results && visitStarted.results.length > 0;
+  const hasActiveVisit = activeVisit?.results && activeVisit.results.length > 0;
 
   return (
     <div className={styles.opdVisitGroup}>
       <Button
         id="visit-button"
         kind="primary"
-        disabled={isLoadingVisitTypes || visitTypesFromApi.length === 0}
+        disabled={isLoadingVisitTypes || visitTypesArray.length === 0}
         onClick={() => handleVisitTypeChange(defaultVisitType)}
       >
         {!isLoadingVisitTypes && defaultVisitType
@@ -158,7 +164,7 @@ export const VisitTypeSelector = ({
       {!hasActiveVisit && (
         <Dropdown
           id="visit-dropdown"
-          items={visitTypesFromApi.filter(
+          items={visitTypesArray.filter(
             (vt) => vt.uuid !== defaultVisitType?.uuid,
           )}
           itemToString={(item) =>
@@ -169,7 +175,7 @@ export const VisitTypeSelector = ({
           type="inline"
           disabled={
             isLoadingVisitTypes ||
-            visitTypesFromApi.length === 0 ||
+            visitTypesArray.length === 0 ||
             hasActiveVisit
           }
           titleText=""

packages/bahmni-services/src/index.ts

@@ -22,7 +22,7 @@ export {
   type IdentifierTypesResponse,
   type CreatePatientRequest,
   type CreatePatientResponse,
-  type CreateVisitRequest,
+  type NewVisitData,
   type PatientName,
   type PatientAddress,
   type PatientIdentifier,

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

@@ -1672,7 +1672,7 @@ describe('Patient Service', () => {
   });
 
   describe('getVisitTypes', () => {
-    it('should fetch and transform visit types correctly', async () => {
+    it('should fetch visit types correctly', async () => {
       const mockResponse = {
         visitTypes: {
           OPD: 'c22a5000-3f10-11e4-adec-0800271c1b75',
@@ -1684,10 +1684,12 @@ describe('Patient Service', () => {
       const result = await getVisitTypes();
 
       expect(mockedGet).toHaveBeenCalledWith(VISIT_TYPES_URL());
-      expect(result).toEqual([
-        { name: 'OPD', uuid: 'c22a5000-3f10-11e4-adec-0800271c1b75' },
-        { name: 'IPD', uuid: 'd22a5000-3f10-11e4-adec-0800271c1b76' },
-      ]);
+      expect(result).toEqual({
+        visitTypes: {
+          OPD: 'c22a5000-3f10-11e4-adec-0800271c1b75',
+          IPD: 'd22a5000-3f10-11e4-adec-0800271c1b76',
+        },
+      });
     });
   });
 

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

@@ -22,7 +22,7 @@ export {
   type IdentifierTypesResponse,
   type CreatePatientRequest,
   type CreatePatientResponse,
-  type CreateVisitRequest,
+  type NewVisitData,
   type PatientName,
   type PatientAddress,
   type PatientIdentifier,

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

@@ -145,11 +145,10 @@ export interface AddressHierarchyResponse {
 }
 
 export interface VisitType {
-  name: string;
-  uuid: string;
+  visitTypes: Record<string, string>;
 }
 
-export interface CreateVisitRequest {
+export interface NewVisitData {
   patient: string;
   visitType: string;
   location: string;
@@ -160,5 +159,5 @@ export interface VisitLocationResponse {
 }
 
 export interface ActiveVisit {
-  results: unknown[];
+  results: string[];
 }

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

@@ -30,7 +30,7 @@ import {
   CreatePatientResponse,
   AddressHierarchyEntry,
   VisitType,
-  CreateVisitRequest,
+  NewVisitData,
   VisitLocationResponse,
   ActiveVisit,
 } from './models';
@@ -348,27 +348,19 @@ export const getAddressHierarchyEntries = async (
 
 /**
  * Fetches visit types from Bahmni configuration
- * @returns Promise<VisitType[]> - Array of visit types
+ * @returns Promise<VisitType> - Visit types response
  */
-export const getVisitTypes = async (): Promise<VisitType[]> => {
-  const response = await get<{ visitTypes: Record<string, string> }>(
-    VISIT_TYPES_URL(),
-  );
-  return Object.entries(response.visitTypes).map(([name, uuid]) => ({
-    name,
-    uuid,
-  }));
+export const getVisitTypes = async (): Promise<VisitType> => {
+  return get<VisitType>(VISIT_TYPES_URL());
 };
 
 /**
  * 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> => {
-  return post<unknown>(CREATE_VISIT_URL, visitData);
+export const createVisit = async (visitData: NewVisitData): Promise<string> => {
+  return post<string>(CREATE_VISIT_URL, visitData);
 };
 
 /**