🚧 Update remove method in auction cluster bridge

Author: Maxlego08

API/src/main/java/fr/maxlego08/zauctionhouse/api/cluster/AuctionClusterBridge.java

@@ -1,6 +1,7 @@
 package fr.maxlego08.zauctionhouse.api.cluster;
 
 import fr.maxlego08.zauctionhouse.api.item.Item;
+import fr.maxlego08.zauctionhouse.api.item.StorageType;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
@@ -18,5 +19,5 @@ public interface AuctionClusterBridge {
 
     CompletableFuture<Void> notifyItemListed(Item item);
 
-    CompletableFuture<Void> removeItem(Item item);
+    CompletableFuture<Void> removeItem(Item item, StorageType storageType);
 }

src/main/java/fr/maxlego08/zauctionhouse/ZAuctionManager.java

@@ -357,7 +357,7 @@ public void adminRemoveItem(Player admin, UUID targetUniqueId, Item item, Storag
 
             return clusterBridge.lockItem(item, admin.getUniqueId());
 
-        }).thenCompose(lockToken -> clusterBridge.removeItem(item).thenApply(v -> lockToken)).thenAccept(lockToken -> {
+        }).thenCompose(lockToken -> clusterBridge.removeItem(item, storageType).thenApply(v -> lockToken)).thenAccept(lockToken -> {
 
             removeItem(storageType, item);
 

src/main/java/fr/maxlego08/zauctionhouse/cluster/LocalAuctionClusterBridge.java

@@ -3,6 +3,7 @@
 import fr.maxlego08.zauctionhouse.api.cluster.AuctionClusterBridge;
 import fr.maxlego08.zauctionhouse.api.cluster.LockToken;
 import fr.maxlego08.zauctionhouse.api.item.Item;
+import fr.maxlego08.zauctionhouse.api.item.StorageType;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
@@ -36,7 +37,7 @@ public CompletableFuture<Void> notifyItemListed(Item item) {
     }
 
     @Override
-    public CompletableFuture<Void> removeItem(Item item) {
+    public CompletableFuture<Void> removeItem(Item item, StorageType storageType) {
         return CompletableFuture.completedFuture(null);
     }
 }

src/main/java/fr/maxlego08/zauctionhouse/services/RemoveService.java

@@ -8,6 +8,7 @@
 import fr.maxlego08.zauctionhouse.api.event.events.remove.AuctionPreRemovePurchasedItemEvent;
 import fr.maxlego08.zauctionhouse.api.item.Item;
 import fr.maxlego08.zauctionhouse.api.item.ItemStatus;
+import fr.maxlego08.zauctionhouse.api.item.StorageType;
 import fr.maxlego08.zauctionhouse.api.services.AuctionRemoveService;
 import org.bukkit.entity.Player;
 
@@ -46,7 +47,7 @@ public void removeListedItem(Player player, Item item) {
         item.setStatus(ItemStatus.IS_BEING_REMOVED);
 
         // 2. Vérifier si l'item est lock
-        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> auctionManager.removeListedItem(player, item));
+        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> auctionManager.removeListedItem(player, item), StorageType.LISTED);
     }
 
     @Override
@@ -77,7 +78,7 @@ public void removeOwnedItem(Player player, Item item) {
         item.setStatus(ItemStatus.IS_BEING_REMOVED);
 
         // 2. Vérifier si l'item est lock
-        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> auctionManager.removeOwnedItem(player, item));
+        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> auctionManager.removeOwnedItem(player, item), StorageType.LISTED);
 
     }
 
@@ -108,7 +109,7 @@ public void removeExpiredItem(Player player, Item item) {
         item.setStatus(ItemStatus.DELETED);
 
         // 2. Vérifier si l'item est lock
-        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> this.plugin.getAuctionManager().removeExpiredItem(player, item));
+        executeRemoval(player, item, () -> inventoryManager.updateInventory(player), () -> this.plugin.getAuctionManager().removeExpiredItem(player, item), StorageType.EXPIRED);
     }
 
     @Override
@@ -138,11 +139,11 @@ public void removePurchasedItem(Player player, Item item) {
         item.setStatus(ItemStatus.DELETED);
 
         var manager = this.plugin.getAuctionManager();
-        executeRemoval(player, item, () -> manager.updateInventory(player), () -> manager.removePurchasedItem(player, item));
+        executeRemoval(player, item, () -> manager.updateInventory(player), () -> manager.removePurchasedItem(player, item), StorageType.PURCHASED);
 
     }
 
-    private void executeRemoval(Player player, Item item, Runnable onUnavailable, Runnable onLocalRemoval) {
+    private void executeRemoval(Player player, Item item, Runnable onUnavailable, Runnable onLocalRemoval, StorageType storageType) {
 
         var clusterBridge = this.plugin.getAuctionClusterBridge();
         var logger = this.plugin.getLogger();
@@ -162,7 +163,7 @@ private void executeRemoval(Player player, Item item, Runnable onUnavailable, Ru
             // 3. On va supprimer l'item coté REDIS
 
             logger.info("Token: " + token);
-            return clusterBridge.removeItem(item);
+            return clusterBridge.removeItem(item, storageType);
 
         }).thenCompose(v -> {
 

src/main/java/fr/maxlego08/zauctionhouse/storage/ZStorageManager.java

@@ -39,13 +39,12 @@
 public class ZStorageManager implements StorageManager {
 
     private final AuctionPlugin plugin;
-    private final AuctionLoader auctionLoader;
+    private AuctionLoader auctionLoader;
     private Repositories repositories;
     private DatabaseConnection databaseConnection;
 
     public ZStorageManager(AuctionPlugin plugin) {
         this.plugin = plugin;
-        auctionLoader = new AuctionLoader(plugin, this);
     }
 
     @Override
@@ -93,6 +92,7 @@ public void onDisable() {
 
     @Override
     public void loadItems() {
+        this.auctionLoader = new AuctionLoader(plugin, this);
         this.auctionLoader.loadItems();
     }