Core: Revert predicate logic. (#3006)

prebid · Feb 22, 2024 · 1da4961 · 1da4961
1 parent 80c27cf
commit 1da4961
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/main/java/org/prebid/server/floors/BasicPriceFloorResolver.java b/src/main/java/org/prebid/server/floors/BasicPriceFloorResolver.java
@@ -512,7 +512,8 @@ private Price resolveFloorMin(BidRequest bidRequest, Imp imp, List<String> warni
         final BigDecimal requestFloorMin = floorRules.map(PriceFloorRules::getFloorMin).orElse(null);
         final String requestFloorMinCur = floorRules.map(PriceFloorRules::getFloorMinCur).orElse(null);
 
-        if (impFloorMinCur != null && !impFloorMinCur.equals(requestFloorMinCur)) {
+        if (ObjectUtils.allNotNull(impFloorMinCur, requestFloorMinCur)
+                && !impFloorMinCur.equals(requestFloorMinCur)) {
             warnings.add("imp[].ext.prebid.floors.floorMinCur and ext.prebid.floors.floorMinCur has different values");
         }
 

diff --git a/src/test/java/org/prebid/server/floors/BasicPriceFloorResolverTest.java b/src/test/java/org/prebid/server/floors/BasicPriceFloorResolverTest.java
@@ -1435,6 +1435,39 @@ public void resolveShouldEmitWarningIfRequestFloorMinCurIsDifferentFromImpFloorM
                         + "ext.prebid.floors.floorMinCur has different values");
     }
 
+    @Test
+    public void resolveShouldNotEmitWarningIfRequestFloorMinCurIsNull() {
+        // given
+        final BidRequest bidRequest = BidRequest.builder()
+                .app(App.builder()
+                        .publisher(Publisher.builder().domain("appDomain").build())
+                        .build())
+                .ext(ExtRequest.of(ExtRequestPrebid.builder()
+                        .floors(PriceFloorRules.builder()
+                                .floorMin(BigDecimal.ONE)
+                                .build())
+                        .build()))
+                .build();
+        final JsonNode impFloorsNode = mapper.valueToTree(ExtImpPrebidFloors.of(
+                null, null, null, BigDecimal.TEN, "USD"));
+        final ObjectNode givenImpExt = mapper.createObjectNode();
+        final ObjectNode givenImpExtPrebid = mapper.createObjectNode();
+        givenImpExtPrebid.set("floors", impFloorsNode);
+        givenImpExt.set("prebid", givenImpExtPrebid);
+
+        // when
+        final List<String> warnings = new ArrayList<>();
+        priceFloorResolver.resolve(bidRequest,
+                givenRules(PriceFloorModelGroup.builder()
+                        .schema(PriceFloorSchema.of("|", singletonList(PriceFloorField.pubDomain)))
+                        .value("appDomain", BigDecimal.ONE)
+                        .build()),
+                givenImp(impBuilder -> impBuilder.ext(givenImpExt)), warnings);
+
+        // then
+        assertThat(warnings).isEmpty();
+    }
+
     @Test
     public void resolveShouldReturnConvertedFloorMinInProvidedCurrencyAndFloorMinMoreThanFloor() {
         // given