[ANDROAPP-6028] Remove rule engine duplicate extensions

Signed-off-by: Pablo <[email protected]>
dhis2 · May 10, 2024 · e98462f · e98462f
1 parent 2634d8e
commit e98462f
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 1,497 deletions.
diff --git a/app/src/main/java/org/dhis2/data/forms/EnrollmentFormRepository.kt b/app/src/main/java/org/dhis2/data/forms/EnrollmentFormRepository.kt
diff --git a/app/src/main/java/org/dhis2/data/forms/EventRepository.java b/app/src/main/java/org/dhis2/data/forms/EventRepository.java
diff --git a/app/src/main/java/org/dhis2/data/forms/FormRepository.java b/app/src/main/java/org/dhis2/data/forms/FormRepository.java
diff --git a/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureModule.java b/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureModule.java
@@ -14,15 +14,12 @@
 import org.dhis2.commons.resources.ResourceManager;
 import org.dhis2.commons.schedulers.SchedulerProvider;
 import org.dhis2.data.dhislogic.DhisEnrollmentUtils;
-import org.dhis2.data.forms.EventRepository;
-import org.dhis2.data.forms.FormRepository;
 import org.dhis2.data.forms.dataentry.SearchTEIRepository;
 import org.dhis2.data.forms.dataentry.SearchTEIRepositoryImpl;
 import org.dhis2.mobileProgramRules.EvaluationType;
 import org.dhis2.mobileProgramRules.RuleEngineHelper;
 import org.dhis2.form.data.FileController;
 import org.dhis2.form.data.FormValueStore;
-import org.dhis2.form.data.RulesRepository;
 import org.dhis2.form.data.UniqueAttributeController;
 import org.dhis2.form.model.RowAction;
 import org.dhis2.form.ui.FieldViewModelFactory;
@@ -77,12 +74,6 @@ EventCaptureContract.EventCaptureRepository provideRepository(D2 d2) {
         return new EventCaptureRepositoryImpl(eventUid, d2);
     }
 
-    @Provides
-    @PerActivity
-    RulesRepository rulesRepository(@NonNull D2 d2) {
-        return new RulesRepository(d2);
-    }
-
     @Provides
     @PerActivity
     RuleEngineHelper ruleEngineRepository(D2 d2) {
@@ -93,13 +84,6 @@ RuleEngineHelper ruleEngineRepository(D2 d2) {
         );
     }
 
-    @Provides
-    @PerActivity
-    FormRepository formRepository(@NonNull RulesRepository rulesRepository,
-                                  @NonNull D2 d2) {
-        return new EventRepository(rulesRepository, eventUid, d2);
-    }
-
     @Provides
     @PerActivity
     FormValueStore valueStore(

diff --git a/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java b/...n/java/org/dhis2/usescases/eventsWithoutRegistration/eventInitial/EventInitialModule.java
@@ -15,9 +15,6 @@
 import org.dhis2.commons.resources.DhisPeriodUtils;
 import org.dhis2.commons.resources.ResourceManager;
 import org.dhis2.commons.schedulers.SchedulerProvider;
-import org.dhis2.data.forms.EventRepository;
-import org.dhis2.data.forms.FormRepository;
-import org.dhis2.form.data.RulesRepository;
 import org.dhis2.form.data.RulesUtilsProvider;
 import org.dhis2.form.data.metadata.FileResourceConfiguration;
 import org.dhis2.form.data.metadata.OptionSetConfiguration;
@@ -118,17 +115,6 @@ FieldViewModelFactory fieldFactory(
         );
     }
 
