Skip to content

Commit 05f1541

Browse files
authored
chore: [ANDROSDK-2323] migrate enrollment domain models to kotlin (#2639)
2 parents a390b1c + 16cf5f7 commit 05f1541

39 files changed

Lines changed: 1276 additions & 1316 deletions

core/api/core.api

Lines changed: 211 additions & 71 deletions
Large diffs are not rendered by default.

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import org.hisp.dhis.android.core.arch.helpers.UidGenerator
3737
import org.hisp.dhis.android.core.arch.helpers.UidGeneratorImpl
3838
import org.hisp.dhis.android.core.data.server.RealServerMother
3939
import org.hisp.dhis.android.core.enrollment.Enrollment
40-
import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
4140
import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
4241
import org.hisp.dhis.android.core.event.Event
4342
import org.hisp.dhis.android.core.imports.ImportStatus
@@ -212,7 +211,8 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
212211
}
213212

214213
private fun validEnrollment(): Enrollment {
215-
return EnrollmentInternalAccessor.insertEvents(Enrollment.builder(), listOf(validEvent()))
214+
return Enrollment.builder()
215+
.events(listOf(validEvent()))
216216
.uid(uidGenerator.generate())
217217
.organisationUnit(captureOrgunit)
218218
.program(program)
@@ -234,14 +234,14 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
234234
return TrackedEntityInstanceInternalAccessor.insertEnrollments(
235235
validTei().toBuilder(),
236236
listOf(
237-
EnrollmentInternalAccessor.insertEvents(
238-
validEnrollment().toBuilder(),
239-
listOf(
240-
validEvent().toBuilder()
241-
.organisationUnit(searchOrgunit)
242-
.build(),
243-
),
244-
)
237+
validEnrollment().toBuilder()
238+
.events(
239+
listOf(
240+
validEvent().toBuilder()
241+
.organisationUnit(searchOrgunit)
242+
.build(),
243+
),
244+
)
245245
.build(),
246246
),
247247
)
@@ -252,7 +252,7 @@ class BreakTheGlassAPIShould : BaseRealIntegrationTest() {
252252
return TrackedEntityInstanceInternalAccessor.insertEnrollments(
253253
validTei().toBuilder(),
254254
listOf(
255-
EnrollmentInternalAccessor.insertEvents(validEnrollment().toBuilder(), listOf(validEvent()))
255+
validEnrollment().toBuilder().events(listOf(validEvent()))
256256
.organisationUnit(searchOrgunit).build(),
257257
),
258258
)

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import org.hisp.dhis.android.core.arch.api.executors.internal.CoroutineAPICallEx
3535
import org.hisp.dhis.android.core.arch.api.payload.internal.Payload
3636
import org.hisp.dhis.android.core.arch.d2.internal.DhisAndroidSdkKoinContext
3737
import org.hisp.dhis.android.core.enrollment.Enrollment
38-
import org.hisp.dhis.android.core.enrollment.EnrollmentInternalAccessor
3938
import org.hisp.dhis.android.core.enrollment.EnrollmentStatus
4039
import org.hisp.dhis.android.core.event.Event
4140
import org.hisp.dhis.android.core.event.EventStatus
@@ -444,8 +443,8 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
444443
val enrollment = enrollments[0]
445444
val events = d2.eventModule().events().byEnrollmentUid().eq(enrollment.uid()).blockingGet()
446445
if (events.size == 1) {
447-
val enrollmentWithEvents = EnrollmentInternalAccessor
448-
.insertEvents(enrollment.toBuilder(), events).build()
446+
val enrollmentWithEvents = enrollment.toBuilder()
447+
.events(events).build()
449448
return TrackedEntityInstanceInternalAccessor
450449
.insertEnrollments(instance.toBuilder(), listOf(enrollmentWithEvents))
451450
.build()
@@ -462,7 +461,7 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
462461
for (event in getEvents(enrollment)) {
463462
events.add(event!!.toBuilder().deleted(true).build())
464463
}
465-
enrollments.add(EnrollmentInternalAccessor.insertEvents(enrollment!!.toBuilder(), events).build())
464+
enrollments.add(enrollment!!.toBuilder().events(events).build())
466465
}
467466
return TrackedEntityInstanceInternalAccessor
468467
.insertEnrollments(instance.toBuilder(), enrollments)
@@ -474,6 +473,6 @@ abstract class TrackedEntityInstanceAPIShould internal constructor(
474473
}
475474

476475
private fun getEvents(enrollment: Enrollment?): List<Event?> {
477-
return EnrollmentInternalAccessor.accessEvents(enrollment)
476+
return enrollment?.events() ?: emptyList()
478477
}
479478
}

0 commit comments

Comments
 (0)