[ANDROSDK-2339] fix program stage null pointer error

Author: taridepaco

core/src/main/java/org/hisp/dhis/android/core/program/internal/ProgramStageHandler.kt

@@ -34,7 +34,6 @@ import org.hisp.dhis.android.core.attribute.ProgramStageAttributeValueLink
 import org.hisp.dhis.android.core.attribute.internal.ProgramStageAttributeValueLinkHandler
 import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStage
-import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.koin.core.annotation.Singleton
 
 @Singleton
@@ -52,11 +51,7 @@ internal class ProgramStageHandler(
         programStageDataElementHandler.handleMany(o.programStageDataElements())
         programStageSectionHandler.handleMany(
             o.programStageSections(),
-        ) { programStageSection: ProgramStageSection ->
-            programStageSection.toBuilder()
-                .programStage(ObjectWithUid.create(o.uid()))
-                .build()
-        }
+        )
 
         if (action === HandleAction.Update) {
             programStageDataElementCleaner.deleteOrphan(o, o.programStageDataElements())

core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageDTO.kt

@@ -113,7 +113,7 @@ internal data class ProgramStageDTO(
             minDaysFromStart(minDaysFromStart)
             standardInterval(standardInterval)
             enableUserAssignment?.let { enableUserAssignment(it) }
-            programStageSections(programStageSections?.map { it.toDomain() })
+            programStageSections(programStageSections?.map { it.toDomain(id) })
             programStageDataElements(programStageDataElements?.map { it.toDomain() })
             periodType(periodType?.let { PeriodType.valueOf(it) })
             program(program?.toDomain())

core/src/main/java/org/hisp/dhis/android/network/programstage/ProgramStageSectionDTO.kt

@@ -29,6 +29,7 @@
 package org.hisp.dhis.android.network.programstage
 
 import kotlinx.serialization.Serializable
+import org.hisp.dhis.android.core.common.ObjectWithUid
 import org.hisp.dhis.android.core.program.ProgramStageSection
 import org.hisp.dhis.android.network.common.dto.BaseIdentifiableObjectDTO
 import org.hisp.dhis.android.network.common.dto.ObjectWithUidDTO
@@ -53,14 +54,14 @@ internal data class ProgramStageSectionDTO(
     val description: String?,
     val displayDescription: String?,
 ) : BaseIdentifiableObjectDTO {
-    fun toDomain(): ProgramStageSection {
+    fun toDomain(programStageUid: String): ProgramStageSection {
         return ProgramStageSection.builder()
             .applyBaseIdentifiableFields(this)
             .sortOrder(sortOrder)
             .programIndicators(programIndicators?.map { it.toDomain() })
             .dataElements(dataElements?.map { it.toDomain() })
             .renderType(renderType?.toDomain())
-            .programStage(programStage!!.toDomain())
+            .programStage(ObjectWithUid.create(programStageUid))
             .description(description)
             .displayDescription(displayDescription)
             .build()