WIP(initial-implementation): parallel batch P2/P3/P5 — code complete, unreviewed
Snapshot of the parallel batch (Phases 2 + 3 + 5) at session pause. Solution does
NOT build cleanly yet — known cross-phase compile issues remain to be resolved
before review. See plans/initial-implementation/PLAN.md "Resume Notes" section
for the exact tomorrow-morning action list.
Phase 2 (Storage):
- Repository interfaces in Marathon.Application/Abstractions
- DateRange, ExportKind, StorageOptions in Marathon.Application/Storage
- EF Core 8 + SQLite (WAL) persistence: 7 entities + configurations + 4 repos
- Hand-written InitialCreate migration (dotnet ef blocked by parallel work)
- ClosedXML ExcelExporter with exact customer-spec wide columns
- PersistenceModule.AddMarathonPersistence DI extension
- Round-trip + export tests (cannot run yet — see cross-phase issues)
Phase 3 (Scraping):
- IOddsScraper, IBetPlacer in Marathon.Application/Abstractions
- ScrapingOptions in Marathon.Infrastructure/Configuration
- MarathonbetScraper with 4 parsers (Upcoming, Live, EventOdds, Results)
- Helpers: ServerTimeProvider, PeriodScopeMapper, OutcomeCodeMapper, MoscowDateParser
- UserAgentRotatorHandler + Polly v8 resilience pipeline
- ScrapingModule.AddMarathonScraping DI extension
- GlobalUsings.cs aliases for EventId / Configuration disambiguation
- Parser tests with trimmed HTML fixtures
- ScrapeResultsAsync interim no-op (Phase 8 will replace via watch-list polling)
Phase 5 (UI shell — killed mid-final-verify, assumed ~95%):
- Marathon.UI populated: MainLayout, App.razor, Pages (Home, Settings),
Components, Theme (MarathonTheme.cs + Tokens.cs + app.css), Resources
(SharedResource.{cs,ru.resx,en.resx}), Services (ISettingsWriter), wwwroot
- WPF host: App.xaml(.cs), MainWindow.xaml(.cs), Marathon.Hosts.WpfBlazor.csproj
with Microsoft.AspNetCore.Components.WebView.Wpf + MudBlazor + Serilog
- appsettings.json + appsettings.Development.json with all sections wired
- bUnit tests: MainLayoutTests, LocaleSwitcherTests, ThemeToggleTests,
JsonSettingsWriterTests + Support helpers
Cross-phase issues to resolve at next session:
1. Phase 2 repository classes are 'internal' — Phase 3's tests can't reference
them. Fix: add InternalsVisibleTo to Marathon.Infrastructure.csproj.
2. Phase 5: LocalizationOptions namespace ambiguity (AspNetCore vs Extensions).
3. Phase 5: WpfBlazor Serilog API mismatch.
Reviewer has NOT run on this batch. Move to Phase 4 only after build is green
and a combined parallel-batch reviewer passes.
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
using Marathon.Application.Abstractions;
|
||||
using Marathon.Application.Storage;
|
||||
using Marathon.Infrastructure.Export;
|
||||
using Marathon.Infrastructure.Persistence.Repositories;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace Marathon.Infrastructure.Persistence;
|
||||
|
||||
/// <summary>
|
||||
/// DI extension that wires up the persistence layer (DbContext, repositories, exporter).
|
||||
/// Call this from the host's DI setup — do NOT call from DependencyInjection.cs (Phase 4).
|
||||
/// </summary>
|
||||
public static class PersistenceModule
|
||||
{
|
||||
/// <summary>
|
||||
/// Registers EF Core DbContext, all repositories and the Excel exporter.
|
||||
/// Reads <c>Storage:DatabasePath</c> from <paramref name="config"/>.
|
||||
/// </summary>
|
||||
public static IServiceCollection AddMarathonPersistence(
|
||||
this IServiceCollection services,
|
||||
IConfiguration config)
|
||||
{
|
||||
services.AddOptions<StorageOptions>()
|
||||
.Bind(config.GetSection(StorageOptions.SectionName))
|
||||
.ValidateOnStart();
|
||||
|
||||
services.AddDbContext<MarathonDbContext>((sp, opts) =>
|
||||
{
|
||||
var storageOptions = sp.GetRequiredService<IOptions<StorageOptions>>().Value;
|
||||
var dbPath = storageOptions.DatabasePath;
|
||||
|
||||
// Ensure the directory exists
|
||||
var dir = Path.GetDirectoryName(dbPath);
|
||||
if (!string.IsNullOrEmpty(dir))
|
||||
Directory.CreateDirectory(dir);
|
||||
|
||||
// Configure SQLite with WAL journal mode
|
||||
opts.UseSqlite(
|
||||
$"Data Source={dbPath}",
|
||||
sqliteOpts => sqliteOpts.CommandTimeout(30));
|
||||
});
|
||||
|
||||
// Register initializer — the HOST must resolve this at startup and call InitializeAsync().
|
||||
// Example in Program.cs:
|
||||
// using var scope = app.Services.CreateScope();
|
||||
// await scope.ServiceProvider.GetRequiredService<MarathonDbContextInitializer>().InitializeAsync();
|
||||
services.AddScoped<MarathonDbContextInitializer>();
|
||||
|
||||
services.AddScoped<IEventRepository, EventRepository>();
|
||||
services.AddScoped<ISnapshotRepository, SnapshotRepository>();
|
||||
services.AddScoped<IResultRepository, ResultRepository>();
|
||||
services.AddScoped<IAnomalyRepository, AnomalyRepository>();
|
||||
services.AddScoped<IExcelExporter, ExcelExporter>();
|
||||
|
||||
return services;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user