fix: deliveryChannels is not persisted (40) (#23640)

* fix: deliveryChannels is not persisted

* minor

* minor

* minor

Author: vietnguyen

dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramNotificationTemplateObjectBundleHook.java

@@ -115,7 +115,7 @@ private void postProcess(ProgramNotificationTemplate template) {
     ValueType valueType = toValueType == null ? null : toValueType.apply(template);
 
     Set<DeliveryChannel> deliveryChannels =
-        valueType == null ? null : CHANNEL_MAPPER.get(valueType);
+        valueType == null ? template.getDeliveryChannels() : CHANNEL_MAPPER.get(valueType);
     template.setDeliveryChannels(deliveryChannels == null ? new HashSet<>() : deliveryChannels);
   }
 }

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/MetadataImportExportControllerTest.java

@@ -756,6 +756,28 @@ void removeDataSetIndicatorTest() {
             .contains("IndUid000x1"));
   }
 
+  @Test
+  void testSaveNotificationTemplateWithDeliveryChannels() {
+    POST("/metadata", WebClient.Body("program/program_notification_template.json"))
+        .content(HttpStatus.OK);
+    JsonObject template =
+        GET("/programNotificationTemplates/uivYkvFEOss")
+            .content(HttpStatus.OK)
+            .as(JsonObject.class);
+    assertNotNull(template);
+    assertEquals(1, template.getArray("deliveryChannels").size());
+
+    // Update the template with an additional delivery channel
+    POST("/metadata", WebClient.Body("program/program_notification_template_update.json"))
+        .content(HttpStatus.OK);
+    template =
+        GET("/programNotificationTemplates/uivYkvFEOss")
+            .content(HttpStatus.OK)
+            .as(JsonObject.class);
+    assertNotNull(template);
+    assertEquals(2, template.getArray("deliveryChannels").size());
+  }
+
   private void setupDataElementsWithCatCombos(CategoryCombo... categoryCombos) {
     DataElement deA = createDataElement('A', categoryCombos[0]);
     DataElement deB = createDataElement('B', categoryCombos[1]);

dhis-2/dhis-test-web-api/src/test/resources/program/program_notification_template.json

@@ -0,0 +1,22 @@
+{
+  "programNotificationTemplates": [
+    {
+      "notificationTrigger": "SCHEDULED_DAYS_DUE_DATE",
+      "lastUpdated": "2026-04-14T04:24:42.392",
+      "relativeScheduledDays": -3,
+      "subjectTemplate": "Immunization visit reminder",
+      "id": "uivYkvFEOss",
+      "notifyUsersInHierarchyOnly": false,
+      "created": "2016-10-11T10:32:58.490",
+      "sendRepeatable": false,
+      "notificationRecipient": "TRACKED_ENTITY_INSTANCE",
+      "notifyParentOrganisationUnitOnly": false,
+      "name": "Immunization visit reminder",
+      "messageTemplate": "Dear A{w75KJ2mc4zz}. This to remind you that you have an upcoming visit in V{days_until_due_date} days for your second immunization visit at V{program_stage_name} health facility. Please ensure to bring your immunization card with you.",
+      "translations": [],
+      "deliveryChannels": [
+        "SMS"
+      ]
+    }
+  ]
+}

dhis-2/dhis-test-web-api/src/test/resources/program/program_notification_template_update.json

@@ -0,0 +1,23 @@
+{
+  "programNotificationTemplates": [
+    {
+      "notificationTrigger": "SCHEDULED_DAYS_DUE_DATE",
+      "lastUpdated": "2026-04-14T04:24:42.392",
+      "relativeScheduledDays": -3,
+      "subjectTemplate": "Immunization visit reminder",
+      "id": "uivYkvFEOss",
+      "notifyUsersInHierarchyOnly": false,
+      "created": "2016-10-11T10:32:58.490",
+      "sendRepeatable": false,
+      "notificationRecipient": "TRACKED_ENTITY_INSTANCE",
+      "notifyParentOrganisationUnitOnly": false,
+      "name": "Immunization visit reminder",
+      "messageTemplate": "Dear A{w75KJ2mc4zz}. This to remind you that you have an upcoming visit in V{days_until_due_date} days for your second immunization visit at V{program_stage_name} health facility. Please ensure to bring your immunization card with you.",
+      "translations": [],
+      "deliveryChannels": [
+        "SMS",
+        "EMAIL"
+      ]
+    }
+  ]
+}