Skip to content

feat: Add categoryCombo field to DataApprovalWorkflow model #527

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
larshelge merged 1 commit into from
May 13, 2026
Merged

feat: Add categoryCombo field to DataApprovalWorkflow model #527

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
4 changes: 3 additions & 1 deletion src/main/java/org/hisp/dhis/api/ApiFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ public class ApiFields {

/** Data approval workflow fields. */
public static final String DATA_APPROVAL_WORKFLOW_FIELDS =
String.format("%s,periodType,dataSets[%s]", NAME_EXT_FIELDS, NAME_FIELDS);
String.format(
"%s,periodType,categoryCombo[%s],dataSets[%s]",
NAME_EXT_FIELDS, NAME_FIELDS, NAME_FIELDS);

/** Data entry form fields. */
public static final String DATA_ENTRY_FORM_FIELDS =
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/hisp/dhis/model/DataApprovalWorkflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@
public class DataApprovalWorkflow extends NameableObject {
@JsonProperty private String periodType;

@JsonProperty private CategoryCombo categoryCombo;

@JsonProperty private List<DataSet> dataSets = new ArrayList<>();
}
3 changes: 3 additions & 0 deletions src/test/java/org/hisp/dhis/model/DataApprovalWorkflowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ void testDeserialize() {
assertEquals("wkn0K4gtVHo", workflow.getId());
assertEquals("Malaria Approval Workflow", workflow.getName());
assertEquals("Monthly", workflow.getPeriodType());
assertNotNull(workflow.getCategoryCombo());
assertEquals("bjDvmb4bfuf", workflow.getCategoryCombo().getId());
assertEquals("default", workflow.getCategoryCombo().getName());
assertSize(3, workflow.getDataSets());
assertEquals("pBOMPrpg1QX", workflow.getDataSets().get(0).getId());
assertEquals("VTdjfLXXmoi", workflow.getDataSets().get(1).getId());
Expand Down
4 changes: 4 additions & 0 deletions src/test/resources/metadata/data-approval-workflow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"code": "MALARIA_WORKFLOW",
"name": "Malaria Approval Workflow",
"periodType": "Monthly",
"categoryCombo": {
"id": "bjDvmb4bfuf",
"name": "default"
},
"dataSets": [
{
"id": "pBOMPrpg1QX",
Expand Down
Loading