From 842c80e7dc5bcc1fe97bb8cdc367405c5c61b993 Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Wed, 2 Oct 2024 13:28:53 +0300
Subject: [PATCH] minor fix

---
 .../components/patient/SearchPatientForm.js   | 13 ++------
 pom.xml                                       |  1 +
 .../provider/PatientSearchRestController.java |  5 ++-
 .../common/util/ConfigurationProperties.java  |  4 +--
 .../service/FhirTransformServiceImpl.java     | 32 +++++++++++--------
 .../2.8.x.x/enable_client_registry_search.xml |  6 ++--
 6 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
index 647e8925a..ead34f020 100644
--- a/frontend/src/components/patient/SearchPatientForm.js
+++ b/frontend/src/components/patient/SearchPatientForm.js
@@ -185,17 +185,8 @@ function SearchPatientForm(props) {
   const fetchPatientResults = (res) => {
     let patientsResults = res.patientSearchResults;
     if (patientsResults.length > 0) {
-      const openClientRegistryResults = patientsResults.filter(
-        (item) => item.dataSourceName === "Open Client Registry",
-      );
-
-      if (openClientRegistryResults.length > 0) {
-        openClientRegistryResults.forEach((item) => (item.id = item.patientID));
-        setPatientSearchResults(openClientRegistryResults);
-      } else {
-        patientsResults.forEach((item) => (item.id = item.patientID));
-        setPatientSearchResults(patientsResults);
-      }
+      patientsResults.forEach((item) => (item.id = item.patientID));
+      setPatientSearchResults(patientsResults);
     } else {
       setPatientSearchResults([]);
       addNotification({
diff --git a/pom.xml b/pom.xml
index d7db495d4..cc626cf0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,6 +664,7 @@
                 <exclude>tools/Liquibase-Outdated/**</exclude>
                 <exclude>dataexport/**</exclude>
                 <exclude>plugins/**</exclude>
+                <exclude>frontend/**</exclude>
               </excludes>
               <prettier>
                 <!-- Formatter that Spotless supports and can format Markdown:
diff --git a/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java b/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
index 63f0afa72..52d02541d 100644
--- a/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
+++ b/src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
@@ -117,11 +117,10 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
                             STNumber, subjectNumber, nationalID, null, guid, dateOfBirth, gender);
                     LogEvent.logWarn("PatientSearchRestController", "getPatientResults()",
                             "final results have been added");
-                    results.addAll(fhirResults);
+                    results = fhirResults;
                 }
-
-                paging.setDatabaseResults(request, form, results);
             }
+            paging.setDatabaseResults(request, form, results);
         } else {
             int requestedPageNumber = Integer.parseInt(requestedPage);
             paging.page(request, form, requestedPageNumber);
diff --git a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
index e31f339e3..fba444264 100644
--- a/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
+++ b/src/main/java/org/openelisglobal/common/util/ConfigurationProperties.java
@@ -197,8 +197,8 @@ public enum Property {
         PATIENT_RESULTS_SMTP_ENABLED("patientresultssmtp.enabled"), //
         CONTACT_TRACING("contactTracingEnabled"), //
         REQUIRE_LAB_UNIT_AT_LOGIN("requireLabUnitAtLogin"), //
-        ENABLE_CLIENT_REGISTRY("Enable Client Registry"); // if true, then client registry search option is visible on
-                                                          // the ui
+        ENABLE_CLIENT_REGISTRY("enableClientRegistry"); // if true, then client registry search option is visible on
+                                                        // the ui
 
         private String name;
 
diff --git a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
index 9836b654d..e1293da7a 100644
--- a/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
+++ b/src/main/java/org/openelisglobal/dataexchange/fhir/service/FhirTransformServiceImpl.java
@@ -69,6 +69,8 @@
 import org.openelisglobal.common.services.StatusService.AnalysisStatus;
 import org.openelisglobal.common.services.StatusService.OrderStatus;
 import org.openelisglobal.common.services.TableIdService;
+import org.openelisglobal.common.util.ConfigurationProperties;
+import org.openelisglobal.common.util.ConfigurationProperties.Property;
 import org.openelisglobal.common.util.DateUtil;
 import org.openelisglobal.common.util.validator.GenericValidator;
 import org.openelisglobal.dataexchange.fhir.FhirConfig;
@@ -388,21 +390,23 @@ public void transformPersistPatient(PatientManagementInfo patientInfo, boolean i
         org.hl7.fhir.r4.model.Patient patient = transformToFhirPatient(patientInfo.getPatientPK());
         this.addToOperations(fhirOperations, tempIdGenerator, patient);
 
-        if (!GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
-                && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
-                && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword())) {
-            IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
-                    fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());
-            try {
-                if (isCreate) {
-                    clientRegistry.create().resource(patient).execute();
-                } else {
-                    clientRegistry.update().resource(patient).execute();
+        if (ConfigurationProperties.getInstance().getPropertyValue(Property.ENABLE_CLIENT_REGISTRY).equals("true")) {
+            if (!GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
+                    && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
+                    && !GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword())) {
+                IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
+                        fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());
+                try {
+                    if (isCreate) {
+                        clientRegistry.create().resource(patient).execute();
+                    } else {
+                        clientRegistry.update().resource(patient).execute();
+                    }
+                } catch (FhirClientConnectionException e) {
+                    handleException(e, patientInfo.getPatientUpdateStatus());
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
                 }
-            } catch (FhirClientConnectionException e) {
-                handleException(e, patientInfo.getPatientUpdateStatus());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
             }
         }
 
diff --git a/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml b/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml
index 3f61c5a1b..0691ca4ad 100644
--- a/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml
+++ b/src/main/resources/liquibase/2.8.x.x/enable_client_registry_search.xml
@@ -8,16 +8,16 @@
 
     <changeSet author="mherman22" id="1">
         <preConditions onFail="MARK_RAN">
-            <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'Enable Client Registry'; </sqlCheck>
+            <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'enableClientRegistry'; </sqlCheck>
         </preConditions>
         <comment>add Config to enable client registry search</comment>
         <insert schemaName="clinlims" tableName="site_information">
             <column name="id" valueSequenceNext="site_information_seq" />
-            <column name="name" value="Enable Client Registry" />
+            <column name="name" value="enableClientRegistry" />
             <column name="lastupdated" valueComputed="${now}" />
             <column name="description" value="Enable Client Registry Search" />
             <column name="encrypted" value="false" />
-            <column name="domain_id" valueComputed="(SELECT id FROM site_information_domain WHERE name = 'patientEntryConfig')" />
+            <column name="domain_id" valueComputed="(SELECT id FROM site_information_domain WHERE name = 'siteIdentity')" />
             <column name="value_type" value="boolean" />
             <column name="value" value="false" />
             <column name="group" value="0" />