e4d8476782
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.
196 lines
7.5 KiB
C#
196 lines
7.5 KiB
C#
using FluentAssertions;
|
|
using Marathon.Domain.Enums;
|
|
using Marathon.Infrastructure.Scraping.Parsers;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
|
|
namespace Marathon.Infrastructure.Tests.Scraping;
|
|
|
|
public sealed class EventOddsParserTests
|
|
{
|
|
private static string FixturePath(string filename) => Path.Combine(
|
|
AppContext.BaseDirectory,
|
|
"Fixtures", "marathonbet", filename);
|
|
|
|
private readonly EventOddsParser _sut;
|
|
|
|
public EventOddsParserTests()
|
|
{
|
|
var serverTime = new ServerTimeProvider(NullLogger<ServerTimeProvider>.Instance);
|
|
var periodMapper = new PeriodScopeMapper(basketballQuarterMode: false);
|
|
_sut = new EventOddsParser(
|
|
serverTime,
|
|
periodMapper,
|
|
NullLogger<EventOddsParser>.Instance);
|
|
}
|
|
|
|
// ── Football fixture ───────────────────────────────────────────────────
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_ReturnsNonNullSnapshot()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
snapshot.Should().NotBeNull();
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_SnapshotEventIdMatches()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
snapshot!.EventId.Value.Should().Be("26456117");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_MatchWin1Extracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var win1 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Win && b.Side == Side.Side1);
|
|
|
|
win1.Should().NotBeNull("Match Win-1 bet must be present");
|
|
win1!.Rate.Value.Should().Be(1.65m);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_MatchDrawExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var draw = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Draw);
|
|
|
|
draw.Should().NotBeNull("Match Draw bet must be present");
|
|
draw!.Rate.Value.Should().Be(4.1m);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_MatchWin2Extracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var win2 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Win && b.Side == Side.Side2);
|
|
|
|
win2.Should().NotBeNull("Match Win-2 bet must be present");
|
|
win2!.Rate.Value.Should().Be(5.7m);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_HandicapBetsExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var fora1 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.WinFora && b.Side == Side.Side1);
|
|
var fora2 = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.WinFora && b.Side == Side.Side2);
|
|
|
|
fora1.Should().NotBeNull("Handicap Side1 must be present");
|
|
fora2.Should().NotBeNull("Handicap Side2 must be present");
|
|
|
|
fora1!.Value!.Value.Should().Be(-1.0m);
|
|
fora1.Rate.Value.Should().Be(2.04m);
|
|
|
|
fora2!.Value!.Value.Should().Be(1.0m);
|
|
fora2.Rate.Value.Should().Be(1.82m);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_TotalBetsExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var totalLess = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Total && b.Side == Side.Less);
|
|
var totalMore = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Total && b.Side == Side.More);
|
|
|
|
totalLess.Should().NotBeNull("Total Less must be present");
|
|
totalMore.Should().NotBeNull("Total More must be present");
|
|
|
|
totalLess!.Value!.Value.Should().Be(2.5m);
|
|
totalMore!.Value!.Value.Should().Be(2.5m);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_Period1WinExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var p1Win1 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is PeriodScope { Number: 1 } && b.Type == BetType.Win && b.Side == Side.Side1);
|
|
var p1Draw = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is PeriodScope { Number: 1 } && b.Type == BetType.Draw);
|
|
var p1Win2 = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is PeriodScope { Number: 1 } && b.Type == BetType.Win && b.Side == Side.Side2);
|
|
|
|
p1Win1.Should().NotBeNull("Period-1 Win-1 must be present for football");
|
|
p1Draw.Should().NotBeNull("Period-1 Draw must be present for football");
|
|
p1Win2.Should().NotBeNull("Period-1 Win-2 must be present for football");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_FootballFixture_SourceIsStamped()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-football-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.Live);
|
|
|
|
snapshot!.Source.Should().Be(OddsSource.Live);
|
|
}
|
|
|
|
// ── Basketball fixture ─────────────────────────────────────────────────
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_BasketballFixture_MatchWin1WithNoDrawExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-basketball-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
snapshot.Should().NotBeNull();
|
|
|
|
var win1 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Win && b.Side == Side.Side1);
|
|
var draw = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is MatchScope && b.Type == BetType.Draw);
|
|
|
|
win1.Should().NotBeNull("Basketball Match Win-1 must be present");
|
|
draw.Should().BeNull("Basketball (OT market) has no Draw outcome");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ParseAsync_BasketballFixture_Period1WinsExtracted()
|
|
{
|
|
var html = await File.ReadAllTextAsync(FixturePath("event-basketball-sample.html"));
|
|
|
|
var snapshot = await _sut.ParseAsync(html, OddsSource.PreMatch);
|
|
|
|
var p1Win1 = snapshot!.Bets.FirstOrDefault(b =>
|
|
b.Scope is PeriodScope { Number: 1 } && b.Type == BetType.Win && b.Side == Side.Side1);
|
|
var p1Win2 = snapshot.Bets.FirstOrDefault(b =>
|
|
b.Scope is PeriodScope { Number: 1 } && b.Type == BetType.Win && b.Side == Side.Side2);
|
|
|
|
p1Win1.Should().NotBeNull("Basketball Period-1 Win-1 must be present");
|
|
p1Win2.Should().NotBeNull("Basketball Period-1 Win-2 must be present");
|
|
}
|
|
}
|