@ampath/esm-patient-registration-app 6.0.1-pre.24 → 6.0.1-pre.245

package/src/patient-verification-HIE/patient-verification-hook.tsx

@@ -0,0 +1,181 @@
+import { type FetchResponse, openmrsFetch, showNotification, showToast, showSnackbar } from '@openmrs/esm-framework';
+import { generateNUPIPayload, handleClientRegistryResponse } from './patient-verification-utils';
+import useSWR from 'swr';
+import useSWRImmutable from 'swr/immutable';
+import {
+  type ConceptAnswers,
+  type ConceptResponse,
+  type FormValues,
+} from '../patient-registration/patient-registration.types';
+
+export function searchClientRegistry(
+  identifierType: string,
+  searchTerm: string,
+  token: string,
+  countryCode: string = 'KE',
+) {
+  const url = `https://afyakenyaapi.health.go.ke/partners/registry/search/${countryCode}/${identifierType}/${searchTerm}`;
+  return fetch(url, { headers: { Authorization: `Bearer ${token}` } }).then((r) => r.json());
+}
+
+export function savePatientToClientRegistry(formValues: FormValues) {
+  const createdRegistryPatient = generateNUPIPayload(formValues);
+  return fetch(`https://afyakenyaapi.health.go.ke/partners/registry`, {
+    headers: { Authorization: `Bearer ${formValues.token}`, 'Content-Type': 'application/json' },
+    method: 'POST',
+    body: JSON.stringify(createdRegistryPatient),
+  });
+}
+
+export async function handleSavePatientToClientRegistry(
+  formValues: FormValues,
+  setValues: (values: FormValues, shouldValidate?: boolean) => void,
+  inEditMode: boolean,
+) {
+  const mode = inEditMode ? 'edit' : 'new';
+  switch (mode) {
+    case 'edit': {
+      try {
+        const searchResponse = await searchClientRegistry(
+          'national-id',
+          formValues.identifiers['nationalId'].identifierValue,
+          formValues.token,
+        );
+
+        // if client does not exists post client to registry
+        if (searchResponse?.clientExists === false) {
+          postToRegistry(formValues, setValues);
+        }
+      } catch (error) {
+        showSnackbar({
+          title: 'Client registry error',
+          subtitle: `${error}`,
+          timeoutInMs: 10000,
+          kind: 'error',
+          isLowContrast: true,
+        });
+      }
+      return;
+    }
+    case 'new': {
+      postToRegistry(formValues, setValues);
+    }
+  }
+}
+
+export function useConceptAnswers(conceptUuid: string): { data: Array<ConceptAnswers>; isLoading: boolean } {
+  const { data, error, isLoading } = useSWR<FetchResponse<ConceptResponse>, Error>(
+    `/ws/rest/v1/concept/${conceptUuid}`,
+    openmrsFetch,
+  );
+  if (error) {
+    showToast({
+      title: error.name,
+      description: error.message,
+      kind: 'error',
+    });
+  }
+  return { data: data?.data?.answers ?? [], isLoading };
+}
+
+const urlencoded = new URLSearchParams();
+// urlencoded.append('client_id', 'palladium.partner.client');
+// urlencoded.append('client_secret', '28f95b2a');
+// urlencoded.append('grant_type', 'client_credentials');
+// urlencoded.append('scope', 'DHP.Gateway DHP.Partners');
+
+urlencoded.append('client_id', 'ampath.partner.client');
+urlencoded.append('client_secret', '3ae8a7f6');
+urlencoded.append('grant_type', 'client_credentials');
+urlencoded.append('scope', 'DHP.Gateway DHP.Partners');
+
+const swrFetcher = async (url) => {
+  const res = await fetch(url, {
+    method: 'POST',
+    body: urlencoded,
+    redirect: 'follow',
+  });
+
+  // If the status code is not in the range 200-299,
+  // we still try to parse and throw it.
+  if (!res.ok) {
+    const error = new Error('An error occurred while fetching the data.') as any;
+    // Attach extra info to the error object.
+    error.info = await res.json();
+    error.status = res.status;
+    throw error;
+  }
+
+  return res.json();
+};
+
+export function useGlobalProperties() {
+  const { data, isLoading, error } = useSWRImmutable(
+    `https://afyakenyaidentityapi.health.go.ke/connect/token`,
+    swrFetcher,
+    { refreshInterval: 864000 },
+  );
+  return { data: data, isLoading, error };
+}
+
+async function postToRegistry(
+  formValues: FormValues,
+  setValues: (values: FormValues, shouldValidate?: boolean) => void,
+) {
+  try {
+    const clientRegistryResponse = await savePatientToClientRegistry(formValues);
+    if (clientRegistryResponse.ok) {
+      const savedValues = await clientRegistryResponse.json();
+      const nupiIdentifier = {
+        ['nationalUniquePatientIdentifier']: {
+          identifierTypeUuid: 'cba702b9-4664-4b43-83f1-9ab473cbd64d',
+          identifierName: 'National Unique Patient Identifier (NUPI)',
+          identifierValue: savedValues['clientNumber'],
+          initialValue: savedValues['clientNumber'],
+          identifierUuid: undefined,
+          selectedSource: { uuid: '', name: '' },
+          preferred: false,
+          required: false,
+        },
+      };
+      setValues({ ...formValues, identifiers: { ...formValues.identifiers, ...nupiIdentifier } });
+      showToast({
+        title: 'Posted patient to client registry successfully',
+        description: `The patient has been saved to client registry`,
+        kind: 'success',
+      });
+    } else {
+      const responseError = await clientRegistryResponse.json();
+      const errorMessage = Object.values(responseError.errors ?? {})
+        .map((error: any) => error.join())
+        .toString();
+      setValues({
+        ...formValues,
+        attributes: {
+          ...formValues.attributes,
+          ['5553d509-f03a-4982-8e16-0d6f3d70fb8b']: 'Failed validation',
+          ['d8f4d295-3f31-47ec-b377-825bd38820b2']: 'Failed',
+        },
+      });
+      showNotification({
+        title: responseError.title,
+        description: errorMessage,
+        kind: 'warning',
+        millis: 150000,
+      });
+    }
+  } catch (error) {
+    showNotification({ kind: 'error', title: 'NUPI Post failed', description: JSON.stringify(error) });
+  }
+}
+
+export const useFacilityName = (facilityCode) => {
+  const apiUrl = `/ws/rest/v1/amrs/facilityName?facilityCode=${facilityCode}`;
+  const { data, error, isLoading } = useSWRImmutable<FetchResponse>(apiUrl, openmrsFetch);
+
+  return {
+    facilityName: data ? data?.data : null,
+    isLoading: isLoading,
+    isError: error,
+  };
+};

