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

Adot: Add OpenRTB macros resolution #1703

Merged
merged 2 commits into from
Feb 9, 2022
Merged

Adot: Add OpenRTB macros resolution #1703

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
38185fe
Adot: Add macros resolution
marki1an Jan 25, 2022
78c2e2d
Style fixes
Feb 9, 2022
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
15 changes: 14 additions & 1 deletion src/main/java/org/prebid/server/bidder/adot/AdotBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.prebid.server.proto.openrtb.ext.response.BidType;
import org.prebid.server.util.HttpUtil;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand All @@ -33,6 +34,7 @@ public class AdotBidder implements Bidder<BidRequest> {

private static final List<BidType> ALLOWED_BID_TYPES = Arrays.asList(BidType.banner, BidType.video,
BidType.xNative);
private static final String PRICE_MACRO = "${AUCTION_PRICE}";

private final String endpointUrl;
private final JacksonMapper mapper;
Expand Down Expand Up @@ -79,19 +81,30 @@ private List<BidderBid> bidsFromResponse(BidResponse bidResponse) {
.map(SeatBid::getBid)
.filter(Objects::nonNull)
.flatMap(Collection::stream)
.filter(Objects::nonNull)
.map(bid -> createBidderBid(bid, bidResponse))
.filter(Objects::nonNull)
.collect(Collectors.toList());
}

private BidderBid createBidderBid(Bid bid, BidResponse bidResponse) {
try {
return BidderBid.of(bid, getBidType(bid), bidResponse.getCur());
return BidderBid.of(resolveMacros(bid), getBidType(bid), bidResponse.getCur());
} catch (PreBidException e) {
return null;
}
}

private static Bid resolveMacros(Bid bid) {
final BigDecimal price = bid.getPrice();
final String priceAsString = price != null ? price.toPlainString() : "0";

return bid.toBuilder()
.nurl(StringUtils.replace(bid.getNurl(), PRICE_MACRO, priceAsString))
.adm(StringUtils.replace(bid.getAdm(), PRICE_MACRO, priceAsString))
.build();
}

private BidType getBidType(Bid bid) {
final String bidExtType = parseBidExtType(bid);
return ALLOWED_BID_TYPES.stream()
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/org/prebid/server/bidder/adot/AdotBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@
import org.prebid.server.proto.openrtb.ext.ExtPrebid;
import org.prebid.server.proto.openrtb.ext.request.adot.ExtImpAdot;

import java.math.BigDecimal;
import java.util.List;
import java.util.function.Function;
import java.util.function.UnaryOperator;

import static java.util.Collections.singletonList;
import static java.util.function.Function.identity;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.tuple;
import static org.prebid.server.proto.openrtb.ext.response.BidType.banner;
import static org.prebid.server.proto.openrtb.ext.response.BidType.video;
import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative;
Expand Down Expand Up @@ -169,6 +172,27 @@ public void makeBidsShouldReturnVideoBidWhenBidExtAdotMediaTypeIsNative() throws
.containsExactly(BidderBid.of(givenBid("native"), xNative, "USD"));
}

@Test
public void makeBidsShouldReturnBidWithResolvedMacros() throws JsonProcessingException {
// given
final HttpCall<BidRequest> httpCall = givenHttpCall(null,
mapper.writeValueAsString(givenBidResponse(
bidBuilder -> bidBuilder
.nurl("nurl:${AUCTION_PRICE}")
.adm("adm:${AUCTION_PRICE}")
.price(BigDecimal.TEN))));

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

// then
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue())
.extracting(BidderBid::getBid)
.extracting(Bid::getNurl, Bid::getAdm)
.containsExactly(tuple("nurl:10", "adm:10"));
}

private static BidRequest givenBidRequest(
Function<BidRequest.BidRequestBuilder, BidRequest.BidRequestBuilder> bidRequestCustomizer,
Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomizer) {
Expand Down Expand Up @@ -199,6 +223,15 @@ private static BidResponse givenBidResponse(String bidExtMediaType) {
.build();
}

private static BidResponse givenBidResponse(UnaryOperator<Bid.BidBuilder> bidBuilder) {
return BidResponse.builder()
.seatbid(singletonList(SeatBid.builder()
.bid(singletonList(bidBuilder.apply(Bid.builder()
.ext(mapper.valueToTree(AdotBidExt.of(AdotExtAdot.of("native"))))).build()))
.build()))
.build();
}

private static Bid givenBid(String bidExtMediaType) {
return Bid.builder()
.ext(mapper.valueToTree(AdotBidExt.of(AdotExtAdot.of(bidExtMediaType))))
Expand Down