Clean code, remove warning for future and spot

src/Managing.Api/Controllers/MoneyManagementController.cs

@@ -1,5 +1,4 @@
-using Managing.Application.Abstractions;
+using Managing.Application.Abstractions.Services;
-using Managing.Application.Abstractions.Services;
 using Managing.Domain.MoneyManagements;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Managing.Api/Controllers/SentryTestController.cs

@@ -1,6 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Sentry;
-using System;
 
 namespace Managing.Api.Controllers
 {

src/Managing.Api/Exceptions/SentryErrorCapture.cs

@@ -1,5 +1,3 @@
-using Sentry;
-
 namespace Managing.Api.Exceptions;
 
 /// <summary>
@@ -14,7 +12,8 @@ public static class SentryErrorCapture
     /// <param name="contextName">A descriptive name for where the error occurred</param>
     /// <param name="extraData">Optional dictionary of additional data to include</param>
     /// <returns>The Sentry event ID</returns>
-    public static SentryId CaptureException(Exception exception, string contextName, IDictionary<string, object> extraData = null)
+    public static SentryId CaptureException(Exception exception, string contextName,
+        IDictionary<string, object> extraData = null)
     {
         return SentrySdk.CaptureException(exception, scope =>
         {
@@ -76,7 +75,8 @@ public static class SentryErrorCapture
     /// <param name="contextName">A descriptive name for where the message originated</param>
     /// <param name="extraData">Optional dictionary of additional data to include</param>
     /// <returns>The Sentry event ID</returns>
-    public static SentryId CaptureMessage(string message, SentryLevel level, string contextName, IDictionary<string, object> extraData = null)
+    public static SentryId CaptureMessage(string message, SentryLevel level, string contextName,
+        IDictionary<string, object> extraData = null)
     {
         // First capture the message with the specified level
         var id = SentrySdk.CaptureMessage(message, level);

src/Managing.Api/Middleware/SentryDiagnosticsMiddleware.cs

@@ -1,4 +1,3 @@
-using Sentry;
 using System.Text;
 
 namespace Managing.Api.Middleware
@@ -37,16 +36,19 @@ namespace Managing.Api.Middleware
             // Check if Sentry is initialized
             response.AppendLine("## Sentry SDK Status");
             response.AppendLine($"Sentry Enabled: {SentrySdk.IsEnabled}");
-            response.AppendLine($"Application Environment: {Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}");
+            response.AppendLine(
+                $"Application Environment: {Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}");
             response.AppendLine();
 
             // Send a test event
             response.AppendLine("## Test Event");
             try
             {
-                var id = SentrySdk.CaptureMessage($"Diagnostics test from {context.Request.Host} at {DateTime.Now}", SentryLevel.Info);
+                var id = SentrySdk.CaptureMessage($"Diagnostics test from {context.Request.Host} at {DateTime.Now}",
+                    SentryLevel.Info);
                 response.AppendLine($"Test Event ID: {id}");
-                response.AppendLine("Test event was sent to Sentry. Check your Sentry dashboard to confirm it was received.");
+                response.AppendLine(
+                    "Test event was sent to Sentry. Check your Sentry dashboard to confirm it was received.");
 
                 // Try to send an exception too
                 try
@@ -69,7 +71,8 @@ namespace Managing.Api.Middleware
             response.AppendLine("## Connectivity Check");
             response.AppendLine("If events are not appearing in Sentry, check the following:");
             response.AppendLine("1. Verify your DSN is correct in appsettings.json");
-            response.AppendLine("2. Ensure your network allows outbound HTTPS connections to sentry.apps.managing.live");
+            response.AppendLine(
+                "2. Ensure your network allows outbound HTTPS connections to sentry.apps.managing.live");
             response.AppendLine("3. Check Sentry server logs for any ingestion issues");
             response.AppendLine("4. Verify your Sentry project is correctly configured to receive events");
 

src/Managing.Api/Models/Requests/OpenPositionManuallyRequest.cs

@@ -1,4 +1,3 @@
-using Managing.Common;
 using static Managing.Common.Enums;
 
 namespace Managing.Api.Models.Requests;

src/Managing.Application.Tests/LightMoneyManagementTests.cs

@@ -1,4 +1,3 @@
-using Managing.Domain.MoneyManagements;
 using Xunit;
 using static Managing.Common.Enums;
 
@@ -161,7 +160,8 @@ namespace Managing.Application.Tests
         [InlineData(5, 0.05)] // 5% as percentage - should format to 0.05
         [InlineData(10, 0.1)] // 10% as percentage - should format to 0.1
         [InlineData(50, 0.5)] // 50% as percentage - should format to 0.5
-        public void FormatPercentage_WithPercentageValuesGreaterThanOrEqualToOne_ShouldFormat(decimal input, decimal expected)
+        public void FormatPercentage_WithPercentageValuesGreaterThanOrEqualToOne_ShouldFormat(decimal input,
+            decimal expected)
         {
             // Arrange
             var moneyManagement = new LightMoneyManagement

src/Managing.Application/Bots/FuturesBot.cs

@@ -1,4 +1,3 @@
-using Managing.Application.Abstractions;
 using Managing.Application.Abstractions.Grains;
 using Managing.Application.Abstractions.Services;
 using Managing.Application.Trading.Commands;
@@ -19,7 +18,7 @@ using static Managing.Common.Enums;
 
 namespace Managing.Application.Bots;
 
-public class FuturesBot : TradingBotBase, ITradingBot
+public class FuturesBot : TradingBotBase
 {
     public FuturesBot(
         ILogger<TradingBotBase> logger,
@@ -72,24 +71,14 @@ public class FuturesBot : TradingBotBase, ITradingBot
         // For live trading, get position from database via trading service
         return await ServiceScopeHelpers.WithScopedService<ITradingService, Position>(
             _scopeFactory,
-            async tradingService => { return await tradingService.GetPositionByIdentifierAsync(position.Identifier); });
+            async tradingService => await tradingService.GetPositionByIdentifierAsync(position.Identifier));
-    }
-
-    protected override async Task UpdatePositionWithBrokerData(Position position, List<Position> brokerPositions)
-    {
-        // Live trading broker position synchronization logic is handled in the base UpdatePosition method
-        // This override allows for any futures-specific synchronization if needed
-        await base.UpdatePositionWithBrokerData(position, brokerPositions);
     }
 
     protected override async Task<Candle> GetCurrentCandleForPositionClose(Account account, string ticker)
     {
         // For live trading, get real-time candle from exchange
         return await ServiceScopeHelpers.WithScopedService<IExchangeService, Candle>(_scopeFactory,
-            async exchangeService =>
+            async exchangeService => await exchangeService.GetCandle(Account, Config.Ticker, DateTime.UtcNow));
-            {
-                return await exchangeService.GetCandle(Account, Config.Ticker, DateTime.UtcNow);
-            });
     }
 
     protected override async Task<bool> CheckBrokerPositions()
@@ -170,7 +159,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
             }
             else
             {
-                // Broker has a position but we don't have any internal tracking
+                // Broker has a position, but we don't have any internal tracking
                 Logger.LogWarning(
                     $"⚠️ Orphaned Broker Position Detected\n" +
                     $"Broker has position for {Config.Ticker} ({brokerPositionForTicker.OriginDirection})\n" +
@@ -196,7 +185,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
         if (Config.TradingType == TradingType.BacktestFutures) return;
         await ServiceScopeHelpers.WithScopedService<IAccountService>(_scopeFactory, async accountService =>
         {
-            var account = await accountService.GetAccountByAccountName(Config.AccountName, false, false);
+            var account = await accountService.GetAccountByAccountName(Config.AccountName, false);
             Account = account;
         });
     }
@@ -297,7 +286,6 @@ public class FuturesBot : TradingBotBase, ITradingBot
                         $"Cannot verify if position is closed\n" +
                         $"Will retry on next execution cycle");
                     // Don't change position status, wait for next cycle
-                    return;
                 }
                 else if (existsInHistory)
                 {
@@ -309,7 +297,6 @@ public class FuturesBot : TradingBotBase, ITradingBot
 
                     internalPosition.Status = PositionStatus.Finished;
                     await HandleClosedPosition(internalPosition);
-                    return;
                 }
                 else
                 {
@@ -347,11 +334,11 @@ public class FuturesBot : TradingBotBase, ITradingBot
             }
 
             var orders = await ServiceScopeHelpers.WithScopedService<IExchangeService, List<Trade>>(_scopeFactory,
-                async exchangeService => { return [.. await exchangeService.GetOpenOrders(Account, Config.Ticker)]; });
+                async exchangeService => [.. await exchangeService.GetOpenOrders(Account, Config.Ticker)]);
 
-            if (orders.Any())
+            if (orders.Count != 0)
             {
-                var ordersCount = orders.Count();
+                var ordersCount = orders.Count;
                 if (ordersCount >= 3)
                 {
                     var currentTime = DateTime.UtcNow;
@@ -386,7 +373,6 @@ public class FuturesBot : TradingBotBase, ITradingBot
                         positionForSignal.TakeProfit1.SetStatus(TradeStatus.Cancelled);
 
                         await UpdatePositionDatabase(positionForSignal);
-                        return;
                     }
                     else
                     {
@@ -538,7 +524,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
     /// </summary>
     /// <param name="position">The position to check</param>
     /// <returns>True if position found in exchange history with PnL, false otherwise; hadError indicates Web3/infra issues</returns>
-    protected async Task<(bool found, bool hadError)> CheckPositionInExchangeHistory(Position position)
+    private async Task<(bool found, bool hadError)> CheckPositionInExchangeHistory(Position position)
     {
         try
         {
@@ -564,7 +550,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
                     .OrderByDescending(p => p.Open?.Date ?? DateTime.MinValue)
                     .FirstOrDefault();
 
-                if (recentPosition != null && recentPosition.ProfitAndLoss != null)
+                if (recentPosition is { ProfitAndLoss: not null })
                 {
                     await LogDebugAsync(
                         $"✅ Position Found in Exchange History\n" +
@@ -757,7 +743,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
                     .OrderByDescending(p => p.Open?.Date ?? DateTime.MinValue)
                     .FirstOrDefault();
 
-                if (brokerPosition != null && brokerPosition.ProfitAndLoss != null)
+                if (brokerPosition is { ProfitAndLoss: not null })
                 {
                     await LogDebugAsync(
                         $"✅ Broker Position History Found\n" +
@@ -934,7 +920,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
                 // Fallback to current candle if available
                 if (currentCandle != null)
                 {
-                    recentCandles = new List<Candle> { currentCandle };
+                    recentCandles = [currentCandle];
                 }
                 else
                 {
@@ -950,8 +936,8 @@ public class FuturesBot : TradingBotBase, ITradingBot
             var minPriceRecent = recentCandles.Min(c => c.Low);
             var maxPriceRecent = recentCandles.Max(c => c.High);
 
-            bool wasStopLossHit = false;
+            var wasStopLossHit = false;
-            bool wasTakeProfitHit = false;
+            var wasTakeProfitHit = false;
 
             if (position.OriginDirection == TradeDirection.Long)
             {
@@ -1193,7 +1179,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
             signal.Date,
             Account.User,
             Config.BotTradingBalance,
-            isForPaperTrading: false, // Futures is live trading
+            isForPaperTrading: false,
             lastPrice,
             signalIdentifier: signal.Identifier,
             initiatorIdentifier: Identifier,
@@ -1203,10 +1189,8 @@ public class FuturesBot : TradingBotBase, ITradingBot
             .WithScopedServices<IExchangeService, IAccountService, ITradingService, Position>(
                 _scopeFactory,
                 async (exchangeService, accountService, tradingService) =>
-                {
+                    await new OpenPositionCommandHandler(exchangeService, accountService, tradingService)
-                    return await new OpenPositionCommandHandler(exchangeService, accountService, tradingService)
+                        .Handle(command));
-                        .Handle(command);
-                });
 
         return position;
     }
@@ -1230,7 +1214,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
         if (quantity == 0)
         {
             await LogDebugAsync($"✅ Trade already closed on exchange for position: `{position.Identifier}`");
-            await HandleClosedPosition(position, forceMarketClose ? lastPrice : (decimal?)null, forceMarketClose);
+            await HandleClosedPosition(position, forceMarketClose ? lastPrice : null, forceMarketClose);
         }
         else
         {
@@ -1258,7 +1242,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
                         await SetPositionStatus(signal.Identifier, PositionStatus.Finished);
                     }
 
-                    await HandleClosedPosition(closedPosition, forceMarketClose ? lastPrice : (decimal?)null,
+                    await HandleClosedPosition(closedPosition, forceMarketClose ? lastPrice : null,
                         forceMarketClose);
                 }
                 else
@@ -1275,7 +1259,7 @@ public class FuturesBot : TradingBotBase, ITradingBot
                     // Trade close on exchange => Should close trade manually
                     await SetPositionStatus(signal.Identifier, PositionStatus.Finished);
                     // Ensure trade dates are properly updated even for canceled/rejected positions
-                    await HandleClosedPosition(position, forceMarketClose ? lastPrice : (decimal?)null,
+                    await HandleClosedPosition(position, forceMarketClose ? lastPrice : null,
                         forceMarketClose);
                 }
             }

src/Managing.Application/Bots/SpotBot.cs

@@ -94,7 +94,7 @@ public class SpotBot : TradingBotBase
                 // Try to get current price from exchange
                 currentPrice = await ServiceScopeHelpers.WithScopedService<IExchangeService, decimal>(
                     _scopeFactory,
-                    async exchangeService => { return await exchangeService.GetCurrentPrice(Account, Config.Ticker); });
+                    async exchangeService => await exchangeService.GetCurrentPrice(Account, Config.Ticker));
             }
 
             if (currentPrice == 0)
@@ -144,10 +144,7 @@ public class SpotBot : TradingBotBase
     {
         // For live trading, get real-time candle from exchange
         return await ServiceScopeHelpers.WithScopedService<IExchangeService, Candle>(_scopeFactory,
-            async exchangeService =>
+            async exchangeService => await exchangeService.GetCandle(Account, Config.Ticker, DateTime.UtcNow));
-            {
-                return await exchangeService.GetCandle(Account, Config.Ticker, DateTime.UtcNow);
-            });
     }
 
     protected override async Task<bool> CheckBrokerPositions()
@@ -164,7 +161,7 @@ public class SpotBot : TradingBotBase
             if (hasOpenPosition)
             {
                 // We have an internal position - verify it matches broker balance
-                if (tokenBalance != null && tokenBalance.Amount > 0)
+                if (tokenBalance is { Amount: > 0 })
                 {
                     await LogDebugAsync(
                         $"✅ Spot Position Verified\n" +
@@ -174,8 +171,7 @@ public class SpotBot : TradingBotBase
                         $"Position matches broker balance");
                     return false; // Position already open, cannot open new one
                 }
-                else
+
-                {
                 await LogWarningAsync(
                     $"⚠️ Position Mismatch\n" +
                     $"Ticker: {Config.Ticker}\n" +
@@ -183,8 +179,8 @@ public class SpotBot : TradingBotBase
                     $"Position may need synchronization");
                 return false; // Don't allow opening new position until resolved
             }
-            }
+
-            else if (tokenBalance != null && tokenBalance.Value > 1m)
+            if (tokenBalance is { Value: > 1m })
             {
                 // We have a token balance but no internal position - orphaned position
                 await LogWarningAsync(
@@ -212,7 +208,7 @@ public class SpotBot : TradingBotBase
         if (Config.TradingType == TradingType.BacktestSpot) return;
         await ServiceScopeHelpers.WithScopedService<IAccountService>(_scopeFactory, async accountService =>
         {
-            var account = await accountService.GetAccountByAccountName(Config.AccountName, false, false);
+            var account = await accountService.GetAccountByAccountName(Config.AccountName, false);
             Account = account;
         });
     }
@@ -227,7 +223,7 @@ public class SpotBot : TradingBotBase
                 _scopeFactory,
                 async exchangeService => await exchangeService.GetBalance(Account, Config.Ticker));
 
-            if (tokenBalance != null && tokenBalance.Amount > 0)
+            if (tokenBalance is { Amount: > 0 })
             {
                 // Verify that the token balance matches the position amount with 0.1% tolerance
                 var positionQuantity = internalPosition.Open.Quantity;
@@ -281,7 +277,7 @@ public class SpotBot : TradingBotBase
                 // Calculate and update PnL based on current price
                 var currentPrice = await ServiceScopeHelpers.WithScopedService<IExchangeService, decimal>(
                     _scopeFactory,
-                    async exchangeService => { return await exchangeService.GetCurrentPrice(Account, Config.Ticker); });
+                    async exchangeService => await exchangeService.GetCurrentPrice(Account, Config.Ticker));
 
                 if (currentPrice > 0)
                 {
@@ -353,17 +349,16 @@ public class SpotBot : TradingBotBase
             await LogDebugAsync(
                 $"🔍 Checking Spot Position History for Position: `{position.Identifier}`\nTicker: `{Config.Ticker}`");
 
-            List<Position> positionHistory = null;
+            var positionHistory = await ServiceScopeHelpers.WithScopedService<IExchangeService, List<Position>>(
-            await ServiceScopeHelpers.WithScopedService<IExchangeService>(_scopeFactory,
+                _scopeFactory,
                 async exchangeService =>
                 {
                     var fromDate = DateTime.UtcNow.AddHours(-24);
                     var toDate = DateTime.UtcNow;
-                    positionHistory =
+                    return await exchangeService.GetSpotPositionHistory(Account, Config.Ticker, fromDate, toDate);
-                        await exchangeService.GetSpotPositionHistory(Account, Config.Ticker, fromDate, toDate);
                 });
 
-            if (positionHistory != null && positionHistory.Any())
+            if (positionHistory != null && positionHistory.Count != 0)
             {
                 var recentPosition = positionHistory
                     .OrderByDescending(p => p.Date)
@@ -415,28 +410,28 @@ public class SpotBot : TradingBotBase
         }
     }
 
-    protected override async Task MonitorSynthRisk(LightSignal signal, Position position)
+    protected override Task MonitorSynthRisk(LightSignal signal, Position position)
     {
         // Spot trading doesn't use Synth risk monitoring (futures-specific feature)
-        return;
+        return Task.CompletedTask;
     }
 
-    protected override async Task<bool> RecoverOpenPositionFromBroker(LightSignal signal, Position positionForSignal)
+    protected override Task<bool> RecoverOpenPositionFromBroker(LightSignal signal, Position positionForSignal)
     {
         // Spot trading doesn't have broker positions to recover
         // Positions are token balances, not tracked positions
-        return false;
+        return Task.FromResult(false);
     }
 
-    protected override async Task<bool> ReconcileWithBrokerHistory(Position position, Candle currentCandle)
+    protected override Task<bool> ReconcileWithBrokerHistory(Position position, Candle currentCandle)
     {
         // Spot trading doesn't have broker position history like futures
         // Return false to continue with candle-based calculation
-        return false;
+        return Task.FromResult(false);
     }
 
-    protected override async Task<(decimal closingPrice, bool pnlCalculated)> CalculatePositionClosingFromCandles(
+    protected override Task<(decimal closingPrice, bool pnlCalculated)> CalculatePositionClosingFromCandles(
-        Position position, Candle currentCandle, bool forceMarketClose, decimal? forcedClosingPrice)
+        Position position, Candle? currentCandle, bool forceMarketClose, decimal? forcedClosingPrice)
     {
         decimal closingPrice = 0;
         bool pnlCalculated = false;
@@ -529,7 +524,7 @@ public class SpotBot : TradingBotBase
                     ? closingPrice > position.Open.Price
                     : closingPrice < position.Open.Price;
 
-                if (isManualCloseProfitable)
+                if (isManualCloseProfitable && position.TakeProfit1 != null)
                 {
                     position.TakeProfit1.SetPrice(closingPrice, 2);
                     position.TakeProfit1.SetDate(currentCandle.Date);
@@ -542,9 +537,9 @@ public class SpotBot : TradingBotBase
                 }
                 else
                 {
-                    position.StopLoss.SetPrice(closingPrice, 2);
+                    position.StopLoss?.SetPrice(closingPrice, 2);
-                    position.StopLoss.SetDate(currentCandle.Date);
+                    position.StopLoss?.SetDate(currentCandle.Date);
-                    position.StopLoss.SetStatus(TradeStatus.Filled);
+                    position.StopLoss?.SetStatus(TradeStatus.Filled);
 
                     if (position.TakeProfit1 != null)
                     {
@@ -561,11 +556,11 @@ public class SpotBot : TradingBotBase
             pnlCalculated = true;
         }
 
-        return (closingPrice, pnlCalculated);
+        return Task.FromResult((closingPrice, pnlCalculated));
     }
 
     protected override async Task UpdateSignalsCore(IReadOnlyList<Candle> candles,
-        Dictionary<IndicatorType, IndicatorsResultBase> preCalculatedIndicatorValues = null)
+        Dictionary<IndicatorType, IndicatorsResultBase>? preCalculatedIndicatorValues = null)
     {
         // For spot trading, always fetch signals regardless of open positions
         // Check if we're in cooldown period
@@ -625,7 +620,7 @@ public class SpotBot : TradingBotBase
         return !await IsInCooldownPeriodAsync() && await CheckLossStreak(signal);
     }
 
-    protected override async Task<Position> HandleFlipPosition(LightSignal signal, Position openedPosition,
+    protected override async Task<Position?> HandleFlipPosition(LightSignal signal, Position openedPosition,
         LightSignal previousSignal, decimal lastPrice)
     {
         // For spot trading, SHORT signals should close the open LONG position
@@ -694,10 +689,8 @@ public class SpotBot : TradingBotBase
             .WithScopedServices<IExchangeService, IAccountService, ITradingService, Position>(
                 _scopeFactory,
                 async (exchangeService, accountService, tradingService) =>
-                {
+                    await new OpenSpotPositionCommandHandler(exchangeService, accountService, tradingService)
-                    return await new OpenSpotPositionCommandHandler(exchangeService, accountService, tradingService)
+                        .Handle(command));
-                        .Handle(command);
-                });
 
         return position;
     }
@@ -725,7 +718,7 @@ public class SpotBot : TradingBotBase
                     await SetPositionStatus(signal.Identifier, PositionStatus.Finished);
                 }
 
-                await HandleClosedPosition(closedPosition, forceMarketClose ? lastPrice : (decimal?)null,
+                await HandleClosedPosition(closedPosition, forceMarketClose ? lastPrice : null,
                     forceMarketClose);
             }
             else
@@ -742,7 +735,7 @@ public class SpotBot : TradingBotBase
                 // Trade close on exchange => Should close trade manually
                 await SetPositionStatus(signal.Identifier, PositionStatus.Finished);
                 // Ensure trade dates are properly updated even for canceled/rejected positions
-                await HandleClosedPosition(position, forceMarketClose ? lastPrice : (decimal?)null,
+                await HandleClosedPosition(position, forceMarketClose ? lastPrice : null,
                     forceMarketClose);
             }
         }

src/Managing.Application/Trading/Handlers/OpenSpotPositionCommandHandler.cs

@@ -2,20 +2,19 @@ using Managing.Application.Abstractions;
 using Managing.Application.Abstractions.Services;
 using Managing.Application.Trading.Commands;
 using Managing.Common;
-using Managing.Core.Exceptions;
 using Managing.Domain.Accounts;
 using Managing.Domain.Shared.Helpers;
 using Managing.Domain.Trades;
 using static Managing.Common.Enums;
 
-namespace Managing.Application.Trading.Handlers
+namespace Managing.Application.Trading.Handlers;
-{
+
-    public class OpenSpotPositionCommandHandler(
+public class OpenSpotPositionCommandHandler(
     IExchangeService exchangeService,
     IAccountService accountService,
     ITradingService tradingService)
     : ICommandHandler<OpenSpotPositionRequest, Position>
-    {
+{
     public async Task<Position> Handle(OpenSpotPositionRequest request)
     {
         var account = await accountService.GetAccount(request.AccountName, hideSecrets: false, getBalance: false);
@@ -50,31 +49,10 @@ namespace Managing.Application.Trading.Handlers
             : await exchangeService.GetPrice(account, request.Ticker, DateTime.Now);
         var quantity = balanceToRisk / price;
 
-            var openPrice = request.IsForPaperTrading || request.Price.HasValue
+        var openPrice = request.IsForPaperTrading
-                ? request.Price.Value
+            ? request.Price ?? price
             : price;
 
-            // For spot trading, determine swap direction
-            // Long: Swap USDC -> Token (buy token with USDC)
-            // Short: Swap Token -> USDC (sell token for USDC)
-            Ticker fromTicker;
-            Ticker toTicker;
-            double swapAmount;
-
-            if (request.Direction == TradeDirection.Long)
-            {
-                fromTicker = Ticker.USDC;
-                toTicker = request.Ticker;
-                swapAmount = (double)balanceToRisk;
-            }
-            else
-            {
-                fromTicker = request.Ticker;
-                toTicker = Ticker.USDC;
-                swapAmount = (double)quantity;
-            }
-
-            // For backtest/paper trading, simulate the swap without calling the exchange
         SwapInfos swapResult;
         if (request.IsForPaperTrading)
         {
@@ -92,18 +70,16 @@ namespace Managing.Application.Trading.Handlers
             swapResult = await tradingService.SwapGmxTokensAsync(
                 request.User,
                 request.AccountName,
-                    fromTicker,
+                Ticker.USDC,
-                    toTicker,
+                request.Ticker,
-                    swapAmount,
+                (double)balanceToRisk);
-                    "market",
-                    null,
-                    0.5);
         }
 
         if (!swapResult.Success)
         {
             position.Status = PositionStatus.Rejected;
-                throw new InvalidOperationException($"Failed to open spot position: {swapResult.Error ?? swapResult.Message}");
+            throw new InvalidOperationException(
+                $"Failed to open spot position: {swapResult.Error ?? swapResult.Message}");
         }
 
         // Build the opening trade
@@ -123,13 +99,9 @@ namespace Managing.Application.Trading.Handlers
         position.GasFees = TradingBox.CalculateOpeningGasFees();
 
         // Set UI fees for opening
-            var positionSizeUsd = TradingBox.GetVolumeForPosition(position);
+        var positionSizeUsd = position.Open.Quantity * position.Open.Price;
         position.UiFees = TradingBox.CalculateOpeningUiFees(positionSizeUsd);
 
-            var closeDirection = request.Direction == TradeDirection.Long
-                ? TradeDirection.Short
-                : TradeDirection.Long;
-
         // Determine SL/TP Prices
         var stopLossPrice = RiskHelpers.GetStopLossPrice(request.Direction, openPrice, request.MoneyManagement);
         var takeProfitPrice = RiskHelpers.GetTakeProfitPrice(request.Direction, openPrice, request.MoneyManagement);
@@ -139,7 +111,7 @@ namespace Managing.Application.Trading.Handlers
             request.Ticker,
             stopLossPrice,
             position.Open.Quantity,
-                closeDirection,
+            TradeDirection.Short,
             1, // Spot trading has no leverage
             TradeType.StopLoss,
             request.Date,
@@ -150,7 +122,7 @@ namespace Managing.Application.Trading.Handlers
             request.Ticker,
             takeProfitPrice,
             quantity,
-                closeDirection,
+            TradeDirection.Short,
             1, // Spot trading has no leverage
             TradeType.TakeProfit,
             request.Date,
@@ -176,9 +148,6 @@ namespace Managing.Application.Trading.Handlers
 
     private static bool IsOpenTradeHandled(TradeStatus tradeStatus)
     {
-            return tradeStatus == TradeStatus.Filled
+        return tradeStatus is TradeStatus.Filled or TradeStatus.Requested;
-                   || tradeStatus == TradeStatus.Requested;
-        }
     }
 }
-

src/Managing.Aspire.ServiceDefaults/Extensions.cs

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.ServiceDiscovery;
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;

src/Managing.Core/Exceptions/SentryErrorCapture.cs

@@ -1,5 +1,3 @@
-using Sentry;
-
 namespace Managing.Core.Exceptions;
 
 /// <summary>
@@ -14,7 +12,8 @@ public static class SentryErrorCapture
     /// <param name="contextName">A descriptive name for where the error occurred</param>
     /// <param name="extraData">Optional dictionary of additional data to include</param>
     /// <returns>The Sentry event ID</returns>
-    public static SentryId CaptureException(Exception exception, string contextName, IDictionary<string, object> extraData = null)
+    public static SentryId CaptureException(Exception exception, string contextName,
+        IDictionary<string, object> extraData = null)
     {
         return SentrySdk.CaptureException(exception, scope =>
         {
@@ -76,7 +75,8 @@ public static class SentryErrorCapture
     /// <param name="contextName">A descriptive name for where the message originated</param>
     /// <param name="extraData">Optional dictionary of additional data to include</param>
     /// <returns>The Sentry event ID</returns>
-    public static SentryId CaptureMessage(string message, SentryLevel level, string contextName, IDictionary<string, object> extraData = null)
+    public static SentryId CaptureMessage(string message, SentryLevel level, string contextName,
+        IDictionary<string, object> extraData = null)
     {
         // First capture the message with the specified level
         var id = SentrySdk.CaptureMessage(message, level);

src/Managing.Core/Middleawares/GlobalErrorHandlingMiddleware.cs

@@ -1,9 +1,8 @@
 using System.Net;
 using System.Text.Json;
+using Managing.Core.Exceptions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Sentry;
-using Managing.Core.Exceptions;
 
 namespace Managing.Core.Middleawares;
 

src/Managing.Core/Middleawares/SentryDiagnosticsMiddleware.cs

@@ -2,7 +2,6 @@ using System.Text;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Sentry;
 
 namespace Managing.Core.Middleawares;
 

src/Managing.Domain.Tests/Managing.Domain.SimpleTests/UnitTest1.cs

@@ -1,7 +1,7 @@
 using FluentAssertions;
 using Managing.Common;
+using Managing.Domain.Candles;
 using Managing.Domain.Shared.Helpers;
-using static Managing.Common.Enums;
 using Xunit;
 
 namespace Managing.Domain.SimpleTests;
@@ -16,12 +16,12 @@ public class SimpleTradingBoxTests
     public void GetHodlPercentage_WithPriceIncrease_CalculatesCorrectPercentage()
     {
         // Arrange
-        var candle1 = new Managing.Domain.Candles.Candle
+        var candle1 = new Candle
         {
             Close = 100m,
             Date = DateTime.UtcNow
         };
-        var candle2 = new Managing.Domain.Candles.Candle
+        var candle2 = new Candle
         {
             Close = 110m,
             Date = DateTime.UtcNow.AddHours(1)
@@ -38,12 +38,12 @@ public class SimpleTradingBoxTests
     public void GetHodlPercentage_WithPriceDecrease_CalculatesNegativePercentage()
     {
         // Arrange
-        var candle1 = new Managing.Domain.Candles.Candle
+        var candle1 = new Candle
         {
             Close = 100m,
             Date = DateTime.UtcNow
         };
-        var candle2 = new Managing.Domain.Candles.Candle
+        var candle2 = new Candle
         {
             Close = 90m,
             Date = DateTime.UtcNow.AddHours(1)

src/Managing.Domain.Tests/SimpleTradingBoxTests.cs

@@ -1,15 +1,6 @@
 using FluentAssertions;
-using Managing.Common;
-using Managing.Domain.Accounts;
 using Managing.Domain.Candles;
-using Managing.Domain.Indicators;
-using Managing.Domain.MoneyManagements;
-using Managing.Domain.Scenarios;
 using Managing.Domain.Shared.Helpers;
-using Managing.Domain.Statistics;
-using Managing.Domain.Strategies;
-using Managing.Domain.Strategies.Base;
-using Managing.Domain.Trades;
 using Xunit;
 using static Managing.Common.Enums;
 
@@ -25,12 +16,12 @@ public class SimpleTradingBoxTests
     public void GetHodlPercentage_WithPriceIncrease_CalculatesCorrectPercentage()
     {
         // Arrange
-        var candle1 = new Managing.Domain.Candles.Candle
+        var candle1 = new Candle
         {
             Close = 100m,
             Date = DateTime.UtcNow
         };
-        var candle2 = new Managing.Domain.Candles.Candle
+        var candle2 = new Candle
         {
             Close = 110m,
             Date = DateTime.UtcNow.AddHours(1)
@@ -47,12 +38,12 @@ public class SimpleTradingBoxTests
     public void GetHodlPercentage_WithPriceDecrease_CalculatesNegativePercentage()
     {
         // Arrange
-        var candle1 = new Managing.Domain.Candles.Candle
+        var candle1 = new Candle
         {
             Close = 100m,
             Date = DateTime.UtcNow
         };
-        var candle2 = new Managing.Domain.Candles.Candle
+        var candle2 = new Candle
         {
             Close = 90m,
             Date = DateTime.UtcNow.AddHours(1)

src/Managing.Infrastructure.Tests/PrivyTradingTests.cs

@@ -1,11 +1,6 @@
 using Managing.Common;
 using Managing.Domain.Trades;
-using Managing.Infrastructure.Evm;
-using Managing.Infrastructure.Evm.Models.Privy;
-using Managing.Infrastructure.Evm.Services;
 using Xunit;
-using Managing.Infrastructure.Evm.Abstractions;
-using Microsoft.Extensions.Options;
 
 namespace Managing.Infrastructure.Tests;
 

src/Managing.Infrastructure.Web3/Models/Proxy/GetGmxTradesResponse.cs

@@ -1,12 +1,10 @@
 using System.Text.Json.Serialization;
-using Managing.Domain.Trades;
 using Newtonsoft.Json;
 
 namespace Managing.Infrastructure.Evm.Models.Proxy;
 
 public class GetGmxTradesResponse : Web3ProxyBaseResponse
 {
-  
     [JsonProperty("trades")]
     [JsonPropertyName("trades")]
     public List<GmxTrade> Trades { get; set; }