BN-173|Fix.State For PatientUUID and Rename NewVisitData to VisitData to Models

Author: Aishwarya-thoughtworks

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

@@ -10,7 +10,7 @@ import {
   dispatchAuditEvent,
   AUDIT_LOG_EVENT_DETAILS,
   getRegistrationConfig,
-  type NewVisitData,
+  type VisitData,
   type AuditEventType,
 } from '@bahmni-frontend/bahmni-services';
 import { useQuery } from '@tanstack/react-query';
@@ -27,14 +27,8 @@ export const VisitTypeSelector = ({
   patientUuid,
 }: VisitTypeSelectorProps) => {
   const { t } = useTranslation();
-  const [visitPayload, setVisitPayload] = useState<NewVisitData>();
-  const [patientUUID, setPatientUUID] = useState<string | null>(null);
+  const [visitPayload, setVisitPayload] = useState<VisitData>();
 
-  useEffect(() => {
-    if (patientUuid && !patientUUID) {
-      setPatientUUID(patientUuid);
-    }
-  }, [patientUuid, patientUUID]);
   const {
     data: visitTypes,
     isLoading: isLoadingVisitTypes,
@@ -129,12 +123,7 @@ export const VisitTypeSelector = ({
   ) => {
     if (!selectedItem) return;
 
-    let currentPatientUUID = patientUUID;
-
-    if (!currentPatientUUID) {
-      currentPatientUUID = await onVisitSave();
-      setPatientUUID(currentPatientUUID);
-    }
+    const currentPatientUUID = patientUuid ?? (await onVisitSave());
 
     if (currentPatientUUID && visitLocationUUID) {
       setVisitPayload({

packages/bahmni-services/src/index.ts

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

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

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

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

@@ -148,7 +148,7 @@ export interface VisitType {
   visitTypes: Record<string, string>;
 }
 
-export interface NewVisitData {
+export interface VisitData {
   patient: string;
   visitType: string;
   location: string;

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

@@ -30,7 +30,7 @@ import {
   CreatePatientResponse,
   AddressHierarchyEntry,
   VisitType,
-  NewVisitData,
+  VisitData,
   VisitLocationResponse,
   ActiveVisit,
 } from './models';
@@ -359,7 +359,7 @@ export const getVisitTypes = async (): Promise<VisitType> => {
  * @param visitData - The visit data including patient UUID, visit type, and location
  * @returns Promise<unknown> - The created visit object
  */
-export const createVisit = async (visitData: NewVisitData): Promise<string> => {
+export const createVisit = async (visitData: VisitData): Promise<string> => {
   return post<string>(CREATE_VISIT_URL, visitData);
 };