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

Conversant: fix bid floor #1291

Merged
merged 3 commits into from
Jun 3, 2021
Merged

Conversant: fix bid floor #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
089eed4
fix bid floor
nickluck8 Jun 2, 2021
0e6aacd
fix bid floor
nickluck8 Jun 3, 2021
e934fe9
add unit tests for conversant bidfloor
nickluck8 Jun 3, 2021
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
20 changes: 18 additions & 2 deletions src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,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.Collections;
import java.util.List;
Expand Down Expand Up @@ -138,14 +139,29 @@ private static Imp modifyImp(Imp imp, ExtImpConversant impExt) {
return imp.toBuilder()
.displaymanager(DISPLAY_MANAGER)
.displaymanagerver(DISPLAY_MANAGER_VER)
.bidfloor(impExt.getBidfloor())
.tagid(impExt.getTagId())
.bidfloor(getBidFloor(imp.getBidfloor(), impExt.getBidfloor()))
.tagid(getTagId(imp.getTagid(), impExt.getTagId()))
.secure(getSecure(imp, impExt))
.banner(modifyBanner(banner, impExt.getPosition()))
.video(video != null && banner == null ? modifyVideo(video, impExt) : video)
.build();
}

private static String getTagId(String tagId, String impExtTagId) {
return StringUtils.isNotEmpty(impExtTagId) ? impExtTagId : tagId;
}

private static BigDecimal getBidFloor(BigDecimal impBidFloor, BigDecimal impExtBidFloor) {

return isValidBidFloor(impExtBidFloor) && !isValidBidFloor(impBidFloor)
? impExtBidFloor
: impBidFloor;
}

private static boolean isValidBidFloor(BigDecimal bidFloor) {
return bidFloor != null && bidFloor.compareTo(BigDecimal.ZERO) > 0;
}

private static Integer getSecure(Imp imp, ExtImpConversant impExt) {
final Integer extSecure = impExt.getSecure();
final Integer impSecure = imp.getSecure();
Expand Down
38 changes: 38 additions & 0 deletions src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,44 @@ public void makeBidsShouldUpdateBidWithUUIDIfGenerateBidIdIsTrue() throws JsonPr
.matches(id -> id.matches(UUID_REGEX), "matches UUID format");
}

@Test
public void makeHttpRequestsShouldSetImpBidFloorFromImpExtIfPresentAndImpBidFloorIsInvalid() {
// given
final BidRequest bidRequest = givenBidRequest(
impBuilder -> impBuilder.bidfloor(new BigDecimal(-1.00)),
extBuilder -> extBuilder.bidfloor(BigDecimal.ONE));

// when
final Result<List<HttpRequest<BidRequest>>> result = conversantBidder.makeHttpRequests(bidRequest);

// then
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).hasSize(1)
.extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
.flatExtracting(BidRequest::getImp)
.extracting(Imp::getBidfloor)
.containsExactly(BigDecimal.ONE);
}

@Test
public void makeHttpRequestsShouldNotSetImpBidFloorFromImpExt() {
// given
final BidRequest bidRequest = givenBidRequest(
impBuilder -> impBuilder.bidfloor(new BigDecimal(-1.00)),
extBuilder -> extBuilder.bidfloor(new BigDecimal(-2.00)));

// when
final Result<List<HttpRequest<BidRequest>>> result = conversantBidder.makeHttpRequests(bidRequest);

// then
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).hasSize(1)
.extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
.flatExtracting(BidRequest::getImp)
.extracting(Imp::getBidfloor)
.containsExactly(new BigDecimal(-1.00));
}

private static BidRequest givenBidRequest(
Function<BidRequest.BidRequestBuilder, BidRequest.BidRequestBuilder> bidRequestCustomizer,
Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomizer,
Expand Down