package/src/patient-verification-HIE/patient-verification-utils.ts

@@ -0,0 +1,179 @@
+import { showModal } from '@openmrs/esm-framework';
+import { type FormikProps } from 'formik';
+import { type ClientRegistryPatient, type RegistryPatient } from './verification-types';
+import counties from './assets/counties.json';
+import { type FormValues } from '../patient-registration/patient-registration.types';
+import { capitalize } from 'lodash-es';
+
+export function handleClientRegistryResponse(
+  clientResponse: ClientRegistryPatient,
+  props: FormikProps<FormValues>,
+  searchTerm: string,
+) {
+  if (clientResponse?.clientExists === false) {
+    const nupiIdentifiers = {
+      ['nationalId']: {
+        initialValue: searchTerm,
+        identifierUuid: undefined,
+        selectedSource: { uuid: '', name: '' },
+        preferred: false,
+        required: false,
+        identifierTypeUuid: '58a47054-1359-11df-a1f1-0026b9348838',
+        identifierName: 'Kenyan National ID Number',
+        identifierValue: searchTerm,
+      },
+    };
+    const dispose = showModal('empty-client-registry-modal', {
+      onConfirm: () => {
+        props.setValues({ ...props.values, identifiers: { ...props.values.identifiers, ...nupiIdentifiers } });
+        dispose();
+      },
+      close: () => dispose(),
+    });
+  }
+
+  if (clientResponse?.clientExists) {
+    const {
+      client: {
+        middleName,
+        lastName,
+        firstName,
+        contact,
+        country,
+        countyOfBirth,
+        residence,
+        identifications,
+        gender,
+        dateOfBirth,
+        isAlive,
+        clientNumber,
+        educationLevel,
+        occupation,
+        maritalStatus,
+      },
+    } = clientResponse;
+
+    const nupiIdentifiers = {
+      ['nationalId']: {
+        initialValue: identifications !== undefined && identifications[0]?.identificationNumber,
+        identifierUuid: undefined,
+        selectedSource: { uuid: '', name: '' },
+        preferred: false,
+        required: false,
+        identifierTypeUuid: '58a47054-1359-11df-a1f1-0026b9348838',
+        identifierName: 'Kenyan National ID Number',
+        identifierValue: identifications !== undefined && identifications[0]?.identificationNumber,
+      },
+
+      ['nationalUniquePatientIdentifier']: {
+        identifierTypeUuid: 'cba702b9-4664-4b43-83f1-9ab473cbd64d',
+        identifierName: 'National Unique Patient Identifier (NUPI)',
+        identifierValue: clientNumber,
+        initialValue: clientNumber,
+        identifierUuid: undefined,
+        selectedSource: { uuid: '', name: '' },
+        preferred: false,
+        required: false,
+      },
+    };
+
+    const dispose = showModal('confirm-client-registry-modal', {
+      onConfirm: () => {
+        props.setValues({
+          ...props.values,
+          familyName: lastName,
+          middleName: middleName,
+          givenName: firstName,
+          gender: clientResponse.client.gender,
+          birthdate: new Date(dateOfBirth),
+          isDead: !isAlive,
+          attributes: {
+            '72a759a8-1359-11df-a1f1-0026b9348838': contact?.primaryPhone,
+            'b0a08406-09c0-4f8b-8cb5-b22b6d4a8e46': contact?.secondaryPhone,
+            '2f65dbcb-3e58-45a3-8be7-fd1dc9aa0faa': contact?.emailAddress ?? '',
+          },
+          address: {
+            address1: residence?.address,
+            address2: '',
+            address4: capitalize(residence?.ward ?? ''),
+            cityVillage: residence?.village,
+            stateProvince: capitalize(residence?.subCounty ?? ''),
+            countyDistrict: counties.find((county) => county.code === parseInt(residence?.county))?.name,
+            country: 'Kenya',
+            postalCode: residence?.address,
+          },
+          identifiers: { ...props.values.identifiers, ...nupiIdentifiers },
+          obs: {
+            'a899a9f2-1350-11df-a1f1-0026b9348838':
+              props.values.concepts.find((concept) =>
+                concept.display?.toLowerCase()?.includes(clientResponse.client.maritalStatus?.toLowerCase()),
+              )?.uuid ?? '',
+            'a89e48ae-1350-11df-a1f1-0026b9348838':
+              props.values.concepts.find((concept) =>
+                concept.display?.toLowerCase()?.includes(clientResponse.client.educationLevel?.toLowerCase()),
+              )?.uuid ?? '',
+            'a8a0a00e-1350-11df-a1f1-0026b9348838':
+              clientResponse.client.occupation === undefined || clientResponse.client.occupation === null
+                ? 'a899e0ac-1350-11df-a1f1-0026b9348838'
+                : (props.values.concepts.find(
+                    (concept) => concept.display?.toLowerCase() === clientResponse.client.occupation?.toLowerCase(),
+                  )?.uuid ?? 'a8aaf3e2-1350-11df-a1f1-0026b9348838'),
+          },
+        });
+        dispose();
+      },
+      close: () => dispose(),
+      patient: clientResponse.client,
+    });
+  }
+}
+
+export function generateNUPIPayload(formValues: FormValues): RegistryPatient {
+  const educationLevel = formValues.concepts.find(
+    (concept) => concept.uuid === formValues.obs['a89e48ae-1350-11df-a1f1-0026b9348838'],
+  );
+  const occupation = formValues.concepts.find(
+    (concept) => concept.uuid === formValues.obs['a8a0a00e-1350-11df-a1f1-0026b9348838'],
+  );
+  const maritalStatus = formValues.concepts.find(
+    (concept) => concept.uuid === formValues.obs['a899a9f2-1350-11df-a1f1-0026b9348838'],
+  );
+
+  let createRegistryPatient: RegistryPatient = {
+    firstName: formValues?.givenName,
+    middleName: formValues?.middleName,
+    lastName: formValues?.familyName,
+    gender: formValues?.gender === 'Male' ? 'male' : 'female',
+    dateOfBirth: new Date(formValues.birthdate).toISOString(),
+    isAlive: !formValues.isDead,
+    residence: {
+      county: `0${counties.find((county) => county.name.includes(formValues.address['countyDistrict']))?.code}`,
+      subCounty: formValues.address['stateProvince']?.toLocaleLowerCase(),
+      ward: formValues.address['address4']?.toLocaleLowerCase(),
+      village: formValues.address['cityVillage'],
+      landmark: formValues.address['address2'],
+      address: formValues.address['postalCode'],
+    },
+    nextOfKins: [],
+    contact: {
+      primaryPhone: formValues.attributes['72a759a8-1359-11df-a1f1-0026b9348838'],
+      secondaryPhone: formValues.attributes['b0a08406-09c0-4f8b-8cb5-b22b6d4a8e46'],
+      emailAddress: formValues.attributes['2f65dbcb-3e58-45a3-8be7-fd1dc9aa0faa'],
+    },
+    country: 'KE',
+    countyOfBirth: `0${counties.find((county) => county.name.includes(formValues.address['countyDistrict']))?.code}`,
+    educationLevel: educationLevel?.display?.toLowerCase() ?? '',
+    religion: '',
+    occupation: occupation?.display?.toLowerCase() ?? '',
+    maritalStatus: maritalStatus?.display?.toLowerCase() ?? '',
+    originFacilityKmflCode: '',
+    nascopCCCNumber: '',
+    identifications: [
+      {
+        identificationType: 'national-id',
+        identificationNumber: formValues.identifiers['nationalId']?.identifierValue,
+      },
+    ],
+  };
+  return createRegistryPatient;
+}

