Remove Deleted Objects from SQL Database

FloLoFlo · Dec 6, 2023 · 4b4316e · 4b4316e
1 parent 53e05f2
commit 4b4316e
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 11 deletions.
diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/business/Business.java b/api/src/main/java/us/teaminceptus/novaconomy/api/business/Business.java
@@ -1491,12 +1491,26 @@ public static Business byOwner(@Nullable OfflinePlayer p) {
     public static void remove(@Nullable Business b) {
         if (b == null) return;
 
-        for (File f : b.folder.listFiles()) {
-            if (f == null) continue;
-            f.delete();
-        }
+        BUSINESS_CACHE.clear();
 
-        b.folder.delete();
+        if (NovaConfig.getConfiguration().isDatabaseEnabled()) {
+            Connection db = NovaConfig.getConfiguration().getDatabaseConnection();
+            try {
+                PreparedStatement ps = db.prepareStatement("DELETE FROM businesses WHERE id = ?");
+                ps.setString(1, b.id.toString());
+                ps.executeUpdate();
+                ps.close();
+            } catch (SQLException e) {
+                NovaConfig.print(e);
+            }
+        } else {
+            for (File f : b.folder.listFiles()) {
+                if (f == null) continue;
+                f.delete();
+            }
+
+            b.folder.delete();
+        }
     }
 
     /**

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/corporation/Corporation.java b/api/src/main/java/us/teaminceptus/novaconomy/api/corporation/Corporation.java
@@ -914,12 +914,25 @@ public static void removeCorporation(@NotNull Corporation c) {
 
         CORPORATION_CACHE.clear();
 
-        for (File f : c.folder.listFiles()) {
-            if (f == null) continue;
-            f.delete();
-        }
+        if (NovaConfig.getConfiguration().isDatabaseEnabled()) {
+            Connection db = NovaConfig.getConfiguration().getDatabaseConnection();
+
+            try {
+                PreparedStatement ps = db.prepareStatement("DELETE FROM corporations WHERE id = ?");
+                ps.setString(1, c.getUniqueId().toString());
+                ps.executeUpdate();
+                ps.close();
+            } catch (SQLException e) {
+                NovaConfig.print(e);
+            }
+        } else {
+            for (File f : c.folder.listFiles()) {
+                if (f == null) continue;
+                f.delete();
+            }
 
-        c.folder.delete();
+            c.folder.delete();
+        }
     }
 
     /**

diff --git a/api/src/main/java/us/teaminceptus/novaconomy/api/economy/Economy.java b/api/src/main/java/us/teaminceptus/novaconomy/api/economy/Economy.java
@@ -251,6 +251,9 @@ public boolean setTax(boolean tax) {
      */
     public static void removeEconomy(@Nullable Economy econ) throws IllegalArgumentException {
         if (econ == null) throw new IllegalArgumentException("Economy cannot be null");
+
+        ECONOMY_CACHE.clear();
+
         for (OfflinePlayer p : Bukkit.getOfflinePlayers()) {
             NovaPlayer np = new NovaPlayer(p);
             Map<String, Object> data = np.getPlayerData();
@@ -260,7 +263,21 @@ public static void removeEconomy(@Nullable Economy econ) throws IllegalArgumentE
                     .forEach(data::remove);
         }
 
-        econ.file.delete();
+        if (NovaConfig.getConfiguration().isDatabaseEnabled()) {
+            Connection db = NovaConfig.getConfiguration().getDatabaseConnection();
+
+            try {
+                PreparedStatement ps = db.prepareStatement("DELETE FROM economies WHERE id = ?");
+                ps.setString(1, econ.getUniqueId().toString());
+                ps.executeUpdate();
+                ps.close();
+            } catch (SQLException e) {
+                NovaConfig.print(e);
+            }
+        } else {
+            econ.file.delete();
+        }
+
         NovaConfig.getConfiguration().reloadHooks();
     }