(kylin) 26/35: KYLIN-5725 fix open the email notification configuration, to operate job and query failed

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 6f5030377d588d0180e5e050e65e2827ed9b7a03
Author: sibingzhang <74443791+sibingzh...@users.noreply.github.com>
AuthorDate: Tue Jun 13 17:13:50 2023 +0800

    KYLIN-5725 fix open the email notification configuration, to operate job 
and query failed
    
    Co-authored-by: sibing.zhang <sibing.zh...@qq.com>
---
 .../main/java/org/apache/kylin/rest/service/ProjectService.java  | 2 +-
 .../java/org/apache/kylin/rest/service/ProjectServiceTest.java   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git 
a/src/common-service/src/main/java/org/apache/kylin/rest/service/ProjectService.java
 
b/src/common-service/src/main/java/org/apache/kylin/rest/service/ProjectService.java
index 9bee1b813e..d32d8b261e 100644
--- 
a/src/common-service/src/main/java/org/apache/kylin/rest/service/ProjectService.java
+++ 
b/src/common-service/src/main/java/org/apache/kylin/rest/service/ProjectService.java
@@ -454,7 +454,7 @@ public class ProjectService extends BasicService {
         if (request.getJobStatesNotification() != null) {
             overrideKylinProps.put("kylin.job.notification-enable-states",
                     String.join(",", 
Sets.newHashSet(request.getJobStatesNotification())));
-            overrideKylinProps.put("kylin.job.notification-on-job-error", 
null);
+            overrideKylinProps.put("kylin.job.notification-on-job-error", 
"false");
         } else {
             overrideKylinProps.put("kylin.job.notification-on-job-error",
                     String.valueOf(request.getJobErrorNotificationEnabled()));
diff --git 
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ProjectServiceTest.java
 
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ProjectServiceTest.java
index 10e665c3c4..029b3c4fda 100644
--- 
a/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ProjectServiceTest.java
+++ 
b/src/modeling-service/src/test/java/org/apache/kylin/rest/service/ProjectServiceTest.java
@@ -378,6 +378,15 @@ public class ProjectServiceTest extends 
NLocalFileMetadataTestCase {
         Assert.assertEquals(3, response.getJobStatesNotification().size());
         Assert.assertFalse(response.isDataLoadEmptyNotificationEnabled());
 
+        val jobNotificationConfigRequest2 = new JobNotificationConfigRequest();
+        
jobNotificationConfigRequest2.setJobStatesNotification(Lists.newArrayList("discarded"));
+        jobNotificationConfigRequest2.setJobErrorNotificationEnabled(true);
+        
jobNotificationConfigRequest2.setJobNotificationEmails(Lists.newArrayList("us...@kyligence.io"));
+        projectService.updateJobNotificationConfig(project, 
jobNotificationConfigRequest2);
+        response = projectService.getProjectConfig(project);
+        Assert.assertEquals(1, response.getJobStatesNotification().size());
+        Assert.assertEquals("discarded", 
response.getJobStatesNotification().get(0));
+
         jobNotificationConfigRequest
                 .setJobNotificationEmails(Lists.newArrayList("@Kylin.io", 
"user2@.io", "us...@kylin.io"));
         thrown.expect(KylinException.class);