From d2a3d47a67ed17cfec45ef8e3f3f3893c7a9cfd6 Mon Sep 17 00:00:00 2001 From: markiian Date: Mon, 5 May 2025 16:31:50 +0300 Subject: [PATCH 1/2] Rename modelGroups field --- ...delGroup.groovy => FloorModelGroup.groovy} | 6 ++--- .../model/pricefloors/PriceFloorData.groovy | 4 ++-- .../PriceFloorsFetchingSpec.groovy | 22 +++++++++---------- .../pricefloors/PriceFloorsRulesSpec.groovy | 4 ++-- .../PriceFloorsSignalingSpec.groovy | 10 ++++----- 5 files changed, 23 insertions(+), 23 deletions(-) rename src/test/groovy/org/prebid/server/functional/model/pricefloors/{ModelGroup.groovy => FloorModelGroup.groovy} (91%) diff --git a/src/test/groovy/org/prebid/server/functional/model/pricefloors/ModelGroup.groovy b/src/test/groovy/org/prebid/server/functional/model/pricefloors/FloorModelGroup.groovy similarity index 91% rename from src/test/groovy/org/prebid/server/functional/model/pricefloors/ModelGroup.groovy rename to src/test/groovy/org/prebid/server/functional/model/pricefloors/FloorModelGroup.groovy index 24b57f57bba..14ffa92bcb0 100644 --- a/src/test/groovy/org/prebid/server/functional/model/pricefloors/ModelGroup.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/pricefloors/FloorModelGroup.groovy @@ -9,7 +9,7 @@ import org.prebid.server.functional.util.PBSUtils @EqualsAndHashCode @ToString(includeNames = true, ignoreNulls = true) -class ModelGroup { +class FloorModelGroup { Currency currency Integer skipRate @@ -21,8 +21,8 @@ class ModelGroup { BigDecimal defaultFloor List noFloorSignalBidders - static ModelGroup getModelGroup() { - new ModelGroup( + static FloorModelGroup getModelGroup() { + new FloorModelGroup( currency: Currency.USD, schema: PriceFloorSchema.priceFloorSchema, values: [(new Rule(mediaType: MediaType.MULTIPLE, country: Country.MULTIPLE) diff --git a/src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy b/src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy index a9d913eccd1..1c87c85b794 100644 --- a/src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy +++ b/src/test/groovy/org/prebid/server/functional/model/pricefloors/PriceFloorData.groovy @@ -19,13 +19,13 @@ class PriceFloorData implements ResponseModel { Integer useFetchDataRate String floorsSchemaVersion Integer modelTimestamp - List modelGroups + List modelGroups List noFloorSignalBidders static PriceFloorData getPriceFloorData() { new PriceFloorData(floorProvider: PBSUtils.randomString, currency: USD, floorsSchemaVersion: 2, - modelGroups: [ModelGroup.modelGroup]) + modelGroups: [FloorModelGroup.modelGroup]) } } diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy index 699b9bdcda0..4d377615bd2 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsFetchingSpec.groovy @@ -2,7 +2,7 @@ package org.prebid.server.functional.tests.pricefloors import org.prebid.server.functional.model.config.PriceFloorsFetch import org.prebid.server.functional.model.db.StoredRequest -import org.prebid.server.functional.model.pricefloors.ModelGroup +import org.prebid.server.functional.model.pricefloors.FloorModelGroup import org.prebid.server.functional.model.pricefloors.PriceFloorData import org.prebid.server.functional.model.pricefloors.Rule import org.prebid.server.functional.model.request.amp.AmpRequest @@ -1380,7 +1380,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def bidRequest = bidRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2] @@ -1416,7 +1416,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def ampStoredRequest = storedRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups.first().modelWeight = invalidModelWeight ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2] @@ -1451,7 +1451,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def bidRequest = bidRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups[0].skipRate = 0 ext.prebid.floors.data.skipRate = 0 @@ -1490,7 +1490,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def bidRequest = bidRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups[0].skipRate = 0 ext.prebid.floors.data.skipRate = invalidSkipRate @@ -1529,7 +1529,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def bidRequest = bidRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups[0].skipRate = invalidSkipRate ext.prebid.floors.data.skipRate = 0 @@ -1568,7 +1568,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def invalidDefaultFloorValue = DEFAULT_FLOOR_VALUE_MIN - 1 def bidRequest = bidRequestWithFloors.tap { imp[0].bidFloor = floorValue - ext.prebid.floors.data.modelGroups << ModelGroup.modelGroup + ext.prebid.floors.data.modelGroups << FloorModelGroup.modelGroup ext.prebid.floors.data.modelGroups.first().values = [(rule): floorValue + 0.1] ext.prebid.floors.data.modelGroups[0].defaultFloor = invalidDefaultFloorValue ext.prebid.floors.data.modelGroups.last().values = [(rule): floorValue + 0.2] @@ -1662,7 +1662,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { and: "Set Floors Provider response" def floorValue = PBSUtils.randomFloorValue def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups.first().values = [(rule): floorValue + 0.1] modelGroups.first().modelWeight = invalidModelWeight modelGroups.last().values = [(rule): floorValue] @@ -1718,7 +1718,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { and: "Set Floors Provider response" def floorValue = PBSUtils.randomFloorValue def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups.first().values = [(rule): floorValue + 0.1] modelGroups[0].skipRate = 0 skipRate = invalidSkipRate @@ -1776,7 +1776,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { and: "Set Floors Provider response" def floorValue = PBSUtils.randomFloorValue def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups.first().values = [(rule): floorValue + 0.1] modelGroups[0].skipRate = invalidSkipRate skipRate = 0 @@ -1834,7 +1834,7 @@ class PriceFloorsFetchingSpec extends PriceFloorsBaseSpec { def floorValue = PBSUtils.randomFloorValue def invalidDefaultFloor = DEFAULT_FLOOR_VALUE_MIN - 1 def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups.first().values = [(rule): floorValue + 0.1] modelGroups[0].defaultFloor = invalidDefaultFloor modelGroups.last().values = [(rule): floorValue] diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy index 30acd9b4bdc..96247fe0157 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsRulesSpec.groovy @@ -9,7 +9,7 @@ import org.prebid.server.functional.model.config.BidderConfig import org.prebid.server.functional.model.db.StoredImp import org.prebid.server.functional.model.pricefloors.Country import org.prebid.server.functional.model.pricefloors.MediaType -import org.prebid.server.functional.model.pricefloors.ModelGroup +import org.prebid.server.functional.model.pricefloors.FloorModelGroup import org.prebid.server.functional.model.pricefloors.PriceFloorData import org.prebid.server.functional.model.pricefloors.PriceFloorSchema import org.prebid.server.functional.model.pricefloors.Rule @@ -192,7 +192,7 @@ class PriceFloorsRulesSpec extends PriceFloorsBaseSpec { and: "Set Floors Provider response" def floorValue = PBSUtils.randomFloorValue def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups[0].schema = new PriceFloorSchema(fields: [BOGUS]) modelGroups[0].values = [(new Rule(domain: domain).rule): floorValue + 0.1] modelGroups[1].schema = new PriceFloorSchema(fields: [DOMAIN]) diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy index 1de08b44cc9..7fb78788859 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy @@ -6,7 +6,7 @@ import org.prebid.server.functional.model.config.AccountPriceFloorsConfig import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.pricefloors.Country -import org.prebid.server.functional.model.pricefloors.ModelGroup +import org.prebid.server.functional.model.pricefloors.FloorModelGroup import org.prebid.server.functional.model.pricefloors.PriceFloorData import org.prebid.server.functional.model.pricefloors.PriceFloorSchema import org.prebid.server.functional.model.pricefloors.Rule @@ -495,7 +495,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec { and: "Set Floors Provider response" def floorValue = PBSUtils.randomFloorValue def floorsResponse = PriceFloorData.priceFloorData.tap { - modelGroups << ModelGroup.modelGroup + modelGroups << FloorModelGroup.modelGroup modelGroups.first().values = [(rule): floorValue + 0.1] modelGroups.last().schema = new PriceFloorSchema(fields: [SITE_DOMAIN]) modelGroups.last().values = [(new Rule(siteDomain: domain).rule): floorValue] @@ -1033,7 +1033,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec { given: "BidRequest with invalid modelWeight" def bidRequest = bidRequestWithFloors.tap { ext.prebid.floors.data.modelGroups = [ - new ModelGroup(modelWeight: requestModelWeight) + new FloorModelGroup(modelWeight: requestModelWeight) ] } @@ -1066,7 +1066,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec { def requestModelGroupsSkipRate = PBSUtils.getRandomNumber(100) def bidRequest = bidRequestWithFloors.tap { ext.prebid.floors.data.modelGroups = [ - new ModelGroup(skipRate: requestModelGroupsSkipRate) + new FloorModelGroup(skipRate: requestModelGroupsSkipRate) ] } @@ -1097,7 +1097,7 @@ class PriceFloorsSignalingSpec extends PriceFloorsBaseSpec { def bidRequest = bidRequestWithFloors.tap { ext.prebid.floors.data.modelGroups = [ - new ModelGroup(defaultFloor: requestModelGroupsSkipRate) + new FloorModelGroup(defaultFloor: requestModelGroupsSkipRate) ] } From 879dada3c577a69d86427626f02ca6bd07217ba3 Mon Sep 17 00:00:00 2001 From: markiian Date: Mon, 5 May 2025 17:04:20 +0300 Subject: [PATCH 2/2] Resolve conflict --- .../tests/pricefloors/PriceFloorsSignalingSpec.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy index 11be773774c..c71dee0a34b 100644 --- a/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy +++ b/src/test/groovy/org/prebid/server/functional/tests/pricefloors/PriceFloorsSignalingSpec.groovy @@ -1,5 +1,9 @@ package org.prebid.server.functional.tests.pricefloors +import org.prebid.server.functional.model.config.AccountAuctionConfig +import org.prebid.server.functional.model.config.AccountConfig +import org.prebid.server.functional.model.config.AccountPriceFloorsConfig +import org.prebid.server.functional.model.db.Account import org.prebid.server.functional.model.db.StoredRequest import org.prebid.server.functional.model.pricefloors.Country import org.prebid.server.functional.model.pricefloors.FloorModelGroup