Fix first-create race in message server config persistence

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Author: thefullgc

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MessageServerConfigServiceImpl.java

@@ -17,6 +17,8 @@
 
 package org.apache.hertzbeat.manager.service.impl;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
 import java.util.UUID;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum;
@@ -48,12 +50,14 @@ public class MessageServerConfigServiceImpl implements MessageServerConfigServic
     private final ConfigService configService;
     private final MessageServerConfigMapper mapper;
     private final GeneralConfigDao generalConfigDao;
+    private final EntityManager entityManager;
 
     public MessageServerConfigServiceImpl(ConfigService configService, MessageServerConfigMapper mapper,
-                                          GeneralConfigDao generalConfigDao) {
+                                          GeneralConfigDao generalConfigDao, EntityManager entityManager) {
         this.configService = configService;
         this.mapper = mapper;
         this.generalConfigDao = generalConfigDao;
+        this.entityManager = entityManager;
     }
 
     @Override
@@ -129,8 +133,9 @@ private String create(String type, Object config) {
                 .revision(revision)
                 .build();
         try {
-            generalConfigDao.saveAndFlush(entity);
-        } catch (DataIntegrityViolationException exception) {
+            entityManager.persist(entity);
+            entityManager.flush();
+        } catch (PersistenceException | DataIntegrityViolationException exception) {
             throw new MessageServerConfigConflictException();
         }
         return revision;

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MessageServerConfigServiceTest.java

@@ -21,10 +21,14 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
+
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.common.entity.dto.MailServerConfig;
 import org.apache.hertzbeat.common.entity.dto.sms.SmsConfig;
@@ -33,7 +37,6 @@
 import org.apache.hertzbeat.manager.pojo.dto.SmsServerConfigRequest;
 import org.apache.hertzbeat.manager.service.impl.MessageServerConfigServiceImpl;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -49,11 +52,13 @@ class MessageServerConfigServiceTest {
     private MessageServerConfigMapper mapper;
     @Mock
     private GeneralConfigDao generalConfigDao;
+    @Mock
+    private EntityManager entityManager;
     private MessageServerConfigServiceImpl service;
 
     @BeforeEach
     void setUp() {
-        service = new MessageServerConfigServiceImpl(configService, mapper, generalConfigDao);
+        service = new MessageServerConfigServiceImpl(configService, mapper, generalConfigDao, entityManager);
     }
 
     @Test
@@ -115,8 +120,7 @@ void firstCreateUsesMissingRevisionAndUniqueKeyLoserIsTheSameStableConflict() {
         MailServerConfig merged = new MailServerConfig();
         when(generalConfigDao.findByType("email")).thenReturn(null);
         when(mapper.toEmailConfig(request, null)).thenReturn(merged);
-        when(generalConfigDao.saveAndFlush(any()))
-                .thenThrow(new DataIntegrityViolationException("secret-db-exception"));
+        doThrow(new PersistenceException("secret-db-exception")).when(entityManager).flush();
 
         MessageServerConfigConflictException conflict = assertThrows(
                 MessageServerConfigConflictException.class, () -> service.saveEmailConfig(request));