Merge branch 'develop' into ANDROSDK-2309

Author: taridepaco

core/api/core.api

@@ -645,17 +645,23 @@ class EventLineListIntegrationShould : BaseMockIntegrationTestEmptyDispatcher()
         val programIndicator = EventLineListSamples.programIndicator(expression)
         programIndicatorStore.insert(programIndicator)
         programIndicatorLegendSetLinkStore.insert(
-            ProgramIndicatorLegendSetLink.builder().programIndicator(programIndicator.uid()).legendSet(
-                legendSet1.uid(),
-            ).build(),
+            ProgramIndicatorLegendSetLink.builder()
+                .programIndicator(programIndicator.uid())
+                .legendSet(legendSet1.uid())
+                .sortOrder(0)
+                .build(),
         )
         return programIndicator
     }
 
     private suspend fun createDataElementLegendSetLinks(dataElement: String, legendSets: List<ObjectWithUid>) {
-        legendSets.forEach {
+        legendSets.forEachIndexed { i, legendSet ->
             val dataElementLegendSetLink =
-                DataElementLegendSetLink.builder().dataElement(dataElement).legendSet(it.uid()).build()
+                DataElementLegendSetLink.builder()
+                    .dataElement(dataElement)
+                    .legendSet(legendSet.uid())
+                    .sortOrder(i)
+                    .build()
             dataElementLegendSetLinkStore.insert(dataElementLegendSetLink)
         }
     }

core/src/androidTest/java/org/hisp/dhis/android/core/analytics/eventlinelist/EventLineListIntegrationShould.kt

@@ -44,7 +44,7 @@ class IndicatorLegendSetLinkStoreIntegrationShould :
         TestDatabaseAdapterFactory.get(),
     ) {
     override fun addMasterUid(): String {
-        return IndicatorLegendSetLinkSamples.getIndicatorLegendSetLink().indicator()!!
+        return IndicatorLegendSetLinkSamples.getIndicatorLegendSetLink().indicator()
     }
 
     override fun buildObject(): IndicatorLegendSetLink {

core/src/androidTest/java/org/hisp/dhis/android/core/legendset/IndicatorLegendSetLinkStoreIntegrationShould.kt

@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.arch.helpers.UidGenerator
 import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
 import org.hisp.dhis.android.core.data.server.RealServerMother
 import org.hisp.dhis.android.core.enrollment.Enrollment
-import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.imports.ImportStatus
@@ -212,7 +211,8 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
     }
 
     private fun validEnrollment(): Enrollment {
-        return EnrollmentInternalAccessor.insertEvents(Enrollment.builder(), listOf(validEvent()))
+        return Enrollment.builder()
+            .events(listOf(validEvent()))
             .uid(uidGenerator.generate())
             .organisationUnit(captureOrgunit)
             .program(program)
@@ -234,14 +234,14 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
             validTei().toBuilder(),
             listOf(
-                EnrollmentInternalAccessor.insertEvents(
-                    validEnrollment().toBuilder(),
-                    listOf(
-                        validEvent().toBuilder()
-                            .organisationUnit(searchOrgunit)
-                            .build(),
-                    ),
-                )
+                validEnrollment().toBuilder()
+                    .events(
+                        listOf(
+                            validEvent().toBuilder()
+                                .organisationUnit(searchOrgunit)
+                                .build(),
+                        ),
+                    )
                     .build(),
             ),
         )
@@ -252,7 +252,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
         return TrackedEntityInstanceInternalAccessor.insertEnrollments(
             validTei().toBuilder(),
             listOf(
-                EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(), listOf(validEvent()))
+                validEnrollment().toBuilder().events(listOf(validEvent()))
                     .organisationUnit(searchOrgunit).build(),
             ),
         )

core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/BreakTheGlassAPIShould.kt

@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallEx
 import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
 import org.hisp.dhis.android.core.arch.d2.internal.DhisAndroidSdkKoinContext
 import org.hisp.dhis.android.core.enrollment.Enrollment
-import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
 import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
 import org.hisp.dhis.android.core.event.Event
 import org.hisp.dhis.android.core.event.EventStatus
@@ -444,8 +443,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
                     val enrollment = enrollments[0]
                     val events = d2.eventModule().events().byEnrollmentUid().eq(enrollment.uid()).blockingGet()
                     if (events.size == 1) {
-                        val enrollmentWithEvents = EnrollmentInternalAccessor
-                            .insertEvents(enrollment.toBuilder(), events).build()
+                        val enrollmentWithEvents = enrollment.toBuilder()
+                            .events(events).build()
                         return TrackedEntityInstanceInternalAccessor
                             .insertEnrollments(instance.toBuilder(), listOf(enrollmentWithEvents))
                             .build()
@@ -462,7 +461,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
             for (event in getEvents(enrollment)) {
                 events.add(event!!.toBuilder().deleted(true).build())
             }
-            enrollments.add(EnrollmentInternalAccessor.insertEvents(enrollment!!.toBuilder(), events).build())
+            enrollments.add(enrollment!!.toBuilder().events(events).build())
         }
         return TrackedEntityInstanceInternalAccessor
             .insertEnrollments(instance.toBuilder(), enrollments)
@@ -474,6 +473,6 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
     }
 
     private fun getEvents(enrollment: Enrollment?): List<Event?> {
-        return EnrollmentInternalAccessor.accessEvents(enrollment)
+        return enrollment?.events() ?: emptyList()
     }
 }