fix sonarcloud warnings

Signed-off-by: Pablo <[email protected]>
dhis2 · Nov 13, 2024 · 7d080b2 · 7d080b2
1 parent a49d92c
commit 7d080b2
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt b/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt
@@ -108,7 +108,6 @@ class TroubleshootingRepository(
             .blockingGet().toRuleVariableList(
                 d2.trackedEntityModule().trackedEntityAttributes(),
                 d2.dataElementModule().dataElements(),
-                d2.optionModule().options(),
             ).mapNotNull {
                 val ruleValueType = it.fieldType
                 val valueKey = when (it) {

diff --git a/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt b/...2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RuleEngineExtensions.kt
@@ -61,7 +61,6 @@ fun List<ProgramRuleAction>.toRuleActionList(): List<RuleAction> {
 fun List<ProgramRuleVariable>.toRuleVariableList(
     attributeRepository: TrackedEntityAttributeCollectionRepository,
     dataElementRepository: DataElementCollectionRepository,
-    optionRepository: OptionCollectionRepository,
 ): List<RuleVariable> {
     return mapNotNull {
         val allowVariable = when {
@@ -76,7 +75,7 @@ fun List<ProgramRuleVariable>.toRuleVariableList(
             else -> isCalculatedValue(it)
         }
         if (allowVariable) {
-            it.toRuleVariable(attributeRepository, dataElementRepository, optionRepository)
+            it.toRuleVariable(attributeRepository, dataElementRepository)
         } else {
             null
         }
@@ -328,7 +327,6 @@ fun ProgramRuleAction.toRuleEngineObject(): RuleAction {
 fun ProgramRuleVariable.toRuleVariable(
     attributeRepository: TrackedEntityAttributeCollectionRepository,
     dataElementRepository: DataElementCollectionRepository,
-    optionRepository: OptionCollectionRepository,
 ): RuleVariable {
     val valueType = when (programRuleVariableSourceType()) {
         ProgramRuleVariableSourceType.DATAELEMENT_NEWEST_EVENT_PROGRAM_STAGE,

diff --git a/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt b/dhis2-mobile-program-rules/src/main/java/org/dhis2/mobileProgramRules/RulesRepository.kt
@@ -2,7 +2,6 @@ package org.dhis2.mobileProgramRules
 
 import android.os.Build
 import android.text.TextUtils.isEmpty
-import io.reactivex.Single
 import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
@@ -69,23 +68,9 @@ class RulesRepository(private val d2: D2) {
             .toRuleVariableList(
                 d2.trackedEntityModule().trackedEntityAttributes(),
                 d2.dataElementModule().dataElements(),
-                d2.optionModule().options(),
             )
     }
 
-    fun ruleVariablesProgramStages(programUid: String): Single<List<RuleVariable>> {
-        return d2.programModule().programRuleVariables().byProgramUid().eq(programUid).get()
-            .toFlowable().flatMapIterable { list -> list }
-            .map {
-                it.toRuleVariable(
-                    d2.trackedEntityModule().trackedEntityAttributes(),
-                    d2.dataElementModule().dataElements(),
-                    d2.optionModule().options(),
-                )
-            }
-            .toList()
-    }
-
     suspend fun constants(): Map<String, String> {
         return d2.constantModule().constants().blockingGet()
             .associate { constant ->

diff --git a/...k-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt b/...k-usecase/src/main/java/org/dhis2/android/rtsm/services/rules/RuleValidationHelperImpl.kt
@@ -151,7 +151,6 @@ class RuleValidationHelperImpl @Inject constructor(
                 it.toRuleVariableList(
                     d2.trackedEntityModule().trackedEntityAttributes(),
                     d2.dataElementModule().dataElements(),
-                    d2.optionModule().options(),
                 )
             }
     }