Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: prevent ExchangeService from emptying Source object #2849

Merged
merged 2 commits into from
Jan 5, 2024
Merged

fix: prevent ExchangeService from emptying Source object #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1430f8
fix: prevent ExchangeService to empty Source object when TRANSMIT_TID…
vpontesfreestar Dec 18, 2023
83bf3af
fix: improve logic and add tests
vpontesfreestar Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/prebid/server/auction/ExchangeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,6 +1135,7 @@ private static Content prepareContent(Content content) {
*/
private Source prepareSource(String bidder, BidRequest bidRequest, boolean transmitTid) {
final Source receivedSource = bidRequest.getSource();

final SupplyChain bidderSchain = supplyChainResolver.resolveForBidder(bidder, bidRequest);

if (bidderSchain == null && transmitTid) {
Expand All @@ -1144,9 +1145,8 @@ private Source prepareSource(String bidder, BidRequest bidRequest, boolean trans
return receivedSource == null
? Source.builder().schain(bidderSchain).build()
: receivedSource.toBuilder()
.schain(bidderSchain)
.tid(transmitTid ? receivedSource.getTid() : null)
.build();
.schain(bidderSchain != null ? bidderSchain : receivedSource.getSchain())
.tid(transmitTid ? receivedSource.getTid() : null).build();
}

/**
Expand Down
44 changes: 44 additions & 0 deletions src/test/java/org/prebid/server/auction/ExchangeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,50 @@ public void shouldPassTidsIfCreateTidsTrue() {
.containsExactly(TextNode.valueOf("bidderTidValue"));
}

@Test
public void shouldRemoveTidsIfCreateTidsFalseAndKeepReceivedSchain() {
// given
final String bidderName = "bidder";
final Bidder<?> bidder = mock(Bidder.class);
givenBidder(bidderName, bidder, givenEmptySeatBid());

final Imp imp = givenImp(Map.of(bidderName, 1), identity());
imp.getExt().put("tid", "bidderTidValue");
final BidRequest bidRequest = givenBidRequest(
singletonList(imp),
builder -> builder
.source(Source.builder().tid("sourceTidValue").schain(SupplyChain.of(1,
List.of(SupplyChainNode.of("freestar.com", "66", null, null,
null, 1, null)), "1.0", null))
.build())
.ext(ExtRequest.of(
ExtRequestPrebid.builder()
.createTids(false)
.build())));

// when
target.holdAuction(givenRequestContext(bidRequest));

// then
final ArgumentCaptor<BidderRequest> bidRequestCaptor = ArgumentCaptor.forClass(BidderRequest.class);
verify(httpBidderRequester)
.requestBids(same(bidder), bidRequestCaptor.capture(), any(), any(), any(), any(), anyBoolean());

final BidRequest capturedBidRequest = bidRequestCaptor.getValue().getBidRequest();
assertThat(capturedBidRequest)
.extracting(BidRequest::getSource)
.extracting(Source::getTid)
.isNull();
assertThat(capturedBidRequest)
.extracting(BidRequest::getSource)
.extracting(Source::getSchain)
.isNotNull();
assertThat(capturedBidRequest.getImp())
.extracting(Imp::getExt)
.extracting(ext -> ext.get("tid"))
.containsOnlyNulls();
}

@Test
public void shouldRemoveTidsIfTransmitTidActivityDisallowed() {
// given
Expand Down
Loading