Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/main/java/org/prebid/server/bidder/ix/IxBidder.java
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,15 @@ private String mergeNativeImpTrackers(boolean isV11, Response response, List<Eve
}

private static Response mergeNativeImpTrackers(Response response, List<EventTracker> eventTrackers) {
final Stream<String> impTrackers = Optional.of(response)
.map(Response::getImptrackers).stream().flatMap(Collection::stream);

return response.toBuilder()
.imptrackers(Stream.concat(
eventTrackers.stream()
.filter(IxBidder::isImpTracker)
.map(EventTracker::getUrl),
response.getImptrackers().stream())
impTrackers)
.distinct()
.toList())
.build();
Expand Down
81 changes: 81 additions & 0 deletions src/test/java/org/prebid/server/bidder/ix/IxBidderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.util.function.UnaryOperator;

import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.function.UnaryOperator.identity;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -540,6 +541,86 @@ public void makeBidderResponseShouldReturnAdmContainingImpTrackersAndEventImpTra
.containsExactly(mapper.writeValueAsString(expectedNativeResponse));
}

@Test
public void makeBidderResponseShouldReturnAdmContainingEventImpTrackersUrlsWhenImpTrackersAreNull()
throws JsonProcessingException {
// given
final String adm = mapper.writeValueAsString(
Response.builder()
.eventtrackers(singletonList(
EventTracker.builder()
.event(EventType.IMPRESSION.getValue())
.url("eventUrl")
.build()))
.build());
final BidRequest bidRequest = BidRequest.builder()
.imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build()))
.build();
final BidderCall<BidRequest> httpCall = givenHttpCall(
bidRequest,
mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder
.impid("123")
.adm(adm))));

// when
final CompositeBidderResponse result = target.makeBidderResponse(httpCall, bidRequest);

// then
final Response expectedNativeResponse = Response.builder()
.imptrackers(asList("eventUrl"))
.eventtrackers(singletonList(EventTracker.builder()
.event(EventType.IMPRESSION.getValue())
.url("eventUrl")
.build()))
.build();

assertThat(result.getErrors()).isEmpty();
assertThat(result.getBids())
.extracting(BidderBid::getBid)
.extracting(Bid::getAdm)
.containsExactly(mapper.writeValueAsString(expectedNativeResponse));
}

@Test
public void makeBidderResponseShouldReturnAdmWithoutImpTrackers()
throws JsonProcessingException {
// given
final String adm = mapper.writeValueAsString(
Response.builder()
.eventtrackers(singletonList(
EventTracker.builder()
.event(EventType.VIEWABLE_VIDEO50.getValue())
.url("eventUrl")
.build()))
.build());
final BidRequest bidRequest = BidRequest.builder()
.imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build()))
.build();
final BidderCall<BidRequest> httpCall = givenHttpCall(
bidRequest,
mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder
.impid("123")
.adm(adm))));

// when
final CompositeBidderResponse result = target.makeBidderResponse(httpCall, bidRequest);

// then
final Response expectedNativeResponse = Response.builder()
.imptrackers(emptyList())
.eventtrackers(singletonList(EventTracker.builder()
.event(EventType.VIEWABLE_VIDEO50.getValue())
.url("eventUrl")
.build()))
.build();

assertThat(result.getErrors()).isEmpty();
assertThat(result.getBids())
.extracting(BidderBid::getBid)
.extracting(Bid::getAdm)
.containsExactly(mapper.writeValueAsString(expectedNativeResponse));
}

@Test
public void makeBidderResponseShouldReturnAdmContainingOnlyUniqueImpTrackersUrls() throws JsonProcessingException {
// given
Expand Down
Loading