Clean namings and namespace
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Domain.Workers;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using static Managing.Common.Enums;
|
||||
@@ -29,4 +29,4 @@ public class WorkerController : ControllerBase
|
||||
{
|
||||
return Ok(await _workerService.ToggleWorker(workerType));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
using Managing.Application.Abstractions.Models;
|
||||
using Managing.Domain.Accounts;
|
||||
using Managing.Domain.Bots;
|
||||
using Managing.Domain.Trades;
|
||||
@@ -24,7 +23,7 @@ public interface ILiveTradingBotGrain : IGrainWithGuidKey
|
||||
/// <summary>
|
||||
/// Gets comprehensive bot data including positions, signals, and performance metrics
|
||||
/// </summary>
|
||||
Task<TradingBotResponse> GetBotDataAsync();
|
||||
Task<LiveTradingBotModel> GetBotDataAsync();
|
||||
|
||||
Task CreateAsync(TradingBotConfig config, User user);
|
||||
Task StartAsync();
|
||||
@@ -35,7 +34,7 @@ public interface ILiveTradingBotGrain : IGrainWithGuidKey
|
||||
Task<TradingBotConfig> GetConfiguration();
|
||||
Task<Position> ClosePositionAsync(Guid positionId);
|
||||
Task RestartAsync();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Deletes the bot and cleans up all associated resources
|
||||
/// </summary>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Managing.Common\Managing.Common.csproj" />
|
||||
<ProjectReference Include="..\Managing.Domain\Managing.Domain.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Managing.Common\Managing.Common.csproj"/>
|
||||
<ProjectReference Include="..\Managing.Domain\Managing.Domain.csproj"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="9.2.1" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="9.2.1"/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
namespace Managing.Application.Abstractions.Services;
|
||||
|
||||
public interface IAgentService
|
||||
{
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
using Managing.Domain.MoneyManagements;
|
||||
using Managing.Domain.Users;
|
||||
|
||||
namespace Managing.Application.Abstractions
|
||||
namespace Managing.Application.Abstractions.Services
|
||||
{
|
||||
public interface IMoneyManagementService
|
||||
{
|
||||
@@ -12,4 +12,4 @@ namespace Managing.Application.Abstractions
|
||||
Task<bool> DeleteMoneyManagement(User user, string name);
|
||||
Task<bool> DeleteMoneyManagements(User user);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
namespace Managing.Application.Workers.Abstractions;
|
||||
namespace Managing.Application.Abstractions.Services;
|
||||
|
||||
public interface IPricesService
|
||||
{
|
||||
Task UpdatePrice(TradingExchanges exchange, Ticker ticker, Timeframe timeframe);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
using Managing.Domain.Workers;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
namespace Managing.Application.Workers.Abstractions;
|
||||
namespace Managing.Application.Abstractions.Services;
|
||||
|
||||
public interface IWorkerService
|
||||
{
|
||||
@@ -12,4 +12,4 @@ public interface IWorkerService
|
||||
Task InsertWorker(WorkerType workerType, TimeSpan delay);
|
||||
Task<bool> ToggleWorker(WorkerType workerType);
|
||||
Task UpdateWorker(WorkerType workerType, int executionCount);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
using Managing.Application.Trading;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Handlers;
|
||||
using Managing.Domain.Trades;
|
||||
using Managing.Domain.Users;
|
||||
using Moq;
|
||||
@@ -45,7 +45,8 @@ public class PositionTests : BaseTests
|
||||
// _ = new GetAccountPositioqwnInfoListOutputDTO().DecodeOutput(hexPositions).d
|
||||
//
|
||||
var openTrade = await _exchangeService.GetTrade(_account, "", Ticker.GMX);
|
||||
var position = new Position(Guid.NewGuid(), "", TradeDirection.Long, Ticker.GMX, MoneyManagement, PositionInitiator.User,
|
||||
var position = new Position(Guid.NewGuid(), "", TradeDirection.Long, Ticker.GMX, MoneyManagement,
|
||||
PositionInitiator.User,
|
||||
DateTime.UtcNow, new User())
|
||||
{
|
||||
Open = openTrade
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
@@ -43,7 +43,8 @@ public abstract class BaseWorker<T> : BackgroundService where T : class
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.LogInformation($"[{_workerType}] Last run : {worker.LastRunTime} - Execution Count : {worker.ExecutionCount}");
|
||||
_logger.LogInformation(
|
||||
$"[{_workerType}] Last run : {worker.LastRunTime} - Execution Count : {worker.ExecutionCount}");
|
||||
_executionCount = worker.ExecutionCount;
|
||||
}
|
||||
}
|
||||
@@ -61,6 +62,7 @@ public abstract class BaseWorker<T> : BackgroundService where T : class
|
||||
_executionCount++;
|
||||
await workerService.UpdateWorker(_workerType, _executionCount);
|
||||
}
|
||||
|
||||
_logger.LogInformation($"[{_workerType}] Run ok. Next run at : {DateTime.UtcNow.Add(_delay)}");
|
||||
await Task.Delay(_delay);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -64,4 +63,4 @@ public abstract class PricesBaseWorker<T> : BaseWorker<T> where T : class
|
||||
await _pricesService.UpdatePrice(TradingExchanges.Evm, ticker, _timeframe);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -22,4 +21,4 @@ public class PricesFifteenMinutesWorker : PricesBaseWorker<PricesFifteenMinutesW
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -22,4 +21,4 @@ public class PricesFiveMinutesWorker : PricesBaseWorker<PricesFiveMinutesWorker>
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -22,4 +21,4 @@ public class PricesFourHoursWorker : PricesBaseWorker<PricesFourHoursWorker>
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -22,4 +21,4 @@ public class PricesOneDayWorker : PricesBaseWorker<PricesOneDayWorker>
|
||||
)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
@@ -21,4 +20,4 @@ public class PricesOneHourWorker : PricesBaseWorker<PricesOneHourWorker>
|
||||
Timeframe.OneHour)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
using Managing.Application.Abstractions.Repositories;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Domain.Accounts;
|
||||
using Managing.Domain.Candles;
|
||||
using Microsoft.Extensions.Logging;
|
||||
@@ -35,7 +34,7 @@ public class PricesService : IPricesService
|
||||
{
|
||||
Exchange = exchange,
|
||||
};
|
||||
|
||||
|
||||
if (account == null)
|
||||
throw new Exception($"Enable to found account for exchange {exchange}");
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Managing.Application.Abstractions.Repositories;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Common;
|
||||
using Managing.Domain.Workers;
|
||||
|
||||
|
||||
7
src/Managing.Application/Agents/AgentService.cs
Normal file
7
src/Managing.Application/Agents/AgentService.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
using Managing.Application.Abstractions.Services;
|
||||
|
||||
namespace Managing.Application.Agents;
|
||||
|
||||
public class AgentService : IAgentService
|
||||
{
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
using Managing.Application.Abstractions;
|
||||
using Managing.Application.Abstractions.Grains;
|
||||
using Managing.Application.Abstractions.Models;
|
||||
using Managing.Core;
|
||||
using Managing.Domain.Accounts;
|
||||
using Managing.Domain.Bots;
|
||||
@@ -323,7 +322,7 @@ public class LiveTradingBotGrain : Grain, ILiveTradingBotGrain, IRemindable
|
||||
}
|
||||
|
||||
|
||||
public Task<TradingBotResponse> GetBotDataAsync()
|
||||
public Task<LiveTradingBotModel> GetBotDataAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -332,7 +331,7 @@ public class LiveTradingBotGrain : Grain, ILiveTradingBotGrain, IRemindable
|
||||
throw new InvalidOperationException("Bot is not running");
|
||||
}
|
||||
|
||||
return Task.FromResult(new TradingBotResponse
|
||||
return Task.FromResult(new LiveTradingBotModel
|
||||
{
|
||||
Identifier = _state.State.Identifier,
|
||||
Name = _state.State.Name,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using Managing.Application.Abstractions;
|
||||
using Managing.Application.Abstractions.Grains;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Trading;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Handlers;
|
||||
using Managing.Common;
|
||||
using Managing.Core;
|
||||
using Managing.Domain.Accounts;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Managing.Application.Abstractions;
|
||||
using Managing.Application.Abstractions.Repositories;
|
||||
using Managing.Application.Abstractions.Repositories;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Domain.MoneyManagements;
|
||||
using Managing.Domain.Users;
|
||||
using Microsoft.Extensions.Logging;
|
||||
@@ -47,9 +47,9 @@ public class MoneyManagementService : IMoneyManagementService
|
||||
TakeProfit = request.TakeProfit,
|
||||
Leverage = request.Leverage
|
||||
};
|
||||
|
||||
|
||||
await _settingsRepository.InsertMoneyManagement(lightRequest, user);
|
||||
|
||||
|
||||
// Return the created money management with user
|
||||
return new MoneyManagement
|
||||
{
|
||||
@@ -81,7 +81,7 @@ public class MoneyManagementService : IMoneyManagementService
|
||||
};
|
||||
|
||||
await _settingsRepository.UpdateMoneyManagementAsync(lightRequest, user);
|
||||
|
||||
|
||||
// Return updated money management
|
||||
return new MoneyManagement
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@ using Managing.Domain.Trades;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
namespace Managing.Application.Trading;
|
||||
namespace Managing.Application.Trading.Handlers;
|
||||
|
||||
public class ClosePositionCommandHandler(
|
||||
IExchangeService exchangeService,
|
||||
@@ -3,7 +3,7 @@ using Managing.Application.Trading.Commands;
|
||||
using Managing.Domain.Trades;
|
||||
using MediatR;
|
||||
|
||||
namespace Managing.Application.Trading;
|
||||
namespace Managing.Application.Trading.Handlers;
|
||||
|
||||
public class GetTradeCommandHandler : IRequestHandler<GetTradeCommand, Trade>
|
||||
{
|
||||
@@ -3,7 +3,7 @@ using Managing.Application.Trading.Commands;
|
||||
using Managing.Domain.Trades;
|
||||
using MediatR;
|
||||
|
||||
namespace Managing.Application.Trading
|
||||
namespace Managing.Application.Trading.Handlers
|
||||
{
|
||||
public class GetTradesCommandHandler : IRequestHandler<GetTradesCommand, List<Trade>>
|
||||
{
|
||||
@@ -6,7 +6,7 @@ using Managing.Domain.Shared.Helpers;
|
||||
using Managing.Domain.Trades;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
namespace Managing.Application.Trading
|
||||
namespace Managing.Application.Trading.Handlers
|
||||
{
|
||||
public class OpenPositionCommandHandler(
|
||||
IExchangeService exchangeService,
|
||||
@@ -17,9 +17,9 @@ using Managing.Application.Shared.Behaviours;
|
||||
using Managing.Application.Synth;
|
||||
using Managing.Application.Trading;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Handlers;
|
||||
using Managing.Application.Users;
|
||||
using Managing.Application.Workers;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Domain.Trades;
|
||||
using Managing.Infrastructure.Database.PostgreSql;
|
||||
using Managing.Infrastructure.Databases;
|
||||
|
||||
@@ -11,9 +11,9 @@ using Managing.Application.Shared;
|
||||
using Managing.Application.Synth;
|
||||
using Managing.Application.Trading;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Handlers;
|
||||
using Managing.Application.Users;
|
||||
using Managing.Application.Workers;
|
||||
using Managing.Application.Workers.Abstractions;
|
||||
using Managing.Domain.Trades;
|
||||
using Managing.Infrastructure.Databases;
|
||||
using Managing.Infrastructure.Databases.InfluxDb;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
using Managing.Domain.Bots;
|
||||
using Managing.Domain.Indicators;
|
||||
using Managing.Domain.Trades;
|
||||
using Orleans;
|
||||
using static Managing.Common.Enums;
|
||||
|
||||
namespace Managing.Application.Abstractions.Models;
|
||||
namespace Managing.Domain.Bots;
|
||||
|
||||
/// <summary>
|
||||
/// Response model for trading bot data.
|
||||
/// Used to return comprehensive bot information via Orleans grains.
|
||||
/// </summary>
|
||||
[GenerateSerializer]
|
||||
public class TradingBotResponse
|
||||
public class LiveTradingBotModel
|
||||
{
|
||||
/// <summary>
|
||||
/// Bot identifier
|
||||
@@ -2,10 +2,9 @@
|
||||
using Discord.Commands;
|
||||
using Discord.Net;
|
||||
using Discord.WebSocket;
|
||||
using Managing.Application.Abstractions;
|
||||
using Managing.Application.Abstractions.Services;
|
||||
using Managing.Application.Trading;
|
||||
using Managing.Application.Trading.Commands;
|
||||
using Managing.Application.Trading.Handlers;
|
||||
using Managing.Common;
|
||||
using Managing.Core;
|
||||
using Managing.Domain.MoneyManagements;
|
||||
|
||||
Reference in New Issue
Block a user