From 97b45a6bf917a00b7e0eba98a88a9522903af8a6 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Thu, 1 May 2025 12:23:59 +0300
Subject: [PATCH] fixed tests

---
 .../org/thingsboard/server/dao/job/DefaultJobService.java   | 5 +++++
 .../main/java/org/thingsboard/server/dao/job/JobDao.java    | 2 ++
 .../org/thingsboard/server/dao/sql/job/JobRepository.java   | 6 +++++-
 .../java/org/thingsboard/server/dao/sql/job/JpaJobDao.java  | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java b/dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java
index ce4aa47741..3e511ccfe4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java
@@ -206,6 +206,11 @@ public class DefaultJobService extends AbstractEntityService implements JobServi
         jobDao.removeById(tenantId, id.getId());
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        jobDao.deleteByTenantId(tenantId);
+    }
+
     @Override
     public EntityType getEntityType() {
         return EntityType.JOB;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/job/JobDao.java b/dao/src/main/java/org/thingsboard/server/dao/job/JobDao.java
index 67a234245d..afe182d8cd 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/job/JobDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/job/JobDao.java
@@ -38,4 +38,6 @@ public interface JobDao extends Dao<Job> {
 
     Job findOldestByTenantIdAndTypeAndStatusForUpdate(TenantId tenantId, JobType type, JobStatus status);
 
+    void deleteByTenantId(TenantId tenantId);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/job/JobRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/job/JobRepository.java
index 0cc43375fe..a4d280aba4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/job/JobRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/job/JobRepository.java
@@ -45,7 +45,9 @@ public interface JobRepository extends JpaRepository<JobEntity, UUID> {
     @Query("SELECT j FROM JobEntity j WHERE j.id = :id")
     JobEntity findByIdForUpdate(UUID id);
 
-    JobEntity findLatestByTenantIdAndKey(UUID tenantId, String key);
+    @Query("SELECT j FROM JobEntity j WHERE j.tenantId = :tenantId AND j.key = :key " +
+            "ORDER BY j.createdTime DESC")
+    JobEntity findLatestByTenantIdAndKey(@Param("tenantId") UUID tenantId, @Param("key") String key);
 
     boolean existsByTenantIdAndKeyAndStatusIn(UUID tenantId, String key, List<JobStatus> statuses);
 
@@ -56,4 +58,6 @@ public interface JobRepository extends JpaRepository<JobEntity, UUID> {
             "AND j.status = :status ORDER BY j.createdTime ASC, j.id ASC")
     JobEntity findOldestByTenantIdAndTypeAndStatusForUpdate(UUID tenantId, JobType type, JobStatus status, Limit limit);
 
+    void deleteByTenantId(UUID tenantId);
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/job/JpaJobDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/job/JpaJobDao.java
index 7d8def5792..0e5ee4683e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/job/JpaJobDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/job/JpaJobDao.java
@@ -74,6 +74,11 @@ public class JpaJobDao extends JpaAbstractDao<JobEntity, Job> implements JobDao
         return DaoUtil.getData(jobRepository.findOldestByTenantIdAndTypeAndStatusForUpdate(tenantId.getId(), type, status, Limit.of(1)));
     }
 
+    @Override
+    public void deleteByTenantId(TenantId tenantId) {
+        jobRepository.deleteByTenantId(tenantId.getId());
+    }
+
     @Override
     public EntityType getEntityType() {
         return EntityType.JOB;