dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed tests

Browse Source
This commit is contained in:
IrynaMatveieva 2025-05-01 12:23:59 +03:00
parent 874d59a706
commit 97b45a6bf9
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dao/src/main/java/org/thingsboard/server/dao/job/DefaultJobService.java
View File

@ -206,6 +206,11 @@ public class DefaultJobService extends AbstractEntityService implements JobServi
jobDao.removeById(tenantId, id.getId()); jobDao.removeById(tenantId, id.getId());
} }
@Override
public void deleteByTenantId(TenantId tenantId) {
jobDao.deleteByTenantId(tenantId);
}
@Override @Override
public EntityType getEntityType() { public EntityType getEntityType() {
return EntityType.JOB; return EntityType.JOB;

2
dao/src/main/java/org/thingsboard/server/dao/job/JobDao.java
View File

@ -38,4 +38,6 @@ public interface JobDao extends Dao<Job> {
Job findOldestByTenantIdAndTypeAndStatusForUpdate(TenantId tenantId, JobType type, JobStatus status); Job findOldestByTenantIdAndTypeAndStatusForUpdate(TenantId tenantId, JobType type, JobStatus status);
void deleteByTenantId(TenantId tenantId);
} }

6
dao/src/main/java/org/thingsboard/server/dao/sql/job/JobRepository.java
View File

@ -45,7 +45,9 @@ public interface JobRepository extends JpaRepository<JobEntity, UUID> {
@Query("SELECT j FROM JobEntity j WHERE j.id = :id") @Query("SELECT j FROM JobEntity j WHERE j.id = :id")
JobEntity findByIdForUpdate(UUID 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); 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") "AND j.status = :status ORDER BY j.createdTime ASC, j.id ASC")
JobEntity findOldestByTenantIdAndTypeAndStatusForUpdate(UUID tenantId, JobType type, JobStatus status, Limit limit); JobEntity findOldestByTenantIdAndTypeAndStatusForUpdate(UUID tenantId, JobType type, JobStatus status, Limit limit);
void deleteByTenantId(UUID tenantId);
} }

5
dao/src/main/java/org/thingsboard/server/dao/sql/job/JpaJobDao.java
View File

@ -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))); return DaoUtil.getData(jobRepository.findOldestByTenantIdAndTypeAndStatusForUpdate(tenantId.getId(), type, status, Limit.of(1)));
} }
@Override
public void deleteByTenantId(TenantId tenantId) {
jobRepository.deleteByTenantId(tenantId.getId());
}
@Override @Override
public EntityType getEntityType() { public EntityType getEntityType() {
return EntityType.JOB; return EntityType.JOB;