fix InventorySystem

Author: usermicrodevices

include/database/DbManager.hpp

@@ -106,156 +106,3 @@ class DbManager {
     DatabaseType ParseDatabaseType(const std::string& typeStr) const;
     std::string DatabaseTypeToString(DatabaseType type) const;
 };
-
-/**
- * @brief PostgreSQL Client Implementation
- *
- * Implements the DatabaseBackend interface for standard PostgreSQL.
- */
-class PostgreSqlCli : public DatabaseBackend {
-public:
-    PostgreSqlCli(const nlohmann::json& config);
-    virtual ~PostgreSqlCli();
-
-    // Connection Management
-    bool Connect() override;
-    bool Reconnect() override;
-    void Disconnect() override;
-    bool IsConnected() const override;
-    bool CheckHealth() override;
-    void ReconnectAll() override;
-
-    // Player Data Operations
-    bool SavePlayerData(uint64_t playerId, const nlohmann::json& data) override;
-    nlohmann::json LoadPlayerData(uint64_t playerId) override;
-    bool UpdatePlayer(uint64_t playerId, const nlohmann::json& updates) override;
-    bool DeletePlayer(uint64_t playerId) override;
-    bool UpdatePlayerPosition(uint64_t playerId, float x, float y, float z) override;
-    bool PlayerExists(uint64_t playerId) override;
-    nlohmann::json GetPlayerStats(uint64_t playerId) override;
-    bool UpdatePlayerStats(uint64_t playerId, const nlohmann::json& stats) override;
-
-    // Game State Operations
-    bool SaveGameState(const std::string& key, const nlohmann::json& state) override;
-    nlohmann::json LoadGameState(const std::string& key) override;
-    bool DeleteGameState(const std::string& key) override;
-    std::vector<std::string> ListGameStates() override;
-
-    // World Data Operations
-    bool SaveChunkData(int chunkX, int chunkZ, const nlohmann::json& chunkData) override;
-    nlohmann::json LoadChunkData(int chunkX, int chunkZ) override;
-    bool DeleteChunkData(int chunkX, int chunkZ) override;
-    std::vector<std::pair<int, int>> ListChunksInRange(int centerX, int centerZ, int radius) override;
-
-    // Inventory Operations
-    bool SaveInventory(uint64_t playerId, const nlohmann::json& inventory) override;
-    nlohmann::json LoadInventory(uint64_t playerId) override;
-
-    // Quest Operations
-    bool SaveQuestProgress(uint64_t playerId, const std::string& questId, const nlohmann::json& progress) override;
-    nlohmann::json LoadQuestProgress(uint64_t playerId, const std::string& questId) override;
-    std::vector<std::string> ListActiveQuests(uint64_t playerId) override;
-
-    // Transaction Operations
-    bool BeginTransaction() override;
-    bool CommitTransaction() override;
-    bool RollbackTransaction() override;
-    bool ExecuteTransaction(const std::function<bool()>& operation) override;
-
-    // Query Operations
-    nlohmann::json Query(const std::string& sql) override;
-    nlohmann::json QueryWithParams(const std::string& sql, const std::vector<std::string>& params) override;
-    bool Execute(const std::string& sql) override;
-    bool ExecuteWithParams(const std::string& sql, const std::vector<std::string>& params) override;
-
-    // Shard Operations (simulated for compatibility)
-    nlohmann::json QueryShard(int shardId, const std::string& sql) override;
-    nlohmann::json QueryShardWithParams(int shardId, const std::string& sql, const std::vector<std::string>& params) override;
-    bool ExecuteShard(int shardId, const std::string& sql) override;
-    bool ExecuteShardWithParams(int shardId, const std::string& sql, const std::vector<std::string>& params) override;
-
-    // Utility Methods
-    std::string EscapeString(const std::string& str) override;
-    int GetShardId(uint64_t entityId) const override;
-    int GetTotalShards() const override;
-    std::string GetConnectionInfo() const override;
-    int64_t GetLastInsertId() override;
-    int GetAffectedRows() override;
-
-    // Statistics
-    nlohmann::json GetDatabaseStats() override;
-    void ResetStats() override;
-
-    // Connection Pool Management
-    bool InitializeConnectionPool(size_t minConnections, size_t maxConnections) override;
-    void ReleaseConnectionPool() override;
-    size_t GetActiveConnections() const override;
-    size_t GetIdleConnections() const override;
-
-private:
-    // PIMPL pattern to hide PostgreSQL implementation details
-    class Impl;
-    std::unique_ptr<Impl> impl_;
-
-    nlohmann::json config_;
-    std::atomic<bool> connected_;
-
-    // Connection pool statistics
-    struct PoolStats {
-        size_t activeConnections;
-        size_t idleConnections;
-        size_t totalConnections;
-    };
-    PoolStats poolStats_;
-};
-
-#ifdef USE_CITUS
-/**
- * @brief Citus Client Implementation
- *
- * Extends PostgreSQL client with Citus-specific distributed database features.
- */
-class CitusCli : public PostgreSqlCli {
-public:
-    static CitusCli& GetInstance();
-
-    CitusCli(const nlohmann::json& config);
-    virtual ~CitusCli();
-
-    // Citus-specific operations
-    bool CreateDistributedTable(const std::string& tableName, const std::string& distributionColumn);
-    bool CreateReferenceTable(const std::string& tableName);
-    bool AddWorkerNode(const std::string& host, int port);
-    bool RemoveWorkerNode(const std::string& host, int port);
-    nlohmann::json GetWorkerNodes();
-    bool RebalanceShards();
-
-    // Override shard operations for actual Citus distribution
-    nlohmann::json QueryShard(int shardId, const std::string& sql) override;
-    nlohmann::json QueryShardWithParams(int shardId, const std::string& sql, const std::vector<std::string>& params) override;
-    bool ExecuteShard(int shardId, const std::string& sql) override;
-    bool ExecuteShardWithParams(int shardId, const std::string& sql, const std::vector<std::string>& params) override;
-
-    // Enhanced shard management
-    int GetShardId(uint64_t entityId) const override;
-    int GetTotalShards() const override;
-    bool MoveShard(int shardId, const std::string& sourceNode, const std::string& targetNode);
-    nlohmann::json GetShardPlacements();
-
-    // Citus-specific statistics
-    nlohmann::json GetCitusStats();
-    nlohmann::json GetQueryStats();
-
-    // Backward compatibility methods
-    bool ExecuteDatabase(const std::string& sql) { return Execute(sql); }
-    nlohmann::json QueryDatabase(const std::string& sql) { return Query(sql); }
-
-private:
-    static std::mutex instanceMutex_;
-    static CitusCli* instance_;
-
-    // Citus-specific configuration
-    int totalShards_;
-    std::unordered_map<std::string, int> workerNodes_;
-};
-#endif

include/game/InventorySystem.hpp

@@ -1,81 +1,81 @@
 #pragma once
 
-#include <vector>
-#include <unordered_map>
+#include <algorithm>
 #include <memory>
 #include <mutex>
-
-#include "game/LootItem.hpp"
+#include <vector>
+#include <unordered_map>
 
 #include "database/DbManager.hpp"
+#include "logging/Logger.hpp"
+#include "game/LootItem.hpp"
 
 struct InventorySlot {
     std::shared_ptr<LootItem> item;
     int quantity = 0;
     bool equipped = false;
-    int position = -1;  // For equipment slots
-    
+    int position = -1;
+
     nlohmann::json Serialize() const;
     void Deserialize(const nlohmann::json& data);
 };
 
 class InventorySystem {
 public:
     static InventorySystem& GetInstance();
-    
+
     // Inventory management
     bool AddItem(uint64_t playerId, const LootItem& item, int quantity = 1);
     bool RemoveItem(uint64_t playerId, const std::string& itemId, int quantity = 1);
     bool MoveItem(uint64_t playerId, int fromSlot, int toSlot);
     bool SwapItems(uint64_t playerId, int slot1, int slot2);
     bool SplitStack(uint64_t playerId, int slot, int splitQuantity);
     bool MergeStacks(uint64_t playerId, int sourceSlot, int targetSlot);
-    
+
     // Equipment management
     bool EquipItem(uint64_t playerId, int inventorySlot);
     bool UnequipItem(uint64_t playerId, int equipmentSlot);
     bool AutoEquip(uint64_t playerId, const std::string& itemId);
-    
+
     // Query methods
     std::shared_ptr<LootItem> GetItem(uint64_t playerId, int slot);
     int GetItemCount(uint64_t playerId, const std::string& itemId) const;
     bool HasItem(uint64_t playerId, const std::string& itemId, int quantity = 1) const;
     std::vector<InventorySlot> GetInventory(uint64_t playerId) const;
     std::vector<InventorySlot> GetEquipment(uint64_t playerId) const;
-    
+
     // Space management
     int GetFreeSlots(uint64_t playerId) const;
     int GetTotalSlots(uint64_t playerId) const;
     bool HasSpaceFor(uint64_t playerId, const LootItem& item, int quantity = 1) const;
-    
+
     // Trading
     bool CanTradeItem(uint64_t playerId, const std::string& itemId) const;
     bool TransferItem(uint64_t fromPlayerId, uint64_t toPlayerId, const std::string& itemId, int quantity);
-    
+
     // Serialization
     bool LoadInventory(uint64_t playerId);
     bool SaveInventory(uint64_t playerId);
     nlohmann::json SerializeInventory(uint64_t playerId) const;
     bool DeserializeInventory(uint64_t playerId, const nlohmann::json& data);
-    
+
     // Gold/currency
     int64_t GetGold(uint64_t playerId) const;
     bool AddGold(uint64_t playerId, int64_t amount);
     bool RemoveGold(uint64_t playerId, int64_t amount);
     bool TransferGold(uint64_t fromPlayerId, uint64_t toPlayerId, int64_t amount);
-    
+
 private:
     InventorySystem() = default;
     ~InventorySystem() = default;
-    
+
     struct PlayerInventory {
         std::vector<InventorySlot> inventorySlots;
         std::vector<InventorySlot> equipmentSlots;
         int64_t gold = 0;
         int maxInventorySize = 40;
         int maxEquipmentSlots = 12;
-        
-        // Equipment slot mapping
+
         enum EquipmentSlot {
             HEAD = 0,
             CHEST = 1,
@@ -91,11 +91,10 @@ class InventorySystem {
             TRINKET2 = 11
         };
     };
-    
+
     mutable std::mutex mutex_;
     std::unordered_map<uint64_t, PlayerInventory> playerInventories_;
-    CitusClient& dbClient_;
-    
+
     // Helper methods
     bool ValidateSlot(uint64_t playerId, int slot) const;
     int FindItemSlot(uint64_t playerId, const std::string& itemId) const;
@@ -104,8 +103,8 @@ class InventorySystem {
     bool IsEquipmentSlot(int slot) const;
     int GetEquipmentSlotForItem(const LootItem& item) const;
     bool MeetsRequirements(uint64_t playerId, const LootItem& item) const;
-    
+
     // Database operations
     bool LoadFromDatabase(uint64_t playerId);
     bool SaveToDatabase(uint64_t playerId);
-};
+};