Price Floors: Max Rules and Max Dimensions (#3630)

prebid · Jan 8, 2025 · 6bdb547 · 6bdb547
1 parent ba33fac
commit 6bdb547
Show file tree

Hide file tree

Showing 18 changed files with 702 additions and 68 deletions.
diff --git a/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java b/src/main/java/org/prebid/server/floors/BasicPriceFloorProcessor.java
@@ -135,12 +135,25 @@ private PriceFloorRules resolveFloors(Account account, BidRequest bidRequest, Li
 
         if (requestFloors != null) {
             try {
-                PriceFloorRulesValidator.validateRules(requestFloors, Integer.MAX_VALUE);
+                final Optional<AccountPriceFloorsConfig> priceFloorsConfig = Optional.ofNullable(account)
+                        .map(Account::getAuction)
+                        .map(AccountAuctionConfig::getPriceFloors);
+
+                final Long maxRules = priceFloorsConfig.map(AccountPriceFloorsConfig::getMaxRules)
+                        .orElse(null);
+                final Long maxDimensions = priceFloorsConfig.map(AccountPriceFloorsConfig::getMaxSchemaDims)
+                        .orElse(null);
+
+                PriceFloorRulesValidator.validateRules(
+                        requestFloors,
+                        PriceFloorsConfigResolver.resolveMaxValue(maxRules),
+                        PriceFloorsConfigResolver.resolveMaxValue(maxDimensions));
+
                 return createFloorsFrom(requestFloors, fetchStatus, PriceFloorLocation.request);
             } catch (PreBidException e) {
-                errors.add("Failed to parse price floors from request, with a reason : %s ".formatted(e.getMessage()));
+                errors.add("Failed to parse price floors from request, with a reason: %s".formatted(e.getMessage()));
                 conditionalLogger.error(
-                        "Failed to parse price floors from request with id: '%s', with a reason : %s "
+                        "Failed to parse price floors from request with id: '%s', with a reason: %s"
                                 .formatted(bidRequest.getId(), e.getMessage()),
                         0.01d);
             }

diff --git a/src/main/java/org/prebid/server/floors/PriceFloorFetcher.java b/src/main/java/org/prebid/server/floors/PriceFloorFetcher.java
@@ -176,7 +176,10 @@ private ResponseCacheInfo parseFloorResponse(HttpClientResponse httpClientRespon
         }
 
         final PriceFloorData priceFloorData = parsePriceFloorData(body, accountId);
-        PriceFloorRulesValidator.validateRulesData(priceFloorData, resolveMaxRules(fetchConfig.getMaxRules()));
+        PriceFloorRulesValidator.validateRulesData(
+                priceFloorData,
+                PriceFloorsConfigResolver.resolveMaxValue(fetchConfig.getMaxRules()),
+                PriceFloorsConfigResolver.resolveMaxValue(fetchConfig.getMaxSchemaDims()));
 
         return ResponseCacheInfo.of(priceFloorData,
                 FetchStatus.success,
@@ -194,12 +197,6 @@ private PriceFloorData parsePriceFloorData(String body, String accountId) {
         return priceFloorData;
     }
 
-    private static int resolveMaxRules(Long accountMaxRules) {
-        return accountMaxRules != null && !accountMaxRules.equals(0L)
-                ? Math.toIntExact(accountMaxRules)
-                : Integer.MAX_VALUE;
-    }
-
     private Long cacheTtlFromResponse(HttpClientResponse httpClientResponse, String fetchUrl) {
         final String cacheControlValue = httpClientResponse.getHeaders().get(HttpHeaders.CACHE_CONTROL);
         final Matcher cacheHeaderMatcher = StringUtils.isNotBlank(cacheControlValue)

diff --git a/src/main/java/org/prebid/server/floors/PriceFloorRulesValidator.java b/src/main/java/org/prebid/server/floors/PriceFloorRulesValidator.java
@@ -4,12 +4,16 @@
 import org.apache.commons.collections4.MapUtils;
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.floors.model.PriceFloorData;
+import org.prebid.server.floors.model.PriceFloorField;
 import org.prebid.server.floors.model.PriceFloorModelGroup;
 import org.prebid.server.floors.model.PriceFloorRules;
+import org.prebid.server.floors.model.PriceFloorSchema;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 public class PriceFloorRulesValidator {
 
@@ -23,7 +27,7 @@ public class PriceFloorRulesValidator {
     private PriceFloorRulesValidator() {
     }
 
-    public static void validateRules(PriceFloorRules priceFloorRules, Integer maxRules) {
+    public static void validateRules(PriceFloorRules priceFloorRules, Integer maxRules, Integer maxDimensions) {
 
         final Integer rootSkipRate = priceFloorRules.getSkipRate();
         if (rootSkipRate != null && (rootSkipRate < SKIP_RATE_MIN || rootSkipRate > SKIP_RATE_MAX)) {
@@ -36,10 +40,10 @@ public static void validateRules(PriceFloorRules priceFloorRules, Integer maxRul
             throw new PreBidException("Price floor floorMin must be positive float, but was " + floorMin);
         }
 
-        validateRulesData(priceFloorRules.getData(), maxRules);
+        validateRulesData(priceFloorRules.getData(), maxRules, maxDimensions);
     }
 
-    public static void validateRulesData(PriceFloorData priceFloorData, Integer maxRules) {
+    public static void validateRulesData(PriceFloorData priceFloorData, Integer maxRules, Integer maxDimensions) {
         if (priceFloorData == null) {
             throw new PreBidException("Price floor rules data must be present");
         }
@@ -64,10 +68,10 @@ public static void validateRulesData(PriceFloorData priceFloorData, Integer maxR
 
         priceFloorData.getModelGroups().stream()
                 .filter(Objects::nonNull)
-                .forEach(modelGroup -> validateModelGroup(modelGroup, maxRules));
+                .forEach(modelGroup -> validateModelGroup(modelGroup, maxRules, maxDimensions));
     }
 
-    private static void validateModelGroup(PriceFloorModelGroup modelGroup, Integer maxRules) {
+    private static void validateModelGroup(PriceFloorModelGroup modelGroup, Integer maxRules, Integer maxDimensions) {
         final Integer modelWeight = modelGroup.getModelWeight();
         if (modelWeight != null
                 && (modelWeight < MODEL_WEIGHT_MIN_VALUE || modelWeight > MODEL_WEIGHT_MAX_VALUE)) {
@@ -95,8 +99,21 @@ private static void validateModelGroup(PriceFloorModelGroup modelGroup, Integer
         }
 
         if (maxRules != null && values.size() > maxRules) {
-            throw new PreBidException(
-                    "Price floor rules number %s exceeded its maximum number %s".formatted(values.size(), maxRules));
+            throw new PreBidException("Price floor rules number %s exceeded its maximum number %s"
+                    .formatted(values.size(), maxRules));
+        }
+
+        final List<PriceFloorField> fields = Optional.ofNullable(modelGroup.getSchema())
+                .map(PriceFloorSchema::getFields)
+                .orElse(null);
+
+        if (CollectionUtils.isEmpty(fields)) {
+            throw new PreBidException("Price floor dimensions can't be null or empty, but were " + fields);
+        }
+
+        if (maxDimensions != null && fields.size() > maxDimensions) {
+            throw new PreBidException("Price floor schema dimensions %s exceeded its maximum number %s"
+                    .formatted(fields.size(), maxDimensions));
         }
     }
 }
diff --git a/src/main/java/org/prebid/server/floors/PriceFloorsConfigResolver.java b/src/main/java/org/prebid/server/floors/PriceFloorsConfigResolver.java
@@ -23,13 +23,15 @@ public class PriceFloorsConfigResolver {
     private static final ConditionalLogger conditionalLogger = new ConditionalLogger(logger);
 
     private static final int MIN_MAX_AGE_SEC_VALUE = 600;
+    private static final int MAX_AGE_SEC_VALUE = Integer.MAX_VALUE;
     private static final int MIN_PERIODIC_SEC_VALUE = 300;
     private static final int MIN_TIMEOUT_MS_VALUE = 10;
     private static final int MAX_TIMEOUT_MS_VALUE = 10_000;
     private static final int MIN_RULES_VALUE = 0;
-    private static final int MIN_FILE_SIZE_VALUE = 0;
-    private static final int MAX_AGE_SEC_VALUE = Integer.MAX_VALUE;
     private static final int MAX_RULES_VALUE = Integer.MAX_VALUE;
+    private static final int MIN_DIMENSIONS_VALUE = 0;
+    private static final int MAX_DIMENSIONS_VALUE = 19;
+    private static final int MIN_FILE_SIZE_VALUE = 0;
     private static final int MAX_FILE_SIZE_VALUE = Integer.MAX_VALUE;
     private static final int MIN_ENFORCE_RATE_VALUE = 0;
     private static final int MAX_ENFORCE_RATE_VALUE = 100;
@@ -71,6 +73,16 @@ private static void validatePriceFloorConfig(Account account) {
             throw new PreBidException(invalidPriceFloorsPropertyMessage("enforce-floors-rate", enforceRate));
         }
 
+        final Long maxRules = floorsConfig.getMaxRules();
+        if (maxRules != null && isNotInRange(maxRules, MIN_RULES_VALUE, MAX_RULES_VALUE)) {
+            throw new PreBidException(invalidPriceFloorsPropertyMessage("max-rules", maxRules));
+        }
+
+        final Long maxDimensions = floorsConfig.getMaxSchemaDims();
+        if (maxDimensions != null && isNotInRange(maxDimensions, MIN_DIMENSIONS_VALUE, MAX_DIMENSIONS_VALUE)) {
+            throw new PreBidException(invalidPriceFloorsPropertyMessage("max-schema-dimensions", maxDimensions));
+        }
+
         final AccountPriceFloorsFetchConfig fetchConfig =
                 ObjectUtil.getIfNotNull(floorsConfig, AccountPriceFloorsConfig::getFetch);
 
@@ -108,6 +120,11 @@ private static void validatePriceFloorsFetchConfig(AccountPriceFloorsFetchConfig
             throw new PreBidException(invalidPriceFloorsPropertyMessage("max-rules", maxRules));
         }
 
+        final Long maxDimensions = fetchConfig.getMaxSchemaDims();
+        if (maxDimensions != null && isNotInRange(maxDimensions, MIN_DIMENSIONS_VALUE, MAX_DIMENSIONS_VALUE)) {
+            throw new PreBidException(invalidPriceFloorsPropertyMessage("max-schema-dimensions", maxDimensions));
+        }
+
         final Long maxFileSize = fetchConfig.getMaxFileSizeKb();
         if (maxFileSize != null && isNotInRange(maxFileSize, MIN_FILE_SIZE_VALUE, MAX_FILE_SIZE_VALUE)) {
             throw new PreBidException(invalidPriceFloorsPropertyMessage("max-file-size-kb", maxFileSize));
@@ -121,4 +138,8 @@ private static boolean isNotInRange(long number, long min, long max) {
     private static String invalidPriceFloorsPropertyMessage(String property, Object value) {
         return "Invalid price-floors property '%s', value passed: %s".formatted(property, value);
     }
+
+    public static int resolveMaxValue(Long value) {
+        return value != null && !value.equals(0L) ? Math.toIntExact(value) : Integer.MAX_VALUE;
+    }
 }
diff --git a/src/main/java/org/prebid/server/settings/model/AccountPriceFloorsConfig.java b/src/main/java/org/prebid/server/settings/model/AccountPriceFloorsConfig.java
@@ -23,4 +23,10 @@ public class AccountPriceFloorsConfig {
 
     @JsonAlias("use-dynamic-data")
     Boolean useDynamicData;
+
+    @JsonAlias("max-rules")
+    Long maxRules;
+
+    @JsonAlias("max-schema-dims")
+    Long maxSchemaDims;
 }
diff --git a/src/main/java/org/prebid/server/settings/model/AccountPriceFloorsFetchConfig.java b/src/main/java/org/prebid/server/settings/model/AccountPriceFloorsFetchConfig.java
@@ -21,6 +21,9 @@ public class AccountPriceFloorsFetchConfig {
     @JsonAlias("max-rules")
     Long maxRules;
 
+    @JsonAlias("max-schema-dims")
+    Long maxSchemaDims;
+
     @JsonAlias("max-age-sec")
     Long maxAgeSec;
 

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -174,14 +174,17 @@ settings:
             "enabled": false,
             "timeout-ms": 5000,
             "max-rules": 0,
+            "max-schema-dims": 5,
             "max-file-size-kb": 200,
             "max-age-sec": 86400,
             "period-sec": 3600
           },
           "enforce-floors-rate": 100,
           "adjust-for-bid-adjustment": true,
           "enforce-deal-floors": true,
-          "use-dynamic-data": true
+          "use-dynamic-data": true,
+          "max-rules": 100,
+          "max-schema-dims": 3
         }
       }
     }

diff --git a/src/test/groovy/org/prebid/server/functional/model/config/AccountPriceFloorsConfig.groovy b/src/test/groovy/org/prebid/server/functional/model/config/AccountPriceFloorsConfig.groovy
@@ -15,6 +15,8 @@ class AccountPriceFloorsConfig {
     Boolean adjustForBidAdjustment
     Boolean enforceDealFloors
     Boolean useDynamicData
+    Long maxRules
+    Long maxSchemaDims
 
     @JsonProperty("enforce_floors_rate")
     Integer enforceFloorsRateSnakeCase
@@ -24,4 +26,8 @@ class AccountPriceFloorsConfig {
     Boolean enforceDealFloorsSnakeCase
     @JsonProperty("use_dynamic_data")
     Boolean useDynamicDataSnakeCase
+    @JsonProperty("max_rules")
+    Long maxRulesSnakeCase
+    @JsonProperty("max_schema_dims")
+    Long maxSchemaDimsSnakeCase
 }
diff --git a/src/test/groovy/org/prebid/server/functional/model/config/PriceFloorsFetch.groovy b/src/test/groovy/org/prebid/server/functional/model/config/PriceFloorsFetch.groovy
@@ -26,4 +26,7 @@ class PriceFloorsFetch {
     Integer periodSec
     @JsonProperty("period_sec")
     Integer periodSecSnakeCase
+    Integer maxSchemaDims
+    @JsonProperty("max_schema_dims")
+    Integer maxSchemaDimsSnakeCase
 }
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ExtPrebidFloors.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ExtPrebidFloors.groovy
@@ -20,6 +20,7 @@ class ExtPrebidFloors {
     ExtPrebidPriceFloorEnforcement enforcement
     Integer skipRate
     PriceFloorData data
+    Long maxSchemaDims
 
     static ExtPrebidFloors getExtPrebidFloors() {
         new ExtPrebidFloors(floorMin: FLOOR_MIN,

diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsBaseSpec.groovy
@@ -57,13 +57,16 @@ abstract class PriceFloorsBaseSpec extends BaseSpec {
                 maxRules: 0,
                 maxFileSizeKb: 200,
                 maxAgeSec: 86400,
-                periodSec: 3600)
+                periodSec: 3600,
+                maxSchemaDims: 5)
         def floors = new AccountPriceFloorsConfig(enabled: true,
                 fetch: fetch,
                 enforceFloorsRate: 100,
                 enforceDealFloors: true,
                 adjustForBidAdjustment: true,
-                useDynamicData: true)
+                useDynamicData: true,
+                maxRules: 0,
+                maxSchemaDims: 3)
         new AccountConfig(auction: new AccountAuctionConfig(priceFloors: floors))
     }