-    @Provides
-    FormRepository formRepository(@NonNull RulesRepository rulesRepository,
-                                  @NonNull D2 d2) {
-        return new EventRepository(rulesRepository, eventUid, d2);
-    }
-
-    @Provides
-    RulesRepository rulesRepository(@NonNull D2 d2) {
-        return new RulesRepository(d2);
-    }
-
     @Provides
     @PerActivity
     EventInitialRepository eventDetailRepository(

diff --git a/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.kt b/app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardModule.kt
@@ -9,9 +9,6 @@ import org.dhis2.commons.prefs.PreferenceProvider
 import org.dhis2.commons.resources.MetadataIconProvider
 import org.dhis2.commons.schedulers.SchedulerProvider
 import org.dhis2.commons.viewmodel.DispatcherProvider
-import org.dhis2.data.forms.EnrollmentFormRepository
-import org.dhis2.data.forms.FormRepository
-import org.dhis2.form.data.RulesRepository
 import org.dhis2.mobileProgramRules.EvaluationType
 import org.dhis2.mobileProgramRules.RuleEngineHelper
 import org.dhis2.utils.analytics.AnalyticsHelper
@@ -73,26 +70,6 @@ class TeiDashboardModule(
         )
     }
 
-    @Provides
-    @PerActivity
-    fun rulesRepository(d2: D2): RulesRepository {
-        return RulesRepository(d2)
-    }
-
-    @Provides
-    @PerActivity
-    fun formRepository(
-        rulesRepository: RulesRepository,
-        d2: D2,
-    ): FormRepository {
-        val enrollmentUidToUse = enrollmentUid ?: ""
-        return EnrollmentFormRepository(
-            rulesRepository,
-            enrollmentUidToUse,
-            d2,
-        )
-    }
-
     @Provides
     @PerActivity
     fun ruleEngineRepository(

diff --git a/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt b/app/src/main/java/org/dhis2/usescases/troubleshooting/TroubleshootingRepository.kt
@@ -1,8 +1,8 @@
 package org.dhis2.usescases.troubleshooting
 
 import org.dhis2.commons.resources.MetadataIconProvider
-import org.dhis2.form.bindings.toRuleEngineObject
-import org.dhis2.form.bindings.toRuleVariableList
+import org.dhis2.mobileProgramRules.toRuleEngineObject
+import org.dhis2.mobileProgramRules.toRuleVariableList
 import org.dhis2.usescases.development.ProgramRuleValidation
 import org.dhis2.usescases.development.RuleValidation
 import org.hisp.dhis.android.core.D2

diff --git a/app/src/test/java/org/dhis2/data/forms/RulesRepositoryTest.kt b/app/src/test/java/org/dhis2/data/forms/RulesRepositoryTest.kt
@@ -1,6 +1,5 @@
 package org.dhis2.data.forms
 
-import org.dhis2.form.data.RulesRepository
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnit
 import org.hisp.dhis.android.core.organisationunit.OrganisationUnitGroup

diff --git a/commons/src/main/java/org/dhis2/commons/rules/RuleEngineExtensions.kt b/commons/src/main/java/org/dhis2/commons/rules/RuleEngineExtensions.kt
diff --git a/dhis2-mobile-program-rules/build.gradle.kts b/dhis2-mobile-program-rules/build.gradle.kts
@@ -27,15 +27,18 @@ android {
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
 dependencies {
     implementation(project(":commons"))
+    testImplementation(libs.test.mockitoCore)
+    testImplementation(libs.test.mockitoInline)
+    testImplementation(libs.test.mockitoKotlin)
     coreLibraryDesugaring(libs.desugar)
 }
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
@@ -3,7 +3,6 @@ package org.dhis2.mobileProgramRules
 import kotlinx.datetime.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
-import org.dhis2.commons.rules.toRuleEngineInstant
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.common.ValueType
 import org.hisp.dhis.android.core.dataelement.DataElementCollectionRepository

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
@@ -11,8 +11,6 @@ import org.dhis2.commons.bindings.event
 import org.dhis2.commons.bindings.organisationUnit
 import org.dhis2.commons.bindings.program
 import org.dhis2.commons.bindings.programStage
-import org.dhis2.commons.rules.toRuleEngineInstant
-import org.dhis2.commons.rules.toRuleEngineLocalDate
 import org.hisp.dhis.android.core.D2
 import org.hisp.dhis.android.core.arch.helpers.UidsHelper
 import org.hisp.dhis.android.core.arch.repositories.scope.RepositoryScope