Skip to content
Merged
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
164 changes: 79 additions & 85 deletions src/main/java/org/prebid/server/auction/BidResponseCreator.java
Comment thread
AntoxaAntoxic marked this conversation as resolved.
Comment thread
AntoxaAntoxic marked this conversation as resolved.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/main/java/org/prebid/server/auction/model/BidInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class BidInfo {

Integer vastTtl;

Integer rank;

public String getBidId() {
final ObjectNode extNode = bid != null ? bid.getExt() : null;
final JsonNode bidIdNode = extNode != null ? extNode.path("prebid").path("bidid") : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ public class TargetingInfo {

boolean isWinningBid;

boolean isBidderWinningBid;

boolean isAddTargetBidderCode;
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ public class ExtBidPrebid {

@JsonProperty("passthrough")
JsonNode passThrough;

Integer rank;
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ public class AccountAuctionConfig {
PaaFormat paaFormat;

AccountCacheConfig cache;

AccountBidRankingConfig ranking;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.prebid.server.settings.model;

import lombok.Value;

@Value(staticConstructor = "of")
public class AccountBidRankingConfig {

Boolean enabled;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class AccountAuctionConfig {
AccountBidValidationConfig bidValidations
AccountEventsConfig events
AccountCacheConfig cache
AccountRankingConfig ranking
AccountPriceFloorsConfig priceFloors
Targeting targeting
PaaFormat paaformat
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.prebid.server.functional.model.config

import groovy.transform.ToString

@ToString(includeNames = true, ignoreNulls = true)
class AccountRankingConfig {

Boolean enabled
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Bid implements ObjectMapperWrapper {
}
}

static List<Bid> getDefaultMultyTypesBids(Imp imp, @DelegatesTo(Bid) Closure commonInit = null) {
static List<Bid> getDefaultMultiTypesBids(Imp imp, @DelegatesTo(Bid) Closure commonInit = null) {
List<Bid> bids = []
if (imp.banner) bids << createBid(imp, BidMediaType.BANNER) { adm = null }
if (imp.video) bids << createBid(imp, BidMediaType.VIDEO)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ class Prebid {
Meta meta
Map passThrough
Video storedRequestAttributes
Integer rank
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ class PriceFloorsAdjustmentSpec extends PriceFloorsBaseSpec {
def originalPrice = PBSUtils.getRandomDecimal()
def bidResponse = BidResponse.getDefaultBidResponse(bidRequest).tap {
cur = currency
seatbid.first.bid = Bid.getDefaultMultyTypesBids(bidRequest.imp.first) {
seatbid.first.bid = Bid.getDefaultMultiTypesBids(bidRequest.imp.first) {
price = originalPrice
ext = new BidExt()
}
Expand Down
Loading
Loading