From 689ebd57b3739365320dd082cbcc4f154de888c1 Mon Sep 17 00:00:00 2001
From: imbeacon <ibarkov.ua@gmail.com>
Date: Fri, 31 May 2024 09:16:38 +0300
Subject: [PATCH 1/2] Fixed creation of profiles with name "default" in case
 when default profile exists, but was renamed

---
 .../server/dao/asset/AssetProfileServiceImpl.java    |  3 ++-
 .../server/dao/device/DeviceProfileServiceImpl.java  |  3 ++-
 .../server/dao/service/AssetProfileServiceTest.java  | 12 ++++++++++++
 .../server/dao/service/DeviceProfileServiceTest.java | 12 ++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
index 6848c58d5c..12724e1a62 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
@@ -234,8 +234,9 @@ public class AssetProfileServiceImpl extends AbstractCachedEntityService<AssetPr
         log.trace("Executing findOrCreateAssetProfile");
         AssetProfile assetProfile = findAssetProfileByName(tenantId, name, false);
         if (assetProfile == null) {
+            boolean createDefaultProfile = "default".equals(name) && findDefaultAssetProfile(tenantId) == null;
             try {
-                assetProfile = this.doCreateDefaultAssetProfile(tenantId, name, name.equals("default"), true);
+                assetProfile = this.doCreateDefaultAssetProfile(tenantId, name, createDefaultProfile, true);
             } catch (DataValidationException e) {
                 if (ASSET_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     assetProfile = findAssetProfileByName(tenantId, name, false);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
index 7a0f7a56c4..350f715e13 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@@ -272,8 +272,9 @@ public class DeviceProfileServiceImpl extends AbstractCachedEntityService<Device
         log.trace("Executing findOrCreateDefaultDeviceProfile");
         DeviceProfile deviceProfile = findDeviceProfileByName(tenantId, name, false);
         if (deviceProfile == null) {
+            boolean createDefaultProfile = "default".equals(name) && findDefaultDeviceProfile(tenantId) == null;
             try {
-                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, name.equals("default"), true);
+                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, createDefaultProfile, true);
             } catch (DataValidationException e) {
                 if (DEVICE_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     deviceProfile = findDeviceProfileByName(tenantId, name, false);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java
index d7b17fe53a..7271a0fc8a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AssetProfileServiceTest.java
@@ -163,6 +163,18 @@ public class AssetProfileServiceTest extends AbstractServiceTest {
         });
     }
 
+    @Test
+    public void testSaveAssetProfileWithNameDefaultAndProfileWithIsDefaultAndDifferentNameAlreadyExists() {
+        AssetProfile defaultAssetProfile = assetProfileService.findDefaultAssetProfile(tenantId);
+        Assert.assertNotNull(defaultAssetProfile);
+        defaultAssetProfile.setName("Asset Profile 1");
+        assetProfileService.saveAssetProfile(defaultAssetProfile);
+        AssetProfile createdAssetProfile = assetProfileService.findOrCreateAssetProfile(tenantId, "default");
+        Assert.assertNotNull(createdAssetProfile);
+        Assert.assertEquals("default", createdAssetProfile.getName());
+        Assert.assertFalse(createdAssetProfile.isDefault());
+    }
+
     @Test
     public void testDeleteAssetProfileWithExistingAsset() {
         AssetProfile assetProfile = this.createAssetProfile(tenantId, "Asset Profile");
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java
index 51abe245b2..aa14e20151 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceProfileServiceTest.java
@@ -209,6 +209,18 @@ public class DeviceProfileServiceTest extends AbstractServiceTest {
         });
     }
 
+    @Test
+    public void testSaveDeviceProfileWithNameDefaultAndProfileWithIsDefaultAndDifferentNameAlreadyExists() {
+        DeviceProfile defaultDeviceProfile = deviceProfileService.findDefaultDeviceProfile(tenantId);
+        Assert.assertNotNull(defaultDeviceProfile);
+        defaultDeviceProfile.setName("Device Profile 1");
+        deviceProfileService.saveDeviceProfile(defaultDeviceProfile);
+        DeviceProfile createdDeviceProfile = deviceProfileService.findOrCreateDeviceProfile(tenantId, "default");
+        Assert.assertNotNull(createdDeviceProfile);
+        Assert.assertEquals("default", createdDeviceProfile.getName());
+        Assert.assertFalse(createdDeviceProfile.isDefault());
+    }
+
     @Ignore
     @Test
     public void testChangeDeviceProfileTypeWithExistingDevices() {

From 80957f32593f370a2e21268bce867c0fe366cbf2 Mon Sep 17 00:00:00 2001
From: imbeacon <ibarkov.ua@gmail.com>
Date: Mon, 9 Sep 2024 15:52:55 +0300
Subject: [PATCH 2/2] Changes due to comments

---
 .../server/dao/asset/AssetProfileServiceImpl.java         | 8 ++++----
 .../server/dao/device/DeviceProfileServiceImpl.java       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
index f0d52d312a..7d4d5300f9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetProfileServiceImpl.java
@@ -236,9 +236,9 @@ public class AssetProfileServiceImpl extends CachedVersionedEntityService<AssetP
         log.trace("Executing findOrCreateAssetProfile");
         AssetProfile assetProfile = findAssetProfileByName(tenantId, name, false);
         if (assetProfile == null) {
-            boolean createDefaultProfile = "default".equals(name) && findDefaultAssetProfile(tenantId) == null;
+            boolean isDefault = "default".equals(name) && findDefaultAssetProfile(tenantId) == null;
             try {
-                assetProfile = this.doCreateDefaultAssetProfile(tenantId, name, createDefaultProfile, true);
+                assetProfile = this.doCreateAssetProfile(tenantId, name, isDefault, true);
             } catch (DataValidationException e) {
                 if (ASSET_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     assetProfile = findAssetProfileByName(tenantId, name, false);
@@ -253,10 +253,10 @@ public class AssetProfileServiceImpl extends CachedVersionedEntityService<AssetP
     @Override
     public AssetProfile createDefaultAssetProfile(TenantId tenantId) {
         log.trace("Executing createDefaultAssetProfile tenantId [{}]", tenantId);
-        return doCreateDefaultAssetProfile(tenantId, "default", true, false);
+        return doCreateAssetProfile(tenantId, "default", true, false);
     }
 
-    private AssetProfile doCreateDefaultAssetProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
+    private AssetProfile doCreateAssetProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
         validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         AssetProfile assetProfile = new AssetProfile();
         assetProfile.setTenantId(tenantId);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
index 9594598a12..09e2be01e0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java
@@ -271,9 +271,9 @@ public class DeviceProfileServiceImpl extends CachedVersionedEntityService<Devic
         log.trace("Executing findOrCreateDefaultDeviceProfile");
         DeviceProfile deviceProfile = findDeviceProfileByName(tenantId, name, false);
         if (deviceProfile == null) {
-            boolean createDefaultProfile = "default".equals(name) && findDefaultDeviceProfile(tenantId) == null;
+            boolean isDefault = "default".equals(name) && findDefaultDeviceProfile(tenantId) == null;
             try {
-                deviceProfile = this.doCreateDefaultDeviceProfile(tenantId, name, createDefaultProfile, true);
+                deviceProfile = this.doCreateDeviceProfile(tenantId, name, isDefault, true);
             } catch (DataValidationException e) {
                 if (DEVICE_PROFILE_WITH_SUCH_NAME_ALREADY_EXISTS.equals(e.getMessage())) {
                     deviceProfile = findDeviceProfileByName(tenantId, name, false);
@@ -288,10 +288,10 @@ public class DeviceProfileServiceImpl extends CachedVersionedEntityService<Devic
     @Override
     public DeviceProfile createDefaultDeviceProfile(TenantId tenantId) {
         log.trace("Executing createDefaultDeviceProfile tenantId [{}]", tenantId);
-        return doCreateDefaultDeviceProfile(tenantId, "default", true, false);
+        return doCreateDeviceProfile(tenantId, "default", true, false);
     }
 
-    private DeviceProfile doCreateDefaultDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
+    private DeviceProfile doCreateDeviceProfile(TenantId tenantId, String profileName, boolean defaultProfile, boolean publishSaveEvent) {
         validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
         DeviceProfile deviceProfile = new DeviceProfile();
         deviceProfile.setTenantId(tenantId);