[ANDROSDK-2334] Adapt NewTracker data value DTO

Author: vgarciabnz

core/src/main/java/org/hisp/dhis/android/network/tracker/NewEventDTO.kt

@@ -87,7 +87,7 @@ internal data class NewEventDTO(
             dueDate(scheduledAt?.toDomain())
             attributeOptionCombo(attributeOptionCombo)
             assignedUser(assignedUser?.uid)
-            trackedEntityDataValues(dataValues?.map { it.toDomain(event) })
+            trackedEntityDataValues(dataValues?.mapNotNull { it.toDomain(event) })
             notes(notes?.map { it.toDomain(event = event) })
             relationships(relationships?.map { it.toDomain() })
             trackedEntityInstance(trackedEntity)

core/src/main/java/org/hisp/dhis/android/network/tracker/NewTrackedEntityDataValueDTO.kt

@@ -44,16 +44,18 @@ internal data class NewTrackedEntityDataValueDTO(
     val value: ValueDTO?,
     val providedElsewhere: Boolean?,
 ) {
-    fun toDomain(eventUid: String?): TrackedEntityDataValue {
-        return TrackedEntityDataValue.builder().apply {
-            eventUid?.let { event(it) }
-            created(createdAt?.toDomain())
-            lastUpdated(updatedAt?.toDomain())
-            dataElement?.let { dataElement(it) }
-            storedBy(createdBy?.username)
-            value(value?.value)
-            providedElsewhere(providedElsewhere)
-        }.build()
+    fun toDomain(eventUid: String): TrackedEntityDataValue? {
+        return dataElement?.let {
+            TrackedEntityDataValue.builder()
+                .event(eventUid)
+                .created(createdAt?.toDomain())
+                .lastUpdated(updatedAt?.toDomain())
+                .dataElement(dataElement)
+                .storedBy(createdBy?.username)
+                .value(value?.value)
+                .providedElsewhere(providedElsewhere)
+                .build()
+        }
     }
 }
 
@@ -62,7 +64,7 @@ internal fun NewTrackerImporterTrackedEntityDataValue.toDto(): NewTrackedEntityD
         createdAt = createdAt?.toZonedDateDto(),
         updatedAt = updatedAt?.toZonedDateDto(),
         dataElement = dataElement,
-        createdBy = createdBy?.let { it.toDto() },
+        createdBy = createdBy?.toDto(),
         value = ValueDTO(value),
         providedElsewhere = providedElsewhere,
     )

core/src/test/java/org/hisp/dhis/android/core/trackedentity/NewTrackerImporterTrackedEntityDataValueShould.kt

@@ -41,7 +41,7 @@ internal class NewTrackerImporterTrackedEntityDataValueShould : CoreObjectShould
     @Test
     override fun map_from_json_string() {
         val dataValueDTO = deserialize()
-        val dataValue = dataValueDTO.toDomain("xE7jOejl9FI")
+        val dataValue = dataValueDTO.toDomain("xE7jOejl9FI")!!
 
         assertThat(dataValue.created()).isEqualTo(DateUtils.DATE_FORMAT.parse("2017-01-20T10:44:03.231"))
         assertThat(dataValue.lastUpdated()).isEqualTo(DateUtils.DATE_FORMAT.parse("2022-09-28T14:23:29.016"))