Skip to content
Open
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
19 changes: 16 additions & 3 deletions src/main/java/org/prebid/server/bidder/teal/TealBidder.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.request.Publisher;
import com.iab.openrtb.request.Site;
import com.iab.openrtb.response.Bid;
import com.iab.openrtb.response.BidResponse;
import com.iab.openrtb.response.SeatBid;
import org.apache.commons.collections4.CollectionUtils;
Expand Down Expand Up @@ -177,13 +178,25 @@ private static List<BidderBid> bidsFromResponse(BidRequest bidRequest, BidRespon
.filter(Objects::nonNull)
.flatMap(Collection::stream)
.filter(Objects::nonNull)
.map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur()))
.map(bid -> BidderBid.of(bid, getBidType(bid, bidRequest.getImp()), bidResponse.getCur()))
.toList();
}

private static BidType getBidType(String impId, List<Imp> imps) {
private static BidType getBidType(Bid bid, List<Imp> imps) {
final BidType bidType = Optional.ofNullable(bid.getExt())
.map(ext -> ext.get("prebid"))
.map(extPrebid -> extPrebid.get("type"))
.filter(JsonNode::isTextual)
.map(JsonNode::textValue)
.map(BidType::fromString)
.orElse(null);

if (bidType != null) {
return bidType;
}

for (Imp imp : imps) {
if (imp.getId().equals(impId)) {
if (imp.getId().equals(bid.getImpid())) {
if (imp.getBanner() != null) {
return BidType.banner;
} else if (imp.getVideo() != null) {
Expand Down
21 changes: 21 additions & 0 deletions src/test/java/org/prebid/server/bidder/teal/TealBidderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,26 @@ public void makeBidsShouldReturnErrorWhenResponseBodyCouldNotBeParsed() {
assertThat(result.getValue()).isEmpty();
}

@Test
public void makeBidsShouldReturnBidTypeFromBidExtPrebidType() throws JsonProcessingException {
// given
final ObjectNode bidExt = mapper.createObjectNode();
bidExt.putObject("prebid").put("type", "video");

final Bid responseBid = givenBid("imp1", 2, 1).toBuilder().ext(bidExt).build();
final BidRequest bidRequest = givenBidRequest(imp -> imp.id("imp1").banner(Banner.builder().id("id").build()));
final BidderCall<BidRequest> httpCall = givenHttpCall(bidRequest, singletonList(responseBid));

// when
final Result<List<BidderBid>> result = target.makeBids(httpCall, bidRequest);

// then
final Bid expectedBid = givenBid("imp1", 2, 1).toBuilder().ext(bidExt).build();

assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).containsExactly(BidderBid.of(expectedBid, BidType.video, "USD"));
}

@Test
public void makeBidsShouldReturnBannerBid() throws JsonProcessingException {
// given
Expand Down Expand Up @@ -231,6 +251,7 @@ private static BidRequest givenBidRequest(UnaryOperator<Imp.ImpBuilder> impCusto
return givenBidRequest(null, impCustomizer);
}

@SafeVarargs
private static BidRequest givenBidRequest(Site site, UnaryOperator<Imp.ImpBuilder>... impCustomizers) {
final List<Imp> imps = Stream.of(impCustomizers)
.map(customizer -> customizer.apply(Imp.builder().id("impId")).build())
Expand Down