Kaynağa Gözat

delete AppData for device when deleting device

tags/v0.3.0
Jonathan Cobb 5 yıl önce
ebeveyn
işleme
abd9f4f480
2 değiştirilmiş dosya ile 7 ekleme ve 0 silme
  1. +4
    -0
      bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java
  2. +3
    -0
      bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java

+ 4
- 0
bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java Dosyayı Görüntüle

@@ -86,4 +86,8 @@ public class AppDataDAO extends AppTemplateEntityDAO<AppData> {
return list(criteria().add(and(crits.toArray(new Criterion[0]))));
}

protected List<AppData> findByDevice(String uuid) { return findByField("device", uuid); }

public void deleteDevice(String uuid) { delete(findByDevice(uuid)); }

}

+ 3
- 0
bubble-server/src/main/java/bubble/dao/device/DeviceDAO.java Dosyayı Görüntüle

@@ -1,6 +1,7 @@
package bubble.dao.device;

import bubble.dao.account.AccountOwnedEntityDAO;
import bubble.dao.app.AppDataDAO;
import bubble.model.cloud.AnsibleInstallType;
import bubble.model.cloud.BubbleNetwork;
import bubble.model.device.Device;
@@ -25,6 +26,7 @@ public class DeviceDAO extends AccountOwnedEntityDAO<Device> {
public static final File VPN_REFRESH_USERS_FILE = new File(HOME_DIR, ".algo_refresh_users");

@Autowired private BubbleConfiguration configuration;
@Autowired private AppDataDAO dataDAO;

@Override public Order getDefaultSortOrder() { return Order.asc(CTIME); }

@@ -80,6 +82,7 @@ public class DeviceDAO extends AccountOwnedEntityDAO<Device> {
@Override public void delete(String uuid) {
final Device device = findByUuid(uuid);
if (device != null) {
dataDAO.deleteDevice(uuid);
super.delete(uuid);
ensureSpareDevice(device.getAccount(), device.getNetwork(), true);
}


Yükleniyor…
İptal
Kaydet