From 527ef62079f7c7173fa3b7cd4dff3485c102053a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=E2=89=A1ZRS?= <12814349+LZRS@users.noreply.github.com>
Date: Thu, 28 Jul 2022 15:53:38 +0300
Subject: [PATCH 1/2] 1475: Only show patient identifier that has 'use'=
 'official'

---
 .../fhircore/engine/data/local/register/dao/HivRegisterDao.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
index 84d04eae47..94a9918310 100644
--- a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
+++ b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
@@ -40,7 +40,6 @@ import org.smartregister.fhircore.engine.util.extension.extractGeneralPractition
 import org.smartregister.fhircore.engine.util.extension.extractHealthStatusFromMeta
 import org.smartregister.fhircore.engine.util.extension.extractName
 import org.smartregister.fhircore.engine.util.extension.extractOfficialIdentifier
-import org.smartregister.fhircore.engine.util.extension.extractSecondaryIdentifier
 import org.smartregister.fhircore.engine.util.extension.extractTelecom
 import org.smartregister.fhircore.engine.util.extension.hasActivePregnancy
 import org.smartregister.fhircore.engine.util.extension.toAgeDisplay
@@ -61,8 +60,7 @@ constructor(
 
   fun hivPatientIdentifier(patient: Patient): String =
     // would either be an ART or HCC number
-    patient.extractOfficialIdentifier()
-      ?: patient.extractSecondaryIdentifier() ?: patient.identifierFirstRep.value ?: ""
+    patient.extractOfficialIdentifier() ?: ""
 
   override suspend fun loadRegisterData(
     currentPage: Int,

From 3f887928c4180ba8cd72e9e8699aeed37547bb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=E2=89=A1ZRS?= <12814349+LZRS@users.noreply.github.com>
Date: Mon, 1 Aug 2022 11:54:32 +0300
Subject: [PATCH 2/2] 1475: Fix hivPatientIdentifier failing test

---
 .../engine/data/local/register/dao/HivRegisterDaoTest.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt
index 04cfaa8a31..44ab3d6082 100644
--- a/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt
+++ b/android/engine/src/test/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDaoTest.kt
@@ -195,7 +195,7 @@ class HivRegisterDaoTest : RobolectricTest() {
   }
 
   @Test
-  fun `test hiv patient identifier to be the 'secondary' identifier when no 'official' identifier found`() =
+  fun `test hiv patient identifier to be empty string when no 'official' identifier found`() =
       runTest {
     val identifierNumber = "149856"
     val patient =
@@ -209,7 +209,7 @@ class HivRegisterDaoTest : RobolectricTest() {
           }
         )
       }
-    assertEquals(identifierNumber, hivRegisterDao.hivPatientIdentifier(patient))
+    assertEquals("", hivRegisterDao.hivPatientIdentifier(patient))
   }
 
   @Test