[ANDROSDK-2336] make mapNotNullItems generic on PayloadJson

Author: taridepaco

core/src/main/java/org/hisp/dhis/android/network/common/PayloadJson.kt

@@ -56,4 +56,10 @@ internal open class PayloadJson<T>(
     ): PayloadJson<P> {
         return PayloadJson(pager, items.map(transform))
     }
+
+    fun <P> mapNotNullItems(
+        transform: (T) -> P?,
+    ): PayloadJson<P> {
+        return PayloadJson(pager, items.mapNotNull(transform))
+    }
 }

core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListDTO.kt

@@ -51,16 +51,18 @@ internal data class ProgramStageWorkingListDTO(
     val programStage: ObjectWithUidDTO?,
     val programStageQueryCriteria: ProgramStageQueryCriteriaDTO,
 ) : BaseIdentifiableObjectDTO {
-    fun toDomain(): ProgramStageWorkingList {
-        return ProgramStageWorkingList.builder()
-            .applyBaseIdentifiableFields(this)
-            .description(description)
-            .apply {
-                program?.let { program(it.toDomain()) }
-                programStage?.let { programStage(it.toDomain()) }
-            }
-            .programStageQueryCriteria(programStageQueryCriteria.toDomain(id))
-            .build()
+    fun toDomain(): ProgramStageWorkingList? {
+        return if (program != null && programStage != null) {
+            ProgramStageWorkingList.builder()
+                .applyBaseIdentifiableFields(this)
+                .description(description)
+                .program(program.toDomain())
+                .programStage(programStage.toDomain())
+                .programStageQueryCriteria(programStageQueryCriteria.toDomain(id))
+                .build()
+        } else {
+            null
+        }
     }
 }
 

core/src/main/java/org/hisp/dhis/android/network/programstageworkinglist/ProgramStageWorkingListNetworkHandlerImpl.kt

@@ -48,6 +48,6 @@ internal class ProgramStageWorkingListNetworkHandlerImpl(
             ProgramStageWorkingListFields.allFields,
             false,
         )
-        return apiPayload.mapItems(ProgramStageWorkingListDTO::toDomain)
+        return apiPayload.mapNotNullItems(ProgramStageWorkingListDTO::toDomain)
     }
 }

core/src/main/java/org/hisp/dhis/android/network/validationrule/ValidationRuleDTO.kt

@@ -86,11 +86,6 @@ internal class ValidationRulePayload(
     override val pager: PagerDTO?,
     @SerialName("validationRules") override val items: List<ValidationRuleDTO> = emptyList(),
 ) : PayloadJson<ValidationRuleDTO>(pager, items) {
-    fun mapNotNullItems(
-        transform: (ValidationRuleDTO) -> ValidationRule?,
-    ): PayloadJson<ValidationRule> {
-        return PayloadJson(pager, items.mapNotNull(transform))
-    }
 }
 
 @Serializable

core/src/test/java/org/hisp/dhis/android/core/programstageworkinglist/ProgramStageWorkingListShould.kt

@@ -45,15 +45,15 @@ internal class ProgramStageWorkingListShould : CoreObjectShould<ProgramStageWork
     @Test
     override fun map_from_json_string() {
         val workingListDTO = deserialize()
-        val workingList = workingListDTO.toDomain()
+        val workingList = workingListDTO.toDomain()!!
 
         assertThat(workingList.created()).isEqualTo(DateUtils.DATE_FORMAT.parse("2023-01-26T19:16:58.712"))
         assertThat(workingList.lastUpdated()).isEqualTo(DateUtils.DATE_FORMAT.parse("2023-01-26T19:16:58.712"))
         assertThat(workingList.uid()).isEqualTo("NAgjOfWMXg6")
         assertThat(workingList.name()).isEqualTo("Test WL")
         assertThat(workingList.displayName()).isEqualTo("Test WL display")
-        assertThat(workingList.program()!!.uid()).isEqualTo("uy2gU8kT1jF")
-        assertThat(workingList.programStage()!!.uid()).isEqualTo("oRySG82BKE6")
+        assertThat(workingList.program().uid()).isEqualTo("uy2gU8kT1jF")
+        assertThat(workingList.programStage().uid()).isEqualTo("oRySG82BKE6")
         assertThat(workingList.description()).isEqualTo("Test WL definition")
         assertThat(workingList.programStageQueryCriteria()?.eventStatus()).isEqualTo(EventStatus.ACTIVE)
         assertThat(workingList.programStageQueryCriteria()?.eventCreatedAt()).isNotNull()