Repository navigation
fix(amqp): pass sport URN from routing key when building match events #62
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Globalization; | ||
| using System.Threading.Tasks; | ||
| using Oddin.OddsFeedSdk.AMQP.Mapping; | ||
| using Oddin.OddsFeedSdk.AMQP.Messages; | ||
| using Oddin.OddsFeedSdk.API.Abstractions; | ||
| using Oddin.OddsFeedSdk.API.Entities.Abstractions; | ||
| using Oddin.OddsFeedSdk.Common; | ||
| using Oddin.OddsFeedSdk.Configuration; | ||
| using Oddin.OddsFeedSdk.Configuration.Abstractions; | ||
| using Oddin.OddsFeedSdk.Managers.Abstractions; | ||
| using Xunit; | ||
|
|
||
| namespace Oddin.OddsFeedSdk.Tests.AMQP.Mapping; | ||
|
|
||
| public class FeedMessageMapperTests | ||
| { | ||
| private const string MatchId = "od:match:123"; | ||
| private const string TournamentId = "od:tournament:456"; | ||
|
|
||
| [Fact] | ||
| public void MapBetStopPassesRoutingKeySportToMatchBuilder() | ||
| { | ||
| var builder = new CapturingSportDataBuilder(); | ||
| var mapper = CreateMapper(builder); | ||
|
|
||
| mapper.MapBetStop<IMatch>(CreateMessage(MatchId, "42"), Array.Empty<CultureInfo>(), Array.Empty<byte>()); | ||
|
|
||
| Assert.Equal(MatchId, builder.MatchId?.ToString()); | ||
| Assert.Equal("od:sport:42", builder.MatchSportId?.ToString()); | ||
| Assert.Equal(1, builder.MatchBuildCount); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void MapOddsChangePassesRoutingKeySportToMatchBuilder() | ||
| { | ||
| var builder = new CapturingSportDataBuilder(); | ||
| var mapper = CreateMapper(builder); | ||
| var message = new odds_change | ||
| { | ||
| event_id = MatchId, | ||
| product = 1, | ||
| timestamp = 1, | ||
| RoutingKey = "hi.pre.-.odds_change.42.-.123.-" | ||
| }; | ||
|
|
||
| mapper.MapOddsChange<IMatch>(message, Array.Empty<CultureInfo>(), Array.Empty<byte>()); | ||
|
|
||
| Assert.Equal("od:sport:42", builder.MatchSportId?.ToString()); | ||
| Assert.Equal(1, builder.MatchBuildCount); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void MapBetStopPreservesMatchFallbackWhenRoutingKeyHasNoSport() | ||
| { | ||
| var builder = new CapturingSportDataBuilder(); | ||
| var mapper = CreateMapper(builder); | ||
|
|
||
| mapper.MapBetStop<IMatch>(CreateMessage(MatchId, "-"), Array.Empty<CultureInfo>(), Array.Empty<byte>()); | ||
|
|
||
| Assert.Null(builder.MatchSportId); | ||
| Assert.Equal(1, builder.MatchBuildCount); | ||
| } | ||
|
|
||
| [Fact] | ||
| public void MapBetStopStillPassesRoutingKeySportToTournamentBuilder() | ||
| { | ||
| var builder = new CapturingSportDataBuilder(); | ||
| var mapper = CreateMapper(builder); | ||
|
|
||
| mapper.MapBetStop<ITournament>(CreateMessage(TournamentId, "42"), Array.Empty<CultureInfo>(), Array.Empty<byte>()); | ||
|
|
||
| Assert.Equal(TournamentId, builder.TournamentId?.ToString()); | ||
| Assert.Equal("od:sport:42", builder.TournamentSportId?.ToString()); | ||
| Assert.Equal(1, builder.TournamentBuildCount); | ||
| } | ||
|
|
||
| private static FeedMessageMapper CreateMapper(CapturingSportDataBuilder builder) => | ||
| new( | ||
| new StubProducerManager(), | ||
| new StubFeedConfiguration(), | ||
| null, | ||
| builder); | ||
|
|
||
| private static bet_stop CreateMessage(string eventId, string sportSection) => | ||
| new() | ||
| { | ||
| event_id = eventId, | ||
| product = 1, | ||
| timestamp = 1, | ||
| RoutingKey = $"hi.pre.-.bet_stop.{sportSection}.-.123.-" | ||
| }; | ||
|
|
||
| private sealed class CapturingSportDataBuilder : ISportDataBuilder | ||
| { | ||
| public URN MatchId { get; private set; } | ||
| public URN MatchSportId { get; private set; } | ||
| public int MatchBuildCount { get; private set; } | ||
| public URN TournamentId { get; private set; } | ||
| public URN TournamentSportId { get; private set; } | ||
| public int TournamentBuildCount { get; private set; } | ||
|
|
||
| public IMatch BuildMatch(URN id, IEnumerable<CultureInfo> cultures, URN sportId = null) | ||
| { | ||
| MatchId = id; | ||
| MatchSportId = sportId; | ||
| MatchBuildCount++; | ||
| return null; | ||
| } | ||
|
|
||
| public ITournament BuildTournament(URN id, URN sportId, IEnumerable<CultureInfo> locales) | ||
| { | ||
| TournamentId = id; | ||
| TournamentSportId = sportId; | ||
| TournamentBuildCount++; | ||
| return null; | ||
| } | ||
|
|
||
| public Task<IEnumerable<ISport>> BuildSports(IEnumerable<CultureInfo> locales) => | ||
| Task.FromResult<IEnumerable<ISport>>(Array.Empty<ISport>()); | ||
|
|
||
| public IEnumerable<ITournament> BuildTournaments(IEnumerable<URN> ids, URN sportId, | ||
| IEnumerable<CultureInfo> locales) => Array.Empty<ITournament>(); | ||
|
|
||
| public ISport BuildSport(URN id, IEnumerable<CultureInfo> locales) => null; | ||
| public IEnumerable<ICompetitor> BuildCompetitors(IEnumerable<URN> ids, | ||
| IEnumerable<CultureInfo> cultures) => Array.Empty<ICompetitor>(); | ||
| public IEnumerable<IMatch> BuildMatches(IEnumerable<URN> ids, IEnumerable<CultureInfo> cultures) => | ||
| Array.Empty<IMatch>(); | ||
| public ICompetitor BuildCompetitor(URN id, IEnumerable<CultureInfo> cultures) => null; | ||
| public IPlayer BuildPlayer(URN id, IEnumerable<CultureInfo> cultures) => null; | ||
| public IFixture BuildFixture(URN id, IEnumerable<CultureInfo> cultures) => null; | ||
| public IMatchStatus BuildMatchStatus(URN id, IEnumerable<CultureInfo> cultures) => null; | ||
| } | ||
|
|
||
| private sealed class StubProducerManager : IProducerManager | ||
| { | ||
| public IReadOnlyCollection<IProducer> Producers => Array.Empty<IProducer>(); | ||
| public void DisableProducer(int id) { } | ||
| public IProducer Get(int id) => null; | ||
| public IProducer Get(string name) => null; | ||
| public bool Exists(int id) => false; | ||
| public bool Exists(string name) => false; | ||
| public void AddTimestampBeforeDisconnect(int id, DateTime timestamp) { } | ||
| public void RemoveTimestampBeforeDisconnect(int id) { } | ||
| public void Lock() { } | ||
| } | ||
|
|
||
| private sealed class StubFeedConfiguration : IFeedConfiguration | ||
| { | ||
| public string AccessToken => string.Empty; | ||
| public CultureInfo DefaultLocale => CultureInfo.GetCultureInfo("en-US"); | ||
| public int MaxInactivitySeconds => 0; | ||
| public int MaxRecoveryExecutionMinutes => 0; | ||
| public int? NodeId => null; | ||
| public ExceptionHandlingStrategy ExceptionHandlingStrategy => ExceptionHandlingStrategy.CATCH; | ||
| public string Host => string.Empty; | ||
| public int Port => 0; | ||
| public bool UseSsl => false; | ||
| public string ApiHost => string.Empty; | ||
| public bool UseApiSsl => false; | ||
| public int HttpClientTimeout => 0; | ||
| public int InitialSnapshotTimeInMinutes => 0; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| using Oddin.OddsFeedSdk.AMQP; | ||
| using Xunit; | ||
|
|
||
| namespace Oddin.OddsFeedSdk.Tests.AMQP; | ||
|
|
||
| public class TopicParsingHelperTests | ||
| { | ||
| [Theory] | ||
| [InlineData(null, null)] | ||
| [InlineData("", null)] | ||
| [InlineData("hi.pre.-.bet_stop.42.-.123.-", "od:sport:42")] | ||
| [InlineData("hi.pre.-.bet_stop.-.-.123.-", null)] | ||
| public void GetSportUrnParsesSportSection(string routingKey, string expected) | ||
| { | ||
| Assert.Equal(expected, TopicParsingHelper.GetSportURN(routingKey)?.ToString()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -389,7 +389,7 @@ private ISportEvent MapSportEvent(URN id, URN sport, IEnumerable<CultureInfo> cu | |
| if (sport is null) throw new ArgumentNullException(nameof(sport)); | ||
| return _sportDataBuilder.BuildTournament(id, sport, cultures); | ||
| case URN.TypeMatch: | ||
| return _sportDataBuilder.BuildMatch(id, cultures, sport); | ||
|
Contributor
There was a problem hiding this comment. This line is correct and I'd keep it — but it does not fix #57, and the PR description says it does.
var sportId = SportId; // ✓ non-null now
if (sportId is null) return null;
var tournamentId = FetchMatch(_cultures)?.TournamentId; // ← still needs the summary
if (tournamentId is null) return null; // ← still null when it failsThe routing key has no tournament section ( And when the summary succeeds, Reviewed by Claude Opus 5 via Claude Code, on behalf of @dsaiko — cross-checked against the equivalent path in gosdk.
Contributor
There was a problem hiding this comment. Second, separable concern on the same line (commenting here since
Per-message Reviewed by Claude Opus 5 via Claude Code, on behalf of @dsaiko — cross-checked against the equivalent path in gosdk. |
||
| default: | ||
| throw new ArgumentException($"Sport event of unknown type '{id?.Type}'"); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fake returning
nullis why the suite can't catch the gap in #57.Every assertion here is about whether the
sportIdargument arrives at the builder — which the one-line change plainly does. Nothing constructs a realMatchand asks it forSportIdorTournament, so the actual reported failure (summary fetch fails →Tournamentisnull→ NRE onawait) is untested in both directions.Suggested addition: a fake
IMatchCachewhose lookup returnsnull/throws, build a realMatchwith a non-nulllocalSportId, then assertmatch.Tournament. UnderCATCHthat returnsnulltoday even with this fix applied, which is the regression test #57 needs.Reviewed by Claude Opus 5 via Claude Code, on behalf of @dsaiko — cross-checked against the equivalent path in gosdk.