Phase 6 (Stufe 6): MongoDB vollstaendig entfernt
- Legacy-Form stillgelegt: frm_main(.Designer/.resx) + frm_analytics(.Designer/.resx) geloescht, 'Open Legacy'-Menue aus LauncherForm entfernt. - Program.cs: IMongoDatabase-Registrierung + closed_trades-Cleanup weg; Trade-Nummerierung liest jetzt hoechste TradeId aus ICopyTradeLogRepository. - StartupHydrationService: Mongo-/Bson-Fallback entfernt (Settings kommen aus dem Repo; fehlende Accounts erhalten Default-Settings). - Alle Mongo*Repository (Core 4 + Modul 4) geloescht; DI-Zweige auf EF/MySQL reduziert (AddCorePersistence, CopyTradingModule). - ConfigMigrator: Mongo-Pfad (Run/MigrateSettings) entfernt; nur noch RunFromJson + VerifyMySql (kein Mongo-Treiber mehr). - Modelle: [BsonId] entfernt (EF-Keys via HasKey); ObjectId-Defaults -> Guid. - LiteDB-Shim (MongoDbLiteDBShim) geloescht; MongoDB.Driver- + LiteDB-Pakete aus App/Core entfernt; stale usings + user-sichtbare Strings bereinigt. - DatabaseOptions/appsettings.json: Mongo-Provider/Connection-Felder entfernt. - Build gruen; --verify-mysql bestaetigt 3 Accounts/3 Settings/32 Trader/2344 Markets. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Richard
co-authored by
Claude Opus 4.8
Claude Opus 4.8
parent
d227d24ca8
commit
b951b912f4
+3
-136
@@ -6,100 +6,21 @@ using System.Linq;
|
||||
using System.Text.Json;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using MongoDB.Bson;
|
||||
using MongoDB.Driver;
|
||||
using PolyTrader.Core.Persistence;
|
||||
using PolyTrader.Core.Persistence.Ef;
|
||||
using PolyTrader.Core.Persistence.Mongo;
|
||||
using PolyTrader.Modules.CopyTrading.Persistence;
|
||||
using PolyTrader.Modules.CopyTrading.Persistence.Ef;
|
||||
using PolyTrader.Modules.CopyTrading.Persistence.Mongo;
|
||||
using PolyTraderSharp.Models;
|
||||
|
||||
namespace PolyTraderSharp.Services
|
||||
{
|
||||
/// <summary>
|
||||
/// Einmalige Config-Migration Mongo → MySQL (Phase 6, Stufe 4).
|
||||
/// Kopiert NUR Konfiguration: Accounts, aktive Markets, Master-Trader,
|
||||
/// Copytrading-Account-Settings (inkl. Fallback auf Alt-Felder im accounts-Dokument)
|
||||
/// und Demo-Positionen (reines App-State). Handels-/Master-Trader-Historie startet leer.
|
||||
///
|
||||
/// Aufruf: <c>PolyTraderSharp.exe --migrate-config</c> (kein UI-Start).
|
||||
/// Liest die Mongo-Verbindung aus Database:ConnectionString/DatabaseName, die
|
||||
/// MySQL-Verbindung aus Database:MySqlConnectionString (appsettings[.Local].json).
|
||||
/// Idempotent über Upserts (mehrfacher Aufruf überschreibt, dupliziert nicht).
|
||||
/// Einmalige Config-Migration nach MySQL (Phase 6, Stufe 4).
|
||||
/// Quelle: mongoexport-JSON (<see cref="RunFromJson"/>). <see cref="VerifyMySql"/>
|
||||
/// liest die migrierte Config zur Kontrolle zurück. Idempotent über Upserts.
|
||||
/// </summary>
|
||||
public static class ConfigMigrator
|
||||
{
|
||||
public static void Run(string mongoConnection, string mongoDbName, string mySqlConnection)
|
||||
{
|
||||
Console.WriteLine("=== Config-Migration Mongo -> MySQL ===");
|
||||
Console.WriteLine($"Quelle (Mongo): {mongoDbName} @ {mongoConnection}");
|
||||
Console.WriteLine($"Ziel (MySQL): {Redact(mySqlConnection)}");
|
||||
|
||||
// --- Quelle: Mongo ---
|
||||
var mongoDb = new MongoClient(mongoConnection).GetDatabase(mongoDbName);
|
||||
var srcAccounts = new MongoAccountRepository(mongoDb);
|
||||
var srcMarkets = new MongoMarketRepository(mongoDb);
|
||||
var srcPositions = new MongoPositionRepository(mongoDb);
|
||||
var srcTraders = new MongoTrackedTraderRepository(mongoDb);
|
||||
var srcSettings = new MongoCopyTradingAccountSettingsRepository(mongoDb);
|
||||
var rawAccounts = mongoDb.GetCollection<BsonDocument>("accounts");
|
||||
|
||||
// --- Ziel: MySQL/EF (eigene Mini-Container für die DbContext-Factories) ---
|
||||
var target = new ServiceCollection()
|
||||
.AddDbContextFactory<CoreDbContext>(o => o.UseMySql(mySqlConnection, ServerVersion.AutoDetect(mySqlConnection)))
|
||||
.AddDbContextFactory<CopyTradingDbContext>(o => o.UseMySql(mySqlConnection, ServerVersion.AutoDetect(mySqlConnection)))
|
||||
.BuildServiceProvider();
|
||||
|
||||
var coreFactory = target.GetRequiredService<IDbContextFactory<CoreDbContext>>();
|
||||
var ctFactory = target.GetRequiredService<IDbContextFactory<CopyTradingDbContext>>();
|
||||
|
||||
IAccountRepository dstAccounts = new EfAccountRepository(coreFactory);
|
||||
IMarketRepository dstMarkets = new EfMarketRepository(coreFactory);
|
||||
IPositionRepository dstPositions = new EfPositionRepository(coreFactory);
|
||||
ITrackedTraderRepository dstTraders = new EfTrackedTraderRepository(ctFactory);
|
||||
ICopyTradingAccountSettingsRepository dstSettings = new EfCopyTradingAccountSettingsRepository(ctFactory);
|
||||
|
||||
dstMarkets.EnsureIndexes();
|
||||
|
||||
// 1) Accounts
|
||||
var accounts = srcAccounts.GetAll();
|
||||
foreach (var acc in accounts)
|
||||
dstAccounts.Upsert(acc);
|
||||
Console.WriteLine($"[OK] Accounts: {accounts.Count}");
|
||||
|
||||
// 2) Aktive Markets
|
||||
var markets = srcMarkets.GetActive();
|
||||
foreach (var m in markets)
|
||||
dstMarkets.Upsert(m);
|
||||
Console.WriteLine($"[OK] Markets (aktiv): {markets.Count}");
|
||||
|
||||
// 3) Master-Trader
|
||||
var traders = srcTraders.GetAll();
|
||||
foreach (var t in traders)
|
||||
dstTraders.Upsert(t);
|
||||
Console.WriteLine($"[OK] Master-Trader: {traders.Count}");
|
||||
|
||||
// 4) Copytrading-Account-Settings (mit Fallback auf Alt-Felder)
|
||||
int settingsCount = MigrateSettings(accounts, srcSettings, dstSettings, rawAccounts);
|
||||
Console.WriteLine($"[OK] Copytrading-Settings: {settingsCount}");
|
||||
|
||||
// 5) Demo-Positionen (reines App-State; Live-Positionen werden aus der Chain rekonstruiert)
|
||||
int demoPos = 0;
|
||||
foreach (var acc in accounts.Where(a => a.IsDemo))
|
||||
{
|
||||
foreach (var pos in srcPositions.GetDemo(acc.AccountId))
|
||||
{
|
||||
dstPositions.UpsertDemo(acc.AccountId, pos);
|
||||
demoPos++;
|
||||
}
|
||||
}
|
||||
Console.WriteLine($"[OK] Demo-Positionen: {demoPos}");
|
||||
|
||||
Console.WriteLine("=== Migration abgeschlossen ===");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Config-Migration aus mongoexport-JSON (Ordner mit PolyTraderDB.accounts.json /
|
||||
/// .trackers.json) → MySQL. Markets bleiben aussen vor (bereits migriert und werden
|
||||
@@ -321,60 +242,6 @@ namespace PolyTraderSharp.Services
|
||||
return set;
|
||||
}
|
||||
|
||||
private static int MigrateSettings(
|
||||
List<AccountState> accounts,
|
||||
ICopyTradingAccountSettingsRepository src,
|
||||
ICopyTradingAccountSettingsRepository dst,
|
||||
IMongoCollection<BsonDocument> rawAccounts)
|
||||
{
|
||||
var existing = src.GetAll().ToDictionary(s => s.AccountId);
|
||||
int count = 0;
|
||||
|
||||
foreach (var acc in accounts)
|
||||
{
|
||||
if (existing.TryGetValue(acc.AccountId, out var s))
|
||||
{
|
||||
dst.Upsert(s);
|
||||
count++;
|
||||
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);
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
dst.Upsert(settings);
|
||||
count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
private static decimal Dec(BsonDocument doc, string field, decimal fallback)
|
||||
{
|
||||
if (doc.TryGetValue(field, out var v))
|
||||
{
|
||||
try { return v.ToDecimal(); } catch { }
|
||||
}
|
||||
return fallback;
|
||||
}
|
||||
|
||||
private static string Redact(string conn) =>
|
||||
System.Text.RegularExpressions.Regex.Replace(conn, "(?i)(password=)[^;]*", "$1***");
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace PolyTraderSharp.Services
|
||||
|
||||
_jobStatus = new JobStatusRow
|
||||
{
|
||||
JobName = "MongoDB Transaction Log",
|
||||
JobName = "MySQL Transaction Log",
|
||||
Description = "Awaits internal signals to write Closed Trades to the database safely.",
|
||||
StatusText = "Pending Initial Delay..."
|
||||
};
|
||||
@@ -97,7 +97,7 @@ namespace PolyTraderSharp.Services
|
||||
ExitReason = trade.ExitReason
|
||||
});
|
||||
|
||||
_logger.Debug($"Saved ClosedTrade {trade.TradeId} to MongoDB");
|
||||
_logger.Debug($"Saved ClosedTrade {trade.TradeId} to MySQL");
|
||||
_jobStatus.LastRun = DateTime.Now;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace PolyTraderSharp.Services
|
||||
|
||||
_jobStatus = new JobStatusRow
|
||||
{
|
||||
JobName = "LiteDB State Snapshot",
|
||||
JobName = "State Snapshot",
|
||||
Description = "Saves active application state (balances, open pos) to snapshot.json.",
|
||||
StatusText = "Pending Initial Delay..."
|
||||
};
|
||||
|
||||
@@ -3,8 +3,6 @@ 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;
|
||||
@@ -26,7 +24,6 @@ namespace PolyTraderSharp.Services
|
||||
private readonly IPositionRepository _positionRepo;
|
||||
private readonly ICopyTradingAccountSettingsRepository _accountSettingsRepo;
|
||||
private readonly ITrackedTraderRepository _traderRepo;
|
||||
private readonly IMongoDatabase _db;
|
||||
private readonly TerminalLogger _logger;
|
||||
|
||||
public StartupHydrationService(
|
||||
@@ -36,7 +33,6 @@ namespace PolyTraderSharp.Services
|
||||
IPositionRepository positionRepo,
|
||||
ICopyTradingAccountSettingsRepository accountSettingsRepo,
|
||||
ITrackedTraderRepository traderRepo,
|
||||
IMongoDatabase db,
|
||||
TerminalLogger logger)
|
||||
{
|
||||
_state = state;
|
||||
@@ -45,7 +41,6 @@ namespace PolyTraderSharp.Services
|
||||
_positionRepo = positionRepo;
|
||||
_accountSettingsRepo = accountSettingsRepo;
|
||||
_traderRepo = traderRepo;
|
||||
_db = db;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
@@ -85,14 +80,12 @@ namespace PolyTraderSharp.Services
|
||||
|
||||
/// <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).
|
||||
/// kein Eintrag, wird ein Default-Eintrag angelegt und persistiert.
|
||||
/// </summary>
|
||||
private void HydrateAccountSettings(List<AccountState> accounts)
|
||||
{
|
||||
var existing = _accountSettingsRepo.GetAll().ToDictionary(s => s.AccountId);
|
||||
var rawAccounts = _db.GetCollection<BsonDocument>("accounts");
|
||||
int migrated = 0;
|
||||
int created = 0;
|
||||
|
||||
foreach (var acc in accounts)
|
||||
{
|
||||
@@ -103,41 +96,13 @@ namespace PolyTraderSharp.Services
|
||||
}
|
||||
|
||||
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;
|
||||
created++;
|
||||
}
|
||||
|
||||
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;
|
||||
if (created > 0)
|
||||
_logger.Info($"Copytrading-Account-Settings: {created} Default-Eintrag/-Einträge angelegt.");
|
||||
}
|
||||
|
||||
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||
|
||||
Reference in New Issue
Block a user