Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import groovy.transform.ToString
import org.prebid.server.functional.model.bidder.BidderName
import org.prebid.server.functional.model.request.auction.BidAdjustment
import org.prebid.server.functional.model.request.auction.BidRounding
import org.prebid.server.functional.model.request.auction.PaaFormat
import org.prebid.server.functional.model.request.auction.Targeting
import org.prebid.server.functional.model.response.auction.MediaType

Expand All @@ -28,7 +27,6 @@ class AccountAuctionConfig {
AccountPriceFloorsConfig priceFloors
AccountProfilesConfigs profiles
Targeting targeting
PaaFormat paaformat
@JsonProperty("preferredmediatype")
Map<BidderName, MediaType> preferredMediaType
@JsonProperty("privacysandbox")
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,9 @@ class ImpExt {
String tid
String gpid
String sid
@JsonProperty("ae")
AuctionEnvironment auctionEnvironment
String all
String skadn
String general
@JsonProperty("igs")
InterestGroupAuctionSupport interestGroupAuctionSupports
AnyUnsupportedBidder anyUnsupportedBidder

static ImpExt getDefaultImpExt() {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ class Prebid {
PrebidModulesConfig modules
PrebidAnalytics analytics
StoredAuctionResponse storedAuctionResponse
PaaFormat paaFormat
@JsonProperty("alternatebiddercodes")
AlternateBidderCodes alternateBidderCodes
@JsonProperty("profiles")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.prebid.server.functional.model.response.auction

import com.fasterxml.jackson.annotation.JsonProperty
import groovy.transform.ToString
import org.prebid.server.functional.model.response.BidderError
import org.prebid.server.functional.model.response.Debug
Expand All @@ -16,6 +15,4 @@ class BidResponseExt {
Map<String, ResponseSyncData> usersync
BidResponsePrebid prebid
Map<ErrorType, List<WarningEntry>> warnings
@JsonProperty("igi")
List<InterestGroupAuctionIntent> interestGroupAuctionIntent
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import org.prebid.server.functional.model.db.StoredRequest
import org.prebid.server.functional.model.request.amp.AmpRequest
import org.prebid.server.functional.model.request.auction.Adrino
import org.prebid.server.functional.model.request.auction.Amx
import org.prebid.server.functional.model.request.auction.AuctionEnvironment
import org.prebid.server.functional.model.request.auction.Banner
import org.prebid.server.functional.model.request.auction.BidRequest
import org.prebid.server.functional.model.request.auction.Device
Expand All @@ -19,7 +18,6 @@ import org.prebid.server.functional.model.request.auction.Imp
import org.prebid.server.functional.model.request.auction.ImpExt
import org.prebid.server.functional.model.request.auction.ImpExtContext
import org.prebid.server.functional.model.request.auction.ImpExtContextData
import org.prebid.server.functional.model.request.auction.InterestGroupAuctionSupport
import org.prebid.server.functional.model.request.auction.Native
import org.prebid.server.functional.model.request.auction.PrebidOptions
import org.prebid.server.functional.model.request.auction.PrebidStoredRequest
Expand Down Expand Up @@ -47,10 +45,6 @@ import static org.prebid.server.functional.model.bidder.BidderName.OPENX
import static org.prebid.server.functional.model.bidder.CompressionType.GZIP
import static org.prebid.server.functional.model.bidder.CompressionType.NONE
import static org.prebid.server.functional.model.request.auction.Asset.titleAsset
import static org.prebid.server.functional.model.request.auction.AuctionEnvironment.DEVICE_ORCHESTRATED
import static org.prebid.server.functional.model.request.auction.AuctionEnvironment.NOT_SUPPORTED
import static org.prebid.server.functional.model.request.auction.AuctionEnvironment.SERVER_ORCHESTRATED
import static org.prebid.server.functional.model.request.auction.AuctionEnvironment.UNKNOWN
import static org.prebid.server.functional.model.request.auction.DistributionChannel.APP
import static org.prebid.server.functional.model.request.auction.DistributionChannel.DOOH
import static org.prebid.server.functional.model.request.auction.DistributionChannel.SITE
Expand Down Expand Up @@ -882,7 +876,6 @@ class BidderParamsSpec extends BaseSpec {
prebid.bidder.generic = null
prebid.adUnitCode = PBSUtils.randomString
generic = new Generic()
auctionEnvironment = PBSUtils.getRandomEnum(AuctionEnvironment, [AuctionEnvironment.SERVER_ORCHESTRATED, AuctionEnvironment.UNKNOWN])
all = PBSUtils.randomNumber
context = new ImpExtContext(data: new ImpExtContextData())
data = new ImpExtContextData(pbAdSlot: PBSUtils.randomString)
Expand All @@ -908,7 +901,6 @@ class BidderParamsSpec extends BaseSpec {
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
verifyAll(bidderRequest.imp[0].ext) {
it.bidder == impExt.generic
it.auctionEnvironment == impExt.auctionEnvironment
it.all == impExt.all
it.context == impExt.context
it.data == impExt.data
Expand Down Expand Up @@ -1250,68 +1242,6 @@ class BidderParamsSpec extends BaseSpec {
pbsServiceFactory.removeContainer(pbsConfig)
}

def "PBS should add auction environment to imp.ext.igs when it is present in imp.ext and imp.ext.igs is empty"() {
given: "Default bid request with populated imp.ext"
def bidRequest = BidRequest.defaultBidRequest.tap {
imp[0].ext.tap {
auctionEnvironment = requestedAuctionEnvironment
interestGroupAuctionSupports = new InterestGroupAuctionSupport(auctionEnvironment: null)
}
}

when: "PBS processes auction request"
defaultPbsService.sendAuctionRequest(bidRequest)

then: "Bidder request should imp[].{ae/ext.igs.ae} same value as requested"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
assert bidderRequest.imp[0].ext.auctionEnvironment == requestedAuctionEnvironment
assert bidderRequest.imp[0].ext.interestGroupAuctionSupports.auctionEnvironment == requestedAuctionEnvironment

where:
requestedAuctionEnvironment << [NOT_SUPPORTED, DEVICE_ORCHESTRATED]
}

def "PBS shouldn't add unsupported auction environment to imp.ext.igs when it is present in imp.ext and imp.ext.igs is empty"() {
given: "Default bid request with populated imp.ext"
def bidRequest = BidRequest.defaultBidRequest.tap {
imp[0].ext.tap {
auctionEnvironment = requestedAuctionEnvironment
interestGroupAuctionSupports = new InterestGroupAuctionSupport(auctionEnvironment: null)
}
}

when: "PBS processes auction request"
defaultPbsService.sendAuctionRequest(bidRequest)

then: "Bidder request should imp[].ae same value as requested"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
assert bidderRequest.imp[0].ext.auctionEnvironment == requestedAuctionEnvironment
assert !bidderRequest.imp[0].ext.interestGroupAuctionSupports.auctionEnvironment

where:
requestedAuctionEnvironment << [SERVER_ORCHESTRATED, UNKNOWN]
}

def "PBS shouldn't change auction environment in imp.ext.igs when it is present in both imp.ext and imp.ext.igs"() {
given: "Default bid request with populated imp.ext"
def extAuctionEnv = PBSUtils.getRandomEnum(AuctionEnvironment, [SERVER_ORCHESTRATED, UNKNOWN])
def extIgsAuctionEnv = PBSUtils.getRandomEnum(AuctionEnvironment, [SERVER_ORCHESTRATED, UNKNOWN])
def bidRequest = BidRequest.defaultBidRequest.tap {
imp[0].ext.tap {
auctionEnvironment = extAuctionEnv
interestGroupAuctionSupports = new InterestGroupAuctionSupport(auctionEnvironment: extIgsAuctionEnv)
}
}

when: "PBS processes auction request"
defaultPbsService.sendAuctionRequest(bidRequest)

then: "Bidder request should imp[].{ae/ext.igs.ae} same value as requested"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
assert bidderRequest.imp[0].ext.auctionEnvironment == extAuctionEnv
assert bidderRequest.imp[0].ext.interestGroupAuctionSupports.auctionEnvironment == extIgsAuctionEnv
}

def "PBS should reject alias bidders when bidder params from request doesn't satisfy own json-schema"() {
given: "Default bid request"
def bidRequest = BidRequest.defaultBidRequest.tap {
Expand Down
Loading
Loading