Phase 5: AccountState-Split (Copytrading-Limits -> Modul)
- Copytrading-Detail-Einstellungen (PerMarketLimit, MaxBuyPrice, PerMasterLimit, Zeit-Limits, PreRedeemLimit, ProfitTarget, MaxPriceDifference) aus dem Core- AccountState in das Modul-Modell CopyTradingAccountSettings verschoben. - CopyTradingState.AccountSettings + GetAccountSettings(accountId) (Default-safe). - Consumer umgestellt: CopyTradingEngine, TraderMonitorService, PolymarketWssClient, frm_main lesen die Limits jetzt aus den Account-Settings. - Neues Modul-Repo ICopyTradingAccountSettingsRepository (Collection ct_account_settings), in CopyTradingModule registriert. - StartupHydration: Settings laden + EINMALIGE Migration der Alt-Limits aus dem Roh-accounts-Dokument (keine konfigurierten Limits gehen verloren). - Build 0 Fehler. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
37f9d0fae2
commit
095c4b64aa
@@ -1,9 +1,12 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using MongoDB.Bson;
|
||||
using MongoDB.Driver;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTrader.Modules.CopyTrading.Persistence;
|
||||
using PolyTraderSharp.Models;
|
||||
|
||||
namespace PolyTraderSharp.Services
|
||||
@@ -21,6 +24,7 @@ namespace PolyTraderSharp.Services
|
||||
private readonly CopyTradingState _copyState;
|
||||
private readonly IAccountRepository _accountRepo;
|
||||
private readonly IPositionRepository _positionRepo;
|
||||
private readonly ICopyTradingAccountSettingsRepository _accountSettingsRepo;
|
||||
private readonly IMongoDatabase _db;
|
||||
private readonly TerminalLogger _logger;
|
||||
|
||||
@@ -29,6 +33,7 @@ namespace PolyTraderSharp.Services
|
||||
CopyTradingState copyState,
|
||||
IAccountRepository accountRepo,
|
||||
IPositionRepository positionRepo,
|
||||
ICopyTradingAccountSettingsRepository accountSettingsRepo,
|
||||
IMongoDatabase db,
|
||||
TerminalLogger logger)
|
||||
{
|
||||
@@ -36,6 +41,7 @@ namespace PolyTraderSharp.Services
|
||||
_copyState = copyState;
|
||||
_accountRepo = accountRepo;
|
||||
_positionRepo = positionRepo;
|
||||
_accountSettingsRepo = accountSettingsRepo;
|
||||
_db = db;
|
||||
_logger = logger;
|
||||
}
|
||||
@@ -44,7 +50,8 @@ namespace PolyTraderSharp.Services
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var acc in _accountRepo.GetAll())
|
||||
var accounts = _accountRepo.GetAll();
|
||||
foreach (var acc in accounts)
|
||||
{
|
||||
if (acc.IsDemo)
|
||||
{
|
||||
@@ -56,6 +63,8 @@ namespace PolyTraderSharp.Services
|
||||
_state.Accounts[acc.AccountId] = acc;
|
||||
}
|
||||
|
||||
HydrateAccountSettings(accounts);
|
||||
|
||||
// Trader (TrackedTrader) sind aktuell noch modulnah; bis zum Trader-Repo in
|
||||
// Phase 5 direkt aus der "trackers"-Collection geladen.
|
||||
var tradersCol = _db.GetCollection<TrackedTrader>("trackers");
|
||||
@@ -74,6 +83,63 @@ namespace PolyTraderSharp.Services
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Lädt die Copytrading-Account-Settings in den State. Existiert für einen Account noch
|
||||
/// kein Eintrag, werden die Werte einmalig aus den alten AccountState-Feldern des
|
||||
/// Roh-Dokuments migriert (damit konfigurierte Limits nach dem Modell-Split erhalten bleiben).
|
||||
/// </summary>
|
||||
private void HydrateAccountSettings(List<AccountState> accounts)
|
||||
{
|
||||
var existing = _accountSettingsRepo.GetAll().ToDictionary(s => s.AccountId);
|
||||
var rawAccounts = _db.GetCollection<BsonDocument>("accounts");
|
||||
int migrated = 0;
|
||||
|
||||
foreach (var acc in accounts)
|
||||
{
|
||||
if (existing.TryGetValue(acc.AccountId, out var s))
|
||||
{
|
||||
_copyState.AccountSettings[acc.AccountId] = s;
|
||||
continue;
|
||||
}
|
||||
|
||||
var settings = new CopyTradingAccountSettings { AccountId = acc.AccountId };
|
||||
try
|
||||
{
|
||||
var raw = rawAccounts.Find(Builders<BsonDocument>.Filter.Eq("_id", acc.AccountId)).FirstOrDefault();
|
||||
if (raw != null)
|
||||
{
|
||||
settings.PerMarketLimit = Dec(raw, "PerMarketLimit", settings.PerMarketLimit);
|
||||
settings.MaxPriceDifference = Dec(raw, "MaxPriceDifference", settings.MaxPriceDifference);
|
||||
settings.MaxBuyPrice = Dec(raw, "MaxBuyPrice", settings.MaxBuyPrice);
|
||||
settings.ProfitTarget = Dec(raw, "ProfitTarget", settings.ProfitTarget);
|
||||
settings.PreRedeemLimit = Dec(raw, "PreRedeemLimit", settings.PreRedeemLimit);
|
||||
settings.PerMasterLimit = Dec(raw, "PerMasterLimit", settings.PerMasterLimit);
|
||||
settings.perMaxTime6h = Dec(raw, "perMaxTime6h", settings.perMaxTime6h);
|
||||
settings.perMaxTime24h = Dec(raw, "perMaxTime24h", settings.perMaxTime24h);
|
||||
settings.perMaxTime72h = Dec(raw, "perMaxTime72h", settings.perMaxTime72h);
|
||||
settings.perMaxTimeNone = Dec(raw, "perMaxTimeNone", settings.perMaxTimeNone);
|
||||
migrated++;
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
_accountSettingsRepo.Upsert(settings);
|
||||
_copyState.AccountSettings[acc.AccountId] = settings;
|
||||
}
|
||||
|
||||
if (migrated > 0)
|
||||
_logger.Info($"Copytrading-Account-Settings: {migrated} Account(s) aus Alt-Feldern migriert.");
|
||||
}
|
||||
|
||||
private static decimal Dec(BsonDocument doc, string field, decimal fallback)
|
||||
{
|
||||
if (doc.TryGetValue(field, out var v))
|
||||
{
|
||||
try { return v.ToDecimal(); } catch { }
|
||||
}
|
||||
return fallback;
|
||||
}
|
||||
|
||||
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user