fixed sql constraint handling

dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java

@@ -80,14 +80,8 @@ public class MobileAppBundleServiceImpl extends AbstractEntityService implements
     @Override
     public void deleteMobileAppBundleById(TenantId tenantId, MobileAppBundleId mobileAppBundleId) {
         log.trace("Executing deleteMobileAppBundleById [{}]", mobileAppBundleId.getId());
-        try {
-            mobileAppBundleDao.removeById(tenantId, mobileAppBundleId.getId());
-            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(mobileAppBundleId).build());
-        } catch (Exception e) {
-            checkConstraintViolation(e, "fk_android_app_id", "The mobile app referenced by the mobile bundle cannot be deleted!",
-                    "fk_ios_app_id", "The mobile app referenced by the mobile bundle cannot be deleted!");
-            throw e;
-        }
+        mobileAppBundleDao.removeById(tenantId, mobileAppBundleId.getId());
+        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(mobileAppBundleId).build());
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppServiceImpl.java

@@ -43,6 +43,7 @@ import java.util.Optional;
 public class MobileAppServiceImpl extends AbstractEntityService implements MobileAppService {
 
     private static final String PLATFORM_TYPE_IS_REQUIRED = "Platform type is required if package name is specified";
+    private static final String MOBILE_APP_BUNDLE_CONSTRAINT = "The mobile app referenced by the mobile bundle cannot be deleted!";
 
     @Autowired
     private MobileAppDao mobileAppDao;
@@ -67,8 +68,15 @@ public class MobileAppServiceImpl extends AbstractEntityService implements Mobil
     @Override
     public void deleteMobileAppById(TenantId tenantId, MobileAppId mobileAppId) {
         log.trace("Executing deleteMobileAppById [{}]", mobileAppId.getId());
-        mobileAppDao.removeById(tenantId, mobileAppId.getId());
-        eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(mobileAppId).build());
+        try {
+            mobileAppDao.removeById(tenantId, mobileAppId.getId());
+            eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(mobileAppId).build());
+        } catch (Exception e) {
+            checkConstraintViolation(e,
+                    Map.of("fk_android_app_id", MOBILE_APP_BUNDLE_CONSTRAINT,
+                            "fk_ios_app_id", MOBILE_APP_BUNDLE_CONSTRAINT));
+            throw e;
+        }
     }
 
     @Override