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

Refactor CleanUpService

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-04-22 18:12:20 +03:00
parent c06c826329
commit baf36bc2ea
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dao/src/main/java/org/thingsboard/server/dao/housekeeper/CleanUpService.java
View File

@ -31,6 +31,7 @@ import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.relation.RelationService;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Optional;
import java.util.Set; import java.util.Set;
@Component @Component
@ -38,7 +39,7 @@ import java.util.Set;
@Slf4j @Slf4j
public class CleanUpService { public class CleanUpService {
private final HousekeeperClient housekeeperClient; private final Optional<HousekeeperClient> housekeeperClient;
private final RelationService relationService; private final RelationService relationService;
private final Set<EntityType> skippedEntities = EnumSet.of( private final Set<EntityType> skippedEntities = EnumSet.of(
@ -59,7 +60,7 @@ public class CleanUpService {
cleanUpRelatedData(tenantId, entityId); cleanUpRelatedData(tenantId, entityId);
} }
if (entityType == EntityType.USER) { if (entityType == EntityType.USER) {
housekeeperClient.submitTask(HousekeeperTask.unassignAlarms((User) event.getEntity())); submitTask(HousekeeperTask.unassignAlarms((User) event.getEntity()));
} }
} catch (Throwable e) { } catch (Throwable e) {
log.error("[{}][{}][{}] Failed to handle entity deletion event", tenantId, entityType, entityId.getId(), e); log.error("[{}][{}][{}] Failed to handle entity deletion event", tenantId, entityType, entityId.getId(), e);
@ -69,16 +70,22 @@ public class CleanUpService {
public void cleanUpRelatedData(TenantId tenantId, EntityId entityId) { public void cleanUpRelatedData(TenantId tenantId, EntityId entityId) {
log.debug("[{}][{}][{}] Cleaning up related data", tenantId, entityId.getEntityType(), entityId.getId()); log.debug("[{}][{}][{}] Cleaning up related data", tenantId, entityId.getEntityType(), entityId.getId());
relationService.deleteEntityRelations(tenantId, entityId); relationService.deleteEntityRelations(tenantId, entityId);
housekeeperClient.submitTask(HousekeeperTask.deleteAttributes(tenantId, entityId)); submitTask(HousekeeperTask.deleteAttributes(tenantId, entityId));
housekeeperClient.submitTask(HousekeeperTask.deleteTelemetry(tenantId, entityId)); submitTask(HousekeeperTask.deleteTelemetry(tenantId, entityId));
housekeeperClient.submitTask(HousekeeperTask.deleteEvents(tenantId, entityId)); submitTask(HousekeeperTask.deleteEvents(tenantId, entityId));
housekeeperClient.submitTask(HousekeeperTask.deleteAlarms(tenantId, entityId)); submitTask(HousekeeperTask.deleteAlarms(tenantId, entityId));
} }
public void removeTenantEntities(TenantId tenantId, EntityType... entityTypes) { public void removeTenantEntities(TenantId tenantId, EntityType... entityTypes) {
for (EntityType entityType : entityTypes) { for (EntityType entityType : entityTypes) {
housekeeperClient.submitTask(HousekeeperTask.deleteTenantEntities(tenantId, entityType)); submitTask(HousekeeperTask.deleteTenantEntities(tenantId, entityType));
} }
} }
private void submitTask(HousekeeperTask task) {
housekeeperClient.ifPresent(housekeeperClient -> {
housekeeperClient.submitTask(task);
});
}
} }