package/src/patient-verification-HIE/patient-verification.component.tsx

@@ -0,0 +1,124 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Tile, ComboBox, Layer, Button, Search, InlineLoading, InlineNotification } from '@carbon/react';
+import styles from './patient-verification.scss';
+import { countries, verificationIdentifierTypes } from './assets/verification-assets';
+import { searchClientRegistry, useGlobalProperties } from './patient-verification-hook';
+import { showSnackbar, showToast } from '@openmrs/esm-framework';
+import { handleClientRegistryResponse } from './patient-verification-utils';
+import { type FormikProps } from 'formik';
+import { type FormValues } from '../patient-registration/patient-registration.types';
+
+interface PatientVerificationProps {
+  props: FormikProps<FormValues>;
+  setInitialFormValues: React.Dispatch<FormValues>;
+}
+
+const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
+  const { t } = useTranslation();
+  const { data, isLoading, error } = useGlobalProperties();
+  const [verificationCriteria, setVerificationCriteria] = useState({
+    searchTerm: '',
+    identifierType: '',
+    countryCode: 'KE',
+  });
+  const [isLoadingSearch, setIsLoadingSearch] = useState(false);
+
+  const handleSearch = async () => {
+    setIsLoadingSearch(true);
+    try {
+      const clientRegistryResponse = await searchClientRegistry(
+        verificationCriteria.identifierType,
+        verificationCriteria.searchTerm,
+        props.values.token,
+        verificationCriteria.countryCode,
+      );
+      setIsLoadingSearch(false);
+
+      handleClientRegistryResponse(clientRegistryResponse, props, verificationCriteria.searchTerm);
+    } catch (error) {
+      showSnackbar({
+        title: 'Client registry error',
+        subtitle: `Please reload the registration page and re-try again, if the issue persist contact system administrator`,
+        timeoutInMs: 10000,
+        kind: 'error',
+        isLowContrast: true,
+      });
+      setIsLoadingSearch(false);
+    }
+  };
+
+  return (
+    <div id={'patientVerification'}>
+      <h3 className={styles.productiveHeading02} style={{ color: '#161616' }}>
+        {t('clientVerificationWithClientRegistry', 'Client verification with client registry')}
+      </h3>
+      <div style={{ margin: '1rem 0 1rem' }}>
+        <Layer>
+          {isLoading && <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />}
+        </Layer>
+        {error && (
+          <InlineNotification
+            className={styles.errorWrapper}
+            aria-label="closes notification"
+            kind="error"
+            lowContrast
+            statusIconDescription="notification"
+            subtitle={t(
+              'clientRegistryErrorSubtitle',
+              'Please proceed with registration contact system admin and  try again later',
+            )}
+            title={t('clientRegistryError', 'Error occurred while reaching the client registry')}
+          />
+        )}
+        <Tile className={styles.verificationWrapper}>
+          <Layer>
+            <ComboBox
+              ariaLabel={t('selectCountry', 'Select country')}
+              id="selectCountry"
+              items={countries}
+              itemToString={(item) => item?.name ?? ''}
+              label="Select country"
+              titleText={t('selectCountry', 'Select country')}
+              initialSelectedItem={countries[0]}
+              onChange={({ selectedItem }) =>
+                setVerificationCriteria({ ...verificationCriteria, countryCode: selectedItem?.initials })
+              }
+            />
+          </Layer>
+          <Layer>
+            <ComboBox
+              ariaLabel={t('selectIdentifierType', 'Select identifier type')}
+              id="selectIdentifierType"
+              items={verificationIdentifierTypes}
+              itemToString={(item) => item?.name ?? ''}
+              label="Select identifier type"
+              titleText={t('selectIdentifierType', 'Select identifier type')}
+              onChange={({ selectedItem }) =>
+                setVerificationCriteria({ ...verificationCriteria, identifierType: selectedItem?.value })
+              }
+            />
+          </Layer>
+          <Layer>
+            <Search
+              id="clientRegistrySearch"
+              autoFocus
+              placeHolderText={t('searchClientRegistry', 'Search client registry')}
+              disabled={!verificationCriteria.identifierType}
+              onChange={(event) => setVerificationCriteria({ ...verificationCriteria, searchTerm: event.target.value })}
+            />
+          </Layer>
+          {!isLoadingSearch ? (
+            <Button disabled={!verificationCriteria.identifierType && !isLoading} size="md" onClick={handleSearch}>
+              {t('validate', 'Validate')}
+            </Button>
+          ) : (
+            <InlineLoading status="active" iconDescription="Loading" description="Searching client registry" />
+          )}
+        </Tile>
+      </div>
+    </div>
+  );
+};
+
+export default PatientVerification;

package/src/patient-verification-HIE/patient-verification.scss

@@ -0,0 +1,25 @@
+@use '@carbon/colors';
+@import '../patient-registration/patient-registration.scss';
+
+/* Desktop */
+:global(.omrs-breakpoint-gt-tablet) {
+  .verificationWrapper {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+    column-gap: 0.325rem;
+    align-items: flex-end;
+  }
+}
+
+/* Tablet */
+:global(.omrs-breakpoint-lt-desktop) {
+  .verificationWrapper {
+    row-gap: 0.5rem;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+.errorWrapper {
+  margin: 0 0 1rem 0;
+}

package/src/patient-verification-HIE/verification-modal/confirm-prompt.component.tsx

@@ -0,0 +1,72 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@carbon/react';
+import { age, ExtensionSlot, formatDate } from '@openmrs/esm-framework';
+import capitalize from 'lodash-es/capitalize';
+import { useFacilityName } from '../patient-verification-hook';
+
+const PatientInfo: React.FC<{ label: string; value: string }> = ({ label, value }) => {
+  return (
+    <div style={{ display: 'grid', gridTemplateColumns: '0.25fr 0.75fr', margin: '0.25rem' }}>
+      <span style={{ minWidth: '5rem', fontWeight: 'bold' }}>{label}</span>
+      <span>{value}</span>
+    </div>
+  );
+};
+
+interface ConfirmPromptProps {
+  onConfirm: void;
+  close: void;
+  patient: any;
+}
+
+const ConfirmPrompt: React.FC<ConfirmPromptProps> = ({ close, onConfirm, patient }) => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <div className="cds--modal-header">
+        <h3 className="cds--modal-header__heading">
+          {t('clientRegistryEmpty', `Patient ${patient?.firstName} ${patient?.lastName} found`)}
+        </h3>
+      </div>
+      <div className="cds--modal-content">
+        <p>
+          {t(
+            'patientDetailsFound',
+            'Patient information found in the registry, do you want to use the information to continue with registration?',
+          )}
+        </p>
+        <div style={{ display: 'flex', margin: '1rem' }}>
+          <ExtensionSlot
+            style={{ display: 'flex', alignItems: 'center' }}
+            name="patient-photo-slot"
+            state={{ patientName: `${patient?.firstName} ${patient?.lastName}` }}
+          />
+          <div style={{ width: '100%', marginLeft: '0.625rem' }}>
+            <PatientInfo
+              label={t('patientName', 'Patient name')}
+              value={`${patient?.firstName} ${patient?.lastName}`}
+            />
+            <PatientInfo
+              label={t('nationalId', 'National ID')}
+              value={patient?.identifications[0]?.identificationNumber}
+            />
+            <PatientInfo label={t('age', 'Age')} value={age(patient?.dateOfBirth)} />
+            <PatientInfo label={t('dateOfBirth', 'Date of birth')} value={formatDate(new Date(patient?.dateOfBirth))} />
+            <PatientInfo label={t('gender', 'Gender')} value={capitalize(patient?.gender)} />
+            <PatientInfo label={t('nupi', 'NUPI')} value={patient?.clientNumber} />
+            <PatientInfo label={t('shaNumber', 'SHA Number')} value={'--'} />
+          </div>
+        </div>
+      </div>
+      <div className="cds--modal-footer">
+        <Button kind="secondary" onClick={close}>
+          {t('cancel', 'Cancel')}
+        </Button>
+        <Button onClick={onConfirm}>{t('useValues', 'Use values')}</Button>
+      </div>
+    </>
+  );
+};
+
+export default ConfirmPrompt;

package/src/patient-verification-HIE/verification-modal/empty-prompt.component.tsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@carbon/react';
+
+interface EmptyPromptProps {
+  onConfirm: void;
+  close: void;
+}
+
+const EmptyPrompt: React.FC<EmptyPromptProps> = ({ close, onConfirm }) => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <div className="cds--modal-header">
+        <h3 className="cds--modal-header__heading">{t('clientRegistryEmpty', 'Create & Post Patient')}</h3>
+      </div>
+      <div className="cds--modal-content">
+        <p>
+          {t(
+            'patientNotFound',
+            'The patient records could not be found in Client registry, do you want to continue to create and post patient to registry',
+          )}
+        </p>
+      </div>
+      <div className="cds--modal-footer">
+        <Button kind="secondary" onClick={close}>
+          {t('cancel', 'Cancel')}
+        </Button>
+        <Button onClick={onConfirm}>{t('continue', 'Continue to registration')}</Button>
+      </div>
+    </>
+  );
+};
+
+export default EmptyPrompt;

package/src/patient-verification-HIE/verification-types.ts

@@ -0,0 +1,50 @@
+export interface ClientIdentification {
+  identificationType: string;
+  identificationNumber: string;
+}
+
+interface ClientContact {
+  primaryPhone: string;
+  secondaryPhone?: string;
+  emailAddress?: string;
+}
+
+export interface ClientRegistryPatient {
+  clientExists: boolean;
+  client?: RegistryPatient;
+}
+
+export interface RegistryPatient {
+  clientNumber?: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  dateOfBirth: string;
+  maritalStatus?: string;
+  gender: string;
+  occupation?: string;
+  religion?: string;
+  educationLevel?: string;
+  country: string;
+  countyOfBirth?: string;
+  isAlive: boolean;
+  originFacilityKmflCode?: string;
+  isOnART?: string;
+  nascopCCCNumber?: string;
+  residence: {
+    county: string;
+    subCounty: string;
+    ward: string;
+    village: string;
+    landmark: string;
+    address: string;
+  };
+  identifications: Array<ClientIdentification>;
+  contact: ClientContact;
+  nextOfKins: Array<{
+    name: string;
+    relationship: string;
+    residence: string;
+    contact: ClientContact;
+  }>;
+}