Push merge conflict

src/Managing.Api/Controllers/BacktestController.cs

@@ -10,7 +10,6 @@ using Managing.Domain.Strategies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using static Managing.Common.Enums;
 
 namespace Managing.Api.Controllers;
 
@@ -192,15 +191,14 @@ public class BacktestController : BaseController
                 ScenarioName = request.Config.ScenarioName,
                 Scenario = scenario, // Use the converted scenario object
                 Timeframe = request.Config.Timeframe,
-                IsForWatchingOnly = request.WatchOnly,
-                BotTradingBalance = request.Balance,
-                BotType = request.Config.BotType,
+                IsForWatchingOnly = request.Config.IsForWatchingOnly,
+                BotTradingBalance = request.Config.BotTradingBalance,
                 IsForBacktest = true,
                 CooldownPeriod = request.Config.CooldownPeriod,
                 MaxLossStreak = request.Config.MaxLossStreak,
                 MaxPositionTimeHours = request.Config.MaxPositionTimeHours,
                 FlipOnlyWhenInProfit = request.Config.FlipOnlyWhenInProfit,
-                FlipPosition = request.Config.BotType == BotType.FlippingBot, // Computed based on BotType
+                FlipPosition = request.Config.FlipPosition, // Computed based on BotType
                 Name = request.Config.Name ??
                        $"Backtest-{request.Config.ScenarioName ?? request.Config.Scenario?.Name ?? "Custom"}-{DateTime.UtcNow:yyyyMMdd-HHmmss}",
                 CloseEarlyWhenProfitable = request.Config.CloseEarlyWhenProfitable,
@@ -210,21 +208,12 @@ public class BacktestController : BaseController
                 UseForDynamicStopLoss = request.Config.UseForDynamicStopLoss
             };
 
-            switch (request.Config.BotType)
-            {
-                case BotType.SimpleBot:
-                    // SimpleBot backtest not implemented yet
-                    break;
-                case BotType.ScalpingBot:
-                case BotType.FlippingBot:
-                    backtestResult = await _backtester.RunTradingBotBacktest(
-                        backtestConfig,
-                        request.StartDate,
-                        request.EndDate,
-                        user,
-                        request.Save);
-                    break;
-            }
+            backtestResult = await _backtester.RunTradingBotBacktest(
+                backtestConfig,
+                request.StartDate,
+                request.EndDate,
+                user,
+                request.Save);
 
             await NotifyBacktesingSubscriberAsync(backtestResult);
 
@@ -281,16 +270,6 @@ public class RunBacktestRequest
     /// </summary>
     public DateTime EndDate { get; set; }
 
-    /// <summary>
-    /// The starting balance for the backtest
-    /// </summary>
-    public decimal Balance { get; set; }
-
-    /// <summary>
-    /// Whether to only watch the backtest without executing trades
-    /// </summary>
-    public bool WatchOnly { get; set; } = false;
-
     /// <summary>
     /// Whether to save the backtest results
     /// </summary>