Skip to content

fix: Fix patch for nextScheduledDate in PS [DHIS2-20042] (2.42) #22860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enricocolasante merged 1 commit into from
Jan 28, 2026
+89 −1
Merged

fix: Fix patch for nextScheduledDate in PS [DHIS2-20042] (2.42) #22860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ain/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramStageObjectBundleHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ public void validate(
DataElement.class,
programStage.getNextScheduleDate().getUid());

if (!programStage.getDataElements().contains(programStage.getNextScheduleDate())
if (programStage.getDataElements().stream()
.noneMatch(de -> de.getUid().equals(programStage.getNextScheduleDate().getUid()))
|| nextScheduleDate == null
|| !nextScheduleDate.getValueType().equals(ValueType.DATE)) {
addReports.accept(
Expand Down
87 changes: 87 additions & 0 deletions ...est-web-api/src/test/java/org/hisp/dhis/webapi/controller/ProgramStageControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@
import static org.hisp.dhis.http.HttpAssertions.assertStatus;
import static org.junit.jupiter.api.Assertions.assertEquals;

import org.hisp.dhis.common.ValueType;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.feedback.ErrorCode;
import org.hisp.dhis.http.HttpStatus;
import org.hisp.dhis.jsontree.JsonObject;
import org.hisp.dhis.test.webapi.H2ControllerIntegrationTestBase;
import org.hisp.dhis.test.webapi.json.domain.JsonTypeReport;
import org.hisp.dhis.test.webapi.json.domain.JsonWebMessage;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;

/**
Expand All @@ -47,6 +51,8 @@
@Transactional
class ProgramStageControllerTest extends H2ControllerIntegrationTestBase {

@Autowired private DataElementService dataElementService;

@Test
void testCreateProgramStageWithoutProgram() {
JsonWebMessage message =
Expand Down Expand Up @@ -82,4 +88,85 @@ void testCreateProgramStageOk() {
assertEquals("programstagelabel", programStage.getString("programStageLabel").string());
assertEquals("eventlabel", programStage.getString("eventLabel").string());
}

@Test
void shouldSuccessfullyPatchNextScheduledDateField() {
DataElement dataElement = createDataElement('A');
dataElement.setValueType(ValueType.DATE);
dataElementService.addDataElement(dataElement);
POST(
"/programs/",
"""
{'name':'test program', 'id':'VoZMWi7rBgj', 'shortName':'test program','programType':'WITH_REGISTRATION'}""")
.content(HttpStatus.CREATED);
String programStageId =
assertStatus(
HttpStatus.CREATED,
POST(
"/programStages/",
"""
{'name':'test programStage', 'program':{'id':'VoZMWi7rBgj'},
'programStageDataElements': [
{
'dataElement': {
'id': '%s'
}
}]}"""
.formatted(dataElement.getUid())));
JsonWebMessage message =
PATCH(
"/programStages/" + programStageId,
"""
[{"op": "replace",
"path": "/nextScheduleDate",
"value": {"id": "%s"}}]
"""
.formatted(dataElement.getUid()))
.content(HttpStatus.OK)
.as(JsonWebMessage.class);
assertEquals("OK", message.getStatus());
JsonObject programStage = GET("/programStages/{id}", programStageId).content();
assertEquals(
dataElement.getUid(), programStage.getObject("nextScheduleDate").getString("id").string());
}

@Test
void shouldFailToPatchNextScheduledDateWhenItIsReferencingADataElementWithWrongValueType() {
DataElement dataElement = createDataElement('A');
dataElement.setValueType(ValueType.TEXT);
dataElementService.addDataElement(dataElement);
POST(
"/programs/",
"""
{'name':'test program', 'id':'VoZMWi7rBgj', 'shortName':'test program','programType':'WITH_REGISTRATION'}""")
.content(HttpStatus.CREATED);
String programStageId =
assertStatus(
HttpStatus.CREATED,
POST(
"/programStages/",
"""
{'name':'test programStage', 'program':{'id':'VoZMWi7rBgj'},
'programStageDataElements': [
{
'dataElement': {
'id': '%s'
}
}]}"""
.formatted(dataElement.getUid())));
JsonWebMessage message =
PATCH(
"/programStages/" + programStageId,
"""
[{"op": "replace",
"path": "/nextScheduleDate",
"value": {"id": "%s"}}]
"""
.formatted(dataElement.getUid()))
.content(HttpStatus.CONFLICT)
.as(JsonWebMessage.class);
JsonTypeReport response = message.get("response", JsonTypeReport.class);
assertEquals(1, response.getErrorReports().size());
assertEquals(ErrorCode.E6001, response.getErrorReports().get(0).getErrorCode());
}
}