refactor element guards

opensrp · Dec 21, 2024 · 29d8973 · 29d8973
1 parent c15c012
commit 29d8973
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt b/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
@@ -336,24 +336,18 @@ constructor(
       }
     } else {
       composition.retrieveCompositionSections().forEach { sectionComponent ->
-        if (
-          sectionComponent.hasFocus() &&
-            sectionComponent.focus.hasReferenceElement() &&
-            sectionComponent.focus.hasIdentifier()
-        ) {
+        if (sectionComponent.hasFocus()) {
           addBinaryToConfigsJsonMap(
             sectionComponent.focus,
             configsLoadedCallback,
           )
         }
         if (sectionComponent.hasEntry() && sectionComponent.entry.isNotEmpty()) {
           sectionComponent.entry.forEach { entryReference ->
-            if (entryReference.hasReferenceElement() && entryReference.hasIdentifier()) {
-              addBinaryToConfigsJsonMap(
-                entryReference,
-                configsLoadedCallback,
-              )
-            }
+            addBinaryToConfigsJsonMap(
+              entryReference,
+              configsLoadedCallback,
+            )
           }
         }
       }
@@ -365,16 +359,18 @@ constructor(
     entryReference: Reference,
     configsLoadedCallback: (Boolean) -> Unit,
   ) {
-    val configIdentifier = entryReference.identifier.value
-    val referenceResourceType = entryReference.reference.substringBefore(TYPE_REFERENCE_DELIMITER)
-    if (isAppConfig(referenceResourceType) && !isIconConfig(configIdentifier)) {
-      val extractedId = entryReference.extractId()
-      try {
-        val configBinary = fhirEngine.get<Binary>(extractedId.toString())
-        configsJsonMap[configIdentifier] = configBinary.content.decodeToString()
-      } catch (resourceNotFoundException: ResourceNotFoundException) {
-        Timber.e("Missing Binary file with ID :$extractedId")
-        withContext(dispatcherProvider.main()) { configsLoadedCallback(false) }
+    if (entryReference.hasReferenceElement() && entryReference.hasIdentifier()) {
+      val configIdentifier = entryReference.identifier.value
+      val referenceResourceType = entryReference.reference.substringBefore(TYPE_REFERENCE_DELIMITER)
+      if (isAppConfig(referenceResourceType) && !isIconConfig(configIdentifier)) {
+        val extractedId = entryReference.extractId()
+        try {
+          val configBinary = fhirEngine.get<Binary>(extractedId.toString())
+          configsJsonMap[configIdentifier] = configBinary.content.decodeToString()
+        } catch (resourceNotFoundException: ResourceNotFoundException) {
+          Timber.e("Missing Binary file with ID :$extractedId")
+          withContext(dispatcherProvider.main()) { configsLoadedCallback(false) }
+        }
       }
     }
   }

diff --git a/...rc/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt b/...rc/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt
@@ -1167,9 +1167,7 @@ class ConfigurationRegistryTest : RobolectricTest() {
             SectionComponent().apply {
               entry =
                 listOf(
-                  Reference().apply {
-                    reference = "Binary/1"
-                  },
+                  Reference().apply { reference = "Binary/1" },
                   Reference().apply {
                     reference = "Binary/2"
                     identifier = Identifier().apply { value = "resource2" }