Fix method name to search iamges by etag

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ImageService.java

@@ -44,7 +44,7 @@ public interface ImageService {
 
     TbImageDeleteResult deleteImage(TbResourceInfo imageInfo, boolean force);
 
-    TbResourceInfo findImageByTenantIdAndEtag(TenantId tenantId, String etag);
+    TbResourceInfo findSystemOrTenantImageByEtag(TenantId tenantId, String etag);
 
     boolean replaceBase64WithImageUrl(HasImage entity, String type);
     boolean replaceBase64WithImageUrl(Dashboard dashboard);

dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java

@@ -259,8 +259,8 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     }
 
     @Override
-    public TbResourceInfo findImageByTenantIdAndEtag(TenantId tenantId, String etag) {
-        return resourceInfoDao.findByTenantIdAndEtag(tenantId, ResourceType.IMAGE, etag);
+    public TbResourceInfo findSystemOrTenantImageByEtag(TenantId tenantId, String etag) {
+        return resourceInfoDao.findSystemOrTenantImageByEtag(tenantId, ResourceType.IMAGE, etag);
     }
 
     @Transactional(propagation = Propagation.NOT_SUPPORTED)// we don't want transaction to rollback in case of an image processing failure
@@ -417,10 +417,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
         String extension = ImageUtils.mediaTypeToFileExtension(mdMediaType);
         byte[] imageData = Base64.getDecoder().decode(base64Data);
         String etag = calculateEtag(imageData);
-        var imageInfo = findImageByTenantIdAndEtag(tenantId, etag);
-        if (imageInfo == null && !tenantId.isSysTenantId()) {
-            imageInfo = findImageByTenantIdAndEtag(TenantId.SYS_TENANT_ID, etag);
-        }
+        var imageInfo = findSystemOrTenantImageByEtag(tenantId, etag);
         if (imageInfo == null) {
             TbResource image = new TbResource();
             image.setTenantId(tenantId);

dao/src/main/java/org/thingsboard/server/dao/resource/TbResourceInfoDao.java

@@ -40,5 +40,5 @@ public interface TbResourceInfoDao extends Dao<TbResourceInfo> {
 
     List<TbResourceInfo> findByTenantIdAndEtagAndKeyStartingWith(TenantId tenantId, String etag, String query);
 
-    TbResourceInfo findByTenantIdAndEtag(TenantId tenantId, ResourceType resourceType, String etag);
+    TbResourceInfo findSystemOrTenantImageByEtag(TenantId tenantId, ResourceType resourceType, String etag);
 }

dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java

@@ -106,7 +106,7 @@ public class JpaTbResourceInfoDao extends JpaAbstractDao<TbResourceInfoEntity, T
     }
 
     @Override
-    public TbResourceInfo findByTenantIdAndEtag(TenantId tenantId, ResourceType resourceType, String etag) {
-        return DaoUtil.getData(resourceInfoRepository.findByTenantIdAndEtag(TenantId.SYS_TENANT_ID.getId(), tenantId.getId(), resourceType.name(), etag));
+    public TbResourceInfo findSystemOrTenantImageByEtag(TenantId tenantId, ResourceType resourceType, String etag) {
+        return DaoUtil.getData(resourceInfoRepository.findSystemOrTenantImageByEtag(TenantId.SYS_TENANT_ID.getId(), tenantId.getId(), resourceType.name(), etag));
     }
 }

dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java

@@ -66,8 +66,8 @@ public interface TbResourceInfoRepository extends JpaRepository<TbResourceInfoEn
     List<TbResourceInfoEntity> findByTenantIdAndEtagAndResourceKeyStartingWith(UUID tenantId, String etag, String query);
 
     @Query(value = "SELECT * FROM resource r WHERE (r.tenant_id = :systemTenantId OR r.tenant_id = :tenantId) AND r.resource_type = :resourceType AND r.etag = :etag LIMIT 1", nativeQuery = true)
-    TbResourceInfoEntity findByTenantIdAndEtag(@Param("systemTenantId") UUID sysTenantId,
-                                               @Param("tenantId") UUID tenantId,
-                                               @Param("resourceType") String resourceType,
-                                               @Param("etag") String etag);
+    TbResourceInfoEntity findSystemOrTenantImageByEtag(@Param("systemTenantId") UUID sysTenantId,
+                                                       @Param("tenantId") UUID tenantId,
+                                                       @Param("resourceType") String resourceType,
+                                                       @Param("etag") String etag);
 }