diff --git a/src/Managing.Application.Tests/BotsTests.cs b/src/Managing.Application.Tests/BotsTests.cs index ac4ed7f..a9ad29d 100644 --- a/src/Managing.Application.Tests/BotsTests.cs +++ b/src/Managing.Application.Tests/BotsTests.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using Managing.Application.Abstractions; using Managing.Application.Abstractions.Repositories; using Managing.Application.Abstractions.Services; -using Managing.Application.Backtesting; +using Managing.Application.Backtests; using Managing.Application.Hubs; using Managing.Core; using Managing.Domain.Bots; @@ -84,7 +84,7 @@ namespace Managing.Application.Tests // Act var backtestResult = await _backtester.RunTradingBotBacktest(config, DateTime.UtcNow.AddDays(-6), - DateTime.UtcNow, null, false, false); + DateTime.UtcNow, null, false, false); var json = JsonConvert.SerializeObject(backtestResult, Formatting.None); File.WriteAllText($"{ticker}-{timeframe}-{Guid.NewGuid()}.json", json); @@ -256,43 +256,43 @@ namespace Managing.Application.Tests { BotType.SimpleBot => throw new NotImplementedException(), BotType.ScalpingBot => _backtester.RunTradingBotBacktest(new TradingBotConfig - { - AccountName = _account.Name, - MoneyManagement = moneyManagement, - Ticker = ticker, - Scenario = LightScenario.FromScenario(scenario), - Timeframe = timeframe, - IsForWatchingOnly = false, - BotTradingBalance = 1000, - IsForBacktest = true, - CooldownPeriod = 1, - MaxLossStreak = 0, - FlipPosition = false, - Name = "Test", - FlipOnlyWhenInProfit = true, - MaxPositionTimeHours = null, - CloseEarlyWhenProfitable = false - }, DateTime.UtcNow.AddDays(-6), - DateTime.UtcNow, null, false, false).Result, + { + AccountName = _account.Name, + MoneyManagement = moneyManagement, + Ticker = ticker, + Scenario = LightScenario.FromScenario(scenario), + Timeframe = timeframe, + IsForWatchingOnly = false, + BotTradingBalance = 1000, + IsForBacktest = true, + CooldownPeriod = 1, + MaxLossStreak = 0, + FlipPosition = false, + Name = "Test", + FlipOnlyWhenInProfit = true, + MaxPositionTimeHours = null, + CloseEarlyWhenProfitable = false + }, DateTime.UtcNow.AddDays(-6), + DateTime.UtcNow, null, false, false).Result, BotType.FlippingBot => _backtester.RunTradingBotBacktest(new TradingBotConfig - { - AccountName = _account.Name, - MoneyManagement = moneyManagement, - Ticker = ticker, - Scenario = LightScenario.FromScenario(scenario), - Timeframe = timeframe, - IsForWatchingOnly = false, - BotTradingBalance = 1000, - IsForBacktest = true, - CooldownPeriod = 1, - MaxLossStreak = 0, - FlipPosition = true, - Name = "Test", - FlipOnlyWhenInProfit = true, - MaxPositionTimeHours = null, - CloseEarlyWhenProfitable = false - }, DateTime.UtcNow.AddDays(-6), - DateTime.UtcNow, null, false, false).Result, + { + AccountName = _account.Name, + MoneyManagement = moneyManagement, + Ticker = ticker, + Scenario = LightScenario.FromScenario(scenario), + Timeframe = timeframe, + IsForWatchingOnly = false, + BotTradingBalance = 1000, + IsForBacktest = true, + CooldownPeriod = 1, + MaxLossStreak = 0, + FlipPosition = true, + Name = "Test", + FlipOnlyWhenInProfit = true, + MaxPositionTimeHours = null, + CloseEarlyWhenProfitable = false + }, DateTime.UtcNow.AddDays(-6), + DateTime.UtcNow, null, false, false).Result, _ => throw new NotImplementedException(), }; timer.Stop(); @@ -399,43 +399,43 @@ namespace Managing.Application.Tests { BotType.SimpleBot => throw new NotImplementedException(), BotType.ScalpingBot => _backtester.RunTradingBotBacktest(new TradingBotConfig - { - AccountName = _account.Name, - MoneyManagement = moneyManagement, - Ticker = ticker, - Scenario = LightScenario.FromScenario(scenario), - Timeframe = timeframe, - IsForWatchingOnly = false, - BotTradingBalance = 1000, - IsForBacktest = true, - CooldownPeriod = 1, - MaxLossStreak = 0, - FlipPosition = false, - Name = "Test", - FlipOnlyWhenInProfit = true, - MaxPositionTimeHours = null, - CloseEarlyWhenProfitable = false - }, DateTime.UtcNow.AddDays(-6), - DateTime.UtcNow, null, false, false).Result, + { + AccountName = _account.Name, + MoneyManagement = moneyManagement, + Ticker = ticker, + Scenario = LightScenario.FromScenario(scenario), + Timeframe = timeframe, + IsForWatchingOnly = false, + BotTradingBalance = 1000, + IsForBacktest = true, + CooldownPeriod = 1, + MaxLossStreak = 0, + FlipPosition = false, + Name = "Test", + FlipOnlyWhenInProfit = true, + MaxPositionTimeHours = null, + CloseEarlyWhenProfitable = false + }, DateTime.UtcNow.AddDays(-6), + DateTime.UtcNow, null, false, false).Result, BotType.FlippingBot => _backtester.RunTradingBotBacktest(new TradingBotConfig - { - AccountName = _account.Name, - MoneyManagement = moneyManagement, - Ticker = ticker, - Scenario = LightScenario.FromScenario(scenario), - Timeframe = timeframe, - IsForWatchingOnly = false, - BotTradingBalance = 1000, - IsForBacktest = true, - CooldownPeriod = 1, - MaxLossStreak = 0, - FlipPosition = true, - Name = "Test", - FlipOnlyWhenInProfit = true, - MaxPositionTimeHours = null, - CloseEarlyWhenProfitable = false - }, DateTime.UtcNow.AddDays(-6), - DateTime.UtcNow, null, false, false).Result, + { + AccountName = _account.Name, + MoneyManagement = moneyManagement, + Ticker = ticker, + Scenario = LightScenario.FromScenario(scenario), + Timeframe = timeframe, + IsForWatchingOnly = false, + BotTradingBalance = 1000, + IsForBacktest = true, + CooldownPeriod = 1, + MaxLossStreak = 0, + FlipPosition = true, + Name = "Test", + FlipOnlyWhenInProfit = true, + MaxPositionTimeHours = null, + CloseEarlyWhenProfitable = false + }, DateTime.UtcNow.AddDays(-6), + DateTime.UtcNow, null, false, false).Result, _ => throw new NotImplementedException(), }; diff --git a/src/Managing.Application.Tests/TradingBaseTests.cs b/src/Managing.Application.Tests/TradingBaseTests.cs index 4f43683..7e50e22 100644 --- a/src/Managing.Application.Tests/TradingBaseTests.cs +++ b/src/Managing.Application.Tests/TradingBaseTests.cs @@ -1,6 +1,6 @@ using Managing.Application.Abstractions.Repositories; using Managing.Application.Abstractions.Services; -using Managing.Application.Backtesting; +using Managing.Application.Backtests; using Managing.Application.Bots; using Managing.Infrastructure.Databases; using Managing.Infrastructure.Databases.InfluxDb; diff --git a/src/Managing.Application.Workers/Managing.Application.Workers.csproj b/src/Managing.Application.Workers/Managing.Application.Workers.csproj deleted file mode 100644 index ea8d26d..0000000 --- a/src/Managing.Application.Workers/Managing.Application.Workers.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - net8.0 - enable - enable - - - - - - - - - - - - - - - diff --git a/src/Managing.Application/Backtesting/Backtester.cs b/src/Managing.Application/Backtests/Backtester.cs similarity index 99% rename from src/Managing.Application/Backtesting/Backtester.cs rename to src/Managing.Application/Backtests/Backtester.cs index e3da91c..408142b 100644 --- a/src/Managing.Application/Backtesting/Backtester.cs +++ b/src/Managing.Application/Backtests/Backtester.cs @@ -14,7 +14,7 @@ using Microsoft.Extensions.Logging; using static Managing.Common.Enums; using LightBacktestResponse = Managing.Domain.Backtests.LightBacktest; // Use the domain model for notification -namespace Managing.Application.Backtesting +namespace Managing.Application.Backtests { public class Backtester : IBacktester { diff --git a/src/Managing.Application.Workers/PricesService.cs b/src/Managing.Application/Trading/PricesService.cs similarity index 98% rename from src/Managing.Application.Workers/PricesService.cs rename to src/Managing.Application/Trading/PricesService.cs index 0959ec6..45e41e6 100644 --- a/src/Managing.Application.Workers/PricesService.cs +++ b/src/Managing.Application/Trading/PricesService.cs @@ -5,7 +5,7 @@ using Managing.Domain.Candles; using Microsoft.Extensions.Logging; using static Managing.Common.Enums; -namespace Managing.Application.Workers; +namespace Managing.Application.Trading; public class PricesService : IPricesService { diff --git a/src/Managing.Application.Workers/StatisticService.cs b/src/Managing.Application/Trading/StatisticService.cs similarity index 99% rename from src/Managing.Application.Workers/StatisticService.cs rename to src/Managing.Application/Trading/StatisticService.cs index e500e7f..464319d 100644 --- a/src/Managing.Application.Workers/StatisticService.cs +++ b/src/Managing.Application/Trading/StatisticService.cs @@ -11,7 +11,7 @@ using Managing.Domain.Trades; using Microsoft.Extensions.Logging; using static Managing.Common.Enums; -namespace Managing.Application.Workers; +namespace Managing.Application.Trading; public class StatisticService : IStatisticService { diff --git a/src/Managing.Application/Workers/BalanceTrackingWorker.cs b/src/Managing.Application/Workers/BalanceTrackingWorker.cs index d5a8627..8110a65 100644 --- a/src/Managing.Application/Workers/BalanceTrackingWorker.cs +++ b/src/Managing.Application/Workers/BalanceTrackingWorker.cs @@ -46,7 +46,7 @@ public class BalanceTrackingWorker : BaseWorker _logger.LogInformation("Starting balance tracking..."); // Get all active bots - var bots = await _mediator.Send(new GetBotsByStatusCommand(BotStatus.Up)); + var bots = await _mediator.Send(new GetBotsByStatusCommand(BotStatus.Up)); var botCount = bots.Count(); if (botCount == 0) diff --git a/src/Managing.Application.Workers/BaseWorker.cs b/src/Managing.Application/Workers/BaseWorker.cs similarity index 100% rename from src/Managing.Application.Workers/BaseWorker.cs rename to src/Managing.Application/Workers/BaseWorker.cs diff --git a/src/Managing.Application.Workers/BundleBacktestWorker.cs b/src/Managing.Application/Workers/BundleBacktestWorker.cs similarity index 100% rename from src/Managing.Application.Workers/BundleBacktestWorker.cs rename to src/Managing.Application/Workers/BundleBacktestWorker.cs diff --git a/src/Managing.Application.Workers/FundingRatesWatcher.cs b/src/Managing.Application/Workers/FundingRatesWatcher.cs similarity index 100% rename from src/Managing.Application.Workers/FundingRatesWatcher.cs rename to src/Managing.Application/Workers/FundingRatesWatcher.cs diff --git a/src/Managing.Application.Workers/GeneticAlgorithmWorker.cs b/src/Managing.Application/Workers/GeneticAlgorithmWorker.cs similarity index 100% rename from src/Managing.Application.Workers/GeneticAlgorithmWorker.cs rename to src/Managing.Application/Workers/GeneticAlgorithmWorker.cs diff --git a/src/Managing.Application.Workers/LeaderboardWorker.cs b/src/Managing.Application/Workers/LeaderboardWorker.cs similarity index 100% rename from src/Managing.Application.Workers/LeaderboardWorker.cs rename to src/Managing.Application/Workers/LeaderboardWorker.cs diff --git a/src/Managing.Application.Workers/PricesBaseWorker.cs b/src/Managing.Application/Workers/PricesBaseWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesBaseWorker.cs rename to src/Managing.Application/Workers/PricesBaseWorker.cs diff --git a/src/Managing.Application.Workers/PricesFifteenMinutesWorker.cs b/src/Managing.Application/Workers/PricesFifteenMinutesWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesFifteenMinutesWorker.cs rename to src/Managing.Application/Workers/PricesFifteenMinutesWorker.cs diff --git a/src/Managing.Application.Workers/PricesFiveMinutesWorker.cs b/src/Managing.Application/Workers/PricesFiveMinutesWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesFiveMinutesWorker.cs rename to src/Managing.Application/Workers/PricesFiveMinutesWorker.cs diff --git a/src/Managing.Application.Workers/PricesFourHoursWorker.cs b/src/Managing.Application/Workers/PricesFourHoursWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesFourHoursWorker.cs rename to src/Managing.Application/Workers/PricesFourHoursWorker.cs diff --git a/src/Managing.Application.Workers/PricesOneDayWorker.cs b/src/Managing.Application/Workers/PricesOneDayWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesOneDayWorker.cs rename to src/Managing.Application/Workers/PricesOneDayWorker.cs diff --git a/src/Managing.Application.Workers/PricesOneHourWorker.cs b/src/Managing.Application/Workers/PricesOneHourWorker.cs similarity index 100% rename from src/Managing.Application.Workers/PricesOneHourWorker.cs rename to src/Managing.Application/Workers/PricesOneHourWorker.cs diff --git a/src/Managing.Application.Workers/SpotlightWorker.cs b/src/Managing.Application/Workers/SpotlightWorker.cs similarity index 100% rename from src/Managing.Application.Workers/SpotlightWorker.cs rename to src/Managing.Application/Workers/SpotlightWorker.cs diff --git a/src/Managing.Application.Workers/TraderWatcher.cs b/src/Managing.Application/Workers/TraderWatcher.cs similarity index 100% rename from src/Managing.Application.Workers/TraderWatcher.cs rename to src/Managing.Application/Workers/TraderWatcher.cs diff --git a/src/Managing.Application.Workers/WorkerService.cs b/src/Managing.Application/Workers/WorkerService.cs similarity index 100% rename from src/Managing.Application.Workers/WorkerService.cs rename to src/Managing.Application/Workers/WorkerService.cs diff --git a/src/Managing.Bootstrap/ApiBootstrap.cs b/src/Managing.Bootstrap/ApiBootstrap.cs index 15efd65..98bf202 100644 --- a/src/Managing.Bootstrap/ApiBootstrap.cs +++ b/src/Managing.Bootstrap/ApiBootstrap.cs @@ -7,7 +7,7 @@ using Managing.Application.Abstractions; using Managing.Application.Abstractions.Repositories; using Managing.Application.Abstractions.Services; using Managing.Application.Accounts; -using Managing.Application.Backtesting; +using Managing.Application.Backtests; using Managing.Application.ManageBot; using Managing.Application.ManageBot.Commands; using Managing.Application.MoneyManagements; diff --git a/src/Managing.Bootstrap/Managing.Bootstrap.csproj b/src/Managing.Bootstrap/Managing.Bootstrap.csproj index 4f04609..8e79046 100644 --- a/src/Managing.Bootstrap/Managing.Bootstrap.csproj +++ b/src/Managing.Bootstrap/Managing.Bootstrap.csproj @@ -23,7 +23,6 @@ - diff --git a/src/Managing.Bootstrap/WorkersBootstrap.cs b/src/Managing.Bootstrap/WorkersBootstrap.cs index 64f0782..917ab2f 100644 --- a/src/Managing.Bootstrap/WorkersBootstrap.cs +++ b/src/Managing.Bootstrap/WorkersBootstrap.cs @@ -3,7 +3,7 @@ using Managing.Application.Abstractions; using Managing.Application.Abstractions.Repositories; using Managing.Application.Abstractions.Services; using Managing.Application.Accounts; -using Managing.Application.Backtesting; +using Managing.Application.Backtests; using Managing.Application.ManageBot; using Managing.Application.MoneyManagements; using Managing.Application.Scenarios; diff --git a/src/Managing.Infrastructure.Database/Managing.Infrastructure.Databases.csproj b/src/Managing.Infrastructure.Database/Managing.Infrastructure.Databases.csproj index 7b03f75..218c02f 100644 --- a/src/Managing.Infrastructure.Database/Managing.Infrastructure.Databases.csproj +++ b/src/Managing.Infrastructure.Database/Managing.Infrastructure.Databases.csproj @@ -16,10 +16,6 @@ - - - - diff --git a/src/Managing.sln b/src/Managing.sln index c99cbce..ee19cc6 100644 --- a/src/Managing.sln +++ b/src/Managing.sln @@ -47,8 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managing.Infrastructure.Mes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managing.Api.Workers", "Managing.Api.Workers\Managing.Api.Workers.csproj", "{0DC797C2-007C-496E-B4C9-FDBD29D4EF4E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managing.Application.Workers", "Managing.Application.Workers\Managing.Application.Workers.csproj", "{F0BE6092-102B-43C5-9CAB-88EA28AADC2D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managing.Infrastructure.Databases", "Managing.Infrastructure.Database\Managing.Infrastructure.Databases.csproj", "{E6CB238E-8F60-4139-BDE6-31534832198E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Managing.Application.Abstractions", "Managing.Application.Abstractions\Managing.Application.Abstractions.csproj", "{283AC491-97C3-49E0-AB17-272EFB4E5A9C}" @@ -176,14 +174,6 @@ Global {0DC797C2-007C-496E-B4C9-FDBD29D4EF4E}.Release|Any CPU.Build.0 = Release|Any CPU {0DC797C2-007C-496E-B4C9-FDBD29D4EF4E}.Release|x64.ActiveCfg = Release|x64 {0DC797C2-007C-496E-B4C9-FDBD29D4EF4E}.Release|x64.Build.0 = Release|x64 - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Debug|x64.ActiveCfg = Debug|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Debug|x64.Build.0 = Debug|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Release|Any CPU.Build.0 = Release|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Release|x64.ActiveCfg = Release|Any CPU - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D}.Release|x64.Build.0 = Release|Any CPU {E6CB238E-8F60-4139-BDE6-31534832198E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E6CB238E-8F60-4139-BDE6-31534832198E}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6CB238E-8F60-4139-BDE6-31534832198E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -273,7 +263,6 @@ Global {35A05E76-29F6-4DC1-886D-FD69926CB490} = {8F2ECEA7-5BCA-45DF-B6E3-88AADD7AFD45} {AD40302A-27C7-4E9D-B644-C7B141571EAF} = {E453D33B-5C2B-4AA1-834D-2C916EC95FC6} {0DC797C2-007C-496E-B4C9-FDBD29D4EF4E} = {A1296069-2816-43D4-882C-516BCB718D03} - {F0BE6092-102B-43C5-9CAB-88EA28AADC2D} = {F6774DB0-DF13-4077-BC94-0E67EE105C4C} {E6CB238E-8F60-4139-BDE6-31534832198E} = {E453D33B-5C2B-4AA1-834D-2C916EC95FC6} {283AC491-97C3-49E0-AB17-272EFB4E5A9C} = {F6774DB0-DF13-4077-BC94-0E67EE105C4C} {CDDF92D4-9D2E-4134-BD44-3064D6EF462D} = {E453D33B-5C2B-4AA1-834D-2C916EC95FC6}