[ANDROSDK-2323] remove coordinates from enrollment

taridepaco · taridepaco · commit f7aef5bcae68 · 2026-06-16T11:05:30.000+02:00
fix tests and update api dump
diff --git a/core/api/core.api b/core/api/core.api
@@ -7926,7 +7926,7 @@ public final class org/hisp/dhis/android/core/domain/aggregated/data/internal/Ag
 
 public final class org/hisp/dhis/android/core/enrollment/Enrollment : org/hisp/dhis/android/core/common/DataObjectKt, org/hisp/dhis/android/core/common/DeletableDataObjectKt, org/hisp/dhis/android/core/common/ObjectWithUidInterfaceKt {
 	public static final field Companion Lorg/hisp/dhis/android/core/enrollment/Enrollment$Companion;
-	public fun <init> (Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Coordinates;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;)V
+	public fun <init> (Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;)V
 	public final fun aggregatedSyncState ()Lorg/hisp/dhis/android/core/common/State;
 	public final fun attributeOptionCombo ()Ljava/lang/String;
 	public static final fun builder ()Lorg/hisp/dhis/android/core/enrollment/Enrollment$Builder;
@@ -7939,19 +7939,19 @@ public final class org/hisp/dhis/android/core/enrollment/Enrollment : org/hisp/d
 	public final fun component14 ()Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;
 	public final fun component15 ()Ljava/lang/String;
 	public final fun component16 ()Ljava/lang/String;
-	public final fun component18 ()Lorg/hisp/dhis/android/core/common/Geometry;
+	public final fun component17 ()Lorg/hisp/dhis/android/core/common/Geometry;
+	public final fun component19 ()Ljava/util/List;
 	public final fun component2 ()Lorg/hisp/dhis/android/core/common/State;
-	public final fun component20 ()Ljava/util/List;
-	public final fun component22 ()Lorg/hisp/dhis/android/core/common/State;
+	public final fun component21 ()Lorg/hisp/dhis/android/core/common/State;
 	public final fun component3 ()Ljava/lang/Boolean;
 	public final fun component4 ()Ljava/util/Date;
 	public final fun component5 ()Ljava/util/Date;
 	public final fun component6 ()Ljava/util/Date;
 	public final fun component7 ()Ljava/util/Date;
 	public final fun component8 ()Ljava/lang/String;
 	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Coordinates;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;)Lorg/hisp/dhis/android/core/enrollment/Enrollment;
-	public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/enrollment/Enrollment;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Coordinates;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/enrollment/Enrollment;
+	public final fun copy (Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;)Lorg/hisp/dhis/android/core/enrollment/Enrollment;
+	public static synthetic fun copy$default (Lorg/hisp/dhis/android/core/enrollment/Enrollment;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/State;Ljava/lang/Boolean;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Ljava/util/Date;Ljava/util/Date;Ljava/lang/Boolean;Lorg/hisp/dhis/android/core/enrollment/EnrollmentStatus;Ljava/lang/String;Ljava/lang/String;Lorg/hisp/dhis/android/core/common/Geometry;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/hisp/dhis/android/core/common/State;ILjava/lang/Object;)Lorg/hisp/dhis/android/core/enrollment/Enrollment;
 	public final fun created ()Ljava/util/Date;
 	public final fun createdAtClient ()Ljava/util/Date;
 	public fun deleted ()Ljava/lang/Boolean;
@@ -7996,7 +7996,6 @@ public final class org/hisp/dhis/android/core/enrollment/Enrollment : org/hisp/d
 
 public final class org/hisp/dhis/android/core/enrollment/Enrollment$Builder : org/hisp/dhis/android/core/enrollment/EnrollmentBuilder {
 	public fun <init> ()V
-	public fun build ()Lorg/hisp/dhis/android/core/enrollment/Enrollment;
 }
 
 public final class org/hisp/dhis/android/core/enrollment/Enrollment$Companion {
@@ -8032,7 +8031,6 @@ public class org/hisp/dhis/android/core/enrollment/EnrollmentBuilder {
 	protected final fun getAggregatedSyncState ()Lorg/hisp/dhis/android/core/common/State;
 	protected final fun getAttributeOptionCombo ()Ljava/lang/String;
 	protected final fun getCompletedDate ()Ljava/util/Date;
-	protected final fun getCoordinate ()Lorg/hisp/dhis/android/core/common/Coordinates;
 	protected final fun getCreated ()Ljava/util/Date;
 	protected final fun getCreatedAtClient ()Ljava/util/Date;
 	protected final fun getDeleted ()Ljava/lang/Boolean;
@@ -8060,7 +8058,6 @@ public class org/hisp/dhis/android/core/enrollment/EnrollmentBuilder {
 	protected final fun setAggregatedSyncState (Lorg/hisp/dhis/android/core/common/State;)V
 	protected final fun setAttributeOptionCombo (Ljava/lang/String;)V
 	protected final fun setCompletedDate (Ljava/util/Date;)V
-	protected final fun setCoordinate (Lorg/hisp/dhis/android/core/common/Coordinates;)V
 	protected final fun setCreated (Ljava/util/Date;)V
 	protected final fun setCreatedAtClient (Ljava/util/Date;)V
 	protected final fun setDeleted (Ljava/lang/Boolean;)V
diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.kt b/core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/api/TrackedEntityInstanceUtils.kt
@@ -1,5 +1,5 @@
 /*
-  *  Copyright (c) 2004-2026, University of Oslo
+ *  Copyright (c) 2004-2026, University of Oslo
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/Enrollment.kt
@@ -29,8 +29,6 @@
 package org.hisp.dhis.android.core.enrollment
 
 import org.hisp.dhis.android.annotations.ModelBuilder
-import org.hisp.dhis.android.core.arch.helpers.CoordinateHelper
-import org.hisp.dhis.android.core.common.Coordinates
 import org.hisp.dhis.android.core.common.DataObjectKt
 import org.hisp.dhis.android.core.common.DeletableDataObjectKt
 import org.hisp.dhis.android.core.common.Geometry
@@ -60,7 +58,6 @@ data class Enrollment(
     val status: EnrollmentStatus?,
     val trackedEntityInstance: String?,
     val attributeOptionCombo: String,
-    internal val coordinate: Coordinates?,
     val geometry: Geometry?,
     internal val events: List<Event>?,
     val notes: List<Note>?,
@@ -81,8 +78,6 @@ data class Enrollment(
     fun status(): EnrollmentStatus? = status
     fun trackedEntityInstance(): String? = trackedEntityInstance
     fun attributeOptionCombo(): String = attributeOptionCombo
-    @Deprecated("Deprecated since 2.30, use geometry() instead")
-    internal fun coordinate(): Coordinates? = coordinate
     fun geometry(): Geometry? = geometry
     internal fun events(): List<Event>? = events
     fun notes(): List<Note>? = notes
@@ -94,17 +89,7 @@ data class Enrollment(
 
     fun toBuilder(): Builder = EnrollmentBuilder.from(this)
 
-    class Builder : EnrollmentBuilder() {
-        override fun build(): Enrollment {
-            val currentGeometry = geometry
-            if (currentGeometry == null) {
-                coordinate?.let { geometry(CoordinateHelper.getGeometryFromCoordinates(it)) }
-            } else {
-                coordinate(CoordinateHelper.getCoordinatesFromGeometry(currentGeometry))
-            }
-            return super.build()
-        }
-    }
+    class Builder : EnrollmentBuilder()
 
     companion object {
         @JvmStatic
diff --git a/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCreateProjection.kt b/core/src/main/java/org/hisp/dhis/android/core/enrollment/EnrollmentCreateProjection.kt
@@ -60,7 +60,7 @@ data class EnrollmentCreateProjection(
                 organisationUnit = organisationUnit,
                 program = program,
                 trackedEntityInstance = trackedEntityInstance,
-                attributeOptionCombo = null
+                attributeOptionCombo = null,
             )
         }
 
@@ -75,7 +75,7 @@ data class EnrollmentCreateProjection(
                 organisationUnit = organisationUnit,
                 program = program,
                 trackedEntityInstance = trackedEntityInstance,
-                attributeOptionCombo = attributeOptionCombo
+                attributeOptionCombo = attributeOptionCombo,
             )
         }
     }
diff --git a/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentShould.kt b/core/src/test/java/org/hisp/dhis/android/core/enrollment/EnrollmentShould.kt
@@ -55,7 +55,6 @@ internal class EnrollmentShould : CoreObjectShould<EnrollmentDTO>(
         assertThat(enrollment.completedDate()).isEqualTo("2014-08-21T12:27:50.730".toJavaDate())
         assertThat(enrollment.followUp()).isFalse()
         assertThat(enrollment.status()).isEqualTo(EnrollmentStatus.COMPLETED)
-        assertThat(enrollment.coordinate()).isEqualTo(Coordinates.create(10.03, 11.11))
         assertThat(enrollment.trackedEntityInstance()).isEqualTo("D2dUWKQErfQ")
         assertThat(enrollment.geometry()!!.type()).isEqualTo(FeatureType.POINT)
         assertThat(enrollment.geometry()!!.coordinates()).isEqualTo("[11.11,10.03]")
diff --git a/core/src/test/java/org/hisp/dhis/android/core/sms/mockrepos/testobjects/MockObjects.kt b/core/src/test/java/org/hisp/dhis/android/core/sms/mockrepos/testobjects/MockObjects.kt
@@ -28,7 +28,6 @@
 
 package org.hisp.dhis.android.core.sms.mockrepos.testobjects
 
-import nl.jqno.equalsverifier.internal.reflection.Tuple
 import org.hisp.dhis.android.core.arch.helpers.GeometryHelper
 import org.hisp.dhis.android.core.datavalue.DataValue
 import org.hisp.dhis.android.core.enrollment.Enrollment
@@ -53,9 +52,13 @@ object MockObjects {
     const val enrollmentUidWithNullEvents = "aQr0XnMVyIq"
     const val enrollmentUidWithoutEvents = "hQKhXnMVLIm"
     const val enrollmentUidWithoutGeometry = "e5xQ7RriVpK"
+
     @JvmField val enrollmentDate = sampleDate
+
     @JvmField val incidentDate = sampleDate
+
     @JvmField val completedDate = sampleDate
+
     @JvmField val enrollmentStatus = EnrollmentStatus.ACTIVE
     const val latitude = 1.234F
     const val longitude = -0.123F
@@ -68,8 +71,11 @@ object MockObjects {
     const val categoryOptionCombo = "HllvX50cXC0"
     const val eventUid = "gqmgkrLT3XH"
     const val programStage = "bUzhUa4QWbQ"
+
     @JvmField val eventDate = sampleDate
+
     @JvmField val dueDate = sampleDate
+
     @JvmField val eventStatus = EventStatus.COMPLETED
     const val period = "2019"
     const val relationship = "Tj1ddhpeCFL"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2004-2026, University of Oslo`
	`2`	`+ * Copyright (c) 2004-2026, University of Oslo`
`3`	`3`	`* All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* Redistribution and use in source and binary forms, with or without`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ data class EnrollmentCreateProjection(`
`60`	`60`	`organisationUnit = organisationUnit,`
`61`	`61`	`program = program,`
`62`	`62`	`trackedEntityInstance = trackedEntityInstance,`
`63`		`- attributeOptionCombo = null`
	`63`	`+ attributeOptionCombo = null,`
`64`	`64`	`)`
`65`	`65`	`}`
`66`	`66`
`@@ -75,7 +75,7 @@ data class EnrollmentCreateProjection(`
`75`	`75`	`organisationUnit = organisationUnit,`
`76`	`76`	`program = program,`
`77`	`77`	`trackedEntityInstance = trackedEntityInstance,`
`78`		`- attributeOptionCombo = attributeOptionCombo`
	`78`	`+ attributeOptionCombo = attributeOptionCombo,`
`79`	`79`	`)`
`80`	`80`	`}`
`81`	`81`	`}`