Conversant: fix bid floor (#1291)

prebid · Aug 10, 2021 · ed58353 · ed58353
1 parent 64538f9
commit ed58353
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java b/src/main/java/org/prebid/server/bidder/conversant/ConversantBidder.java
@@ -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;
@@ -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();

diff --git a/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java b/src/test/java/org/prebid/server/bidder/conversant/ConversantBidderTest.java
@@ -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,