Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding support for deal prefixes #1183

Merged
merged 8 commits into from
Feb 26, 2020
Merged

Adding support for deal prefixes #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88b1286
WIP - Initial commit on deal support changes
Jan 18, 2020
9d088ae
Minor cleanup and removing TODOs
Jan 21, 2020
bf84098
Fixing source of deal priority in bids
Jan 22, 2020
f9f4f85
Adding missed comments
Jan 23, 2020
c4a7998
Adding error messages for deal tier configuration
Feb 7, 2020
722a83b
Added checking deal priority before attempting key update
Feb 11, 2020
f0250a3
Updates from code review and refactored tests
Feb 24, 2020
6a4a2a5
Updated deal tier validation and function comment
Feb 25, 2020
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
8 changes: 5 additions & 3 deletions adapters/appnexus/appnexus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type appnexusBidExtAppnexus struct {
BrandId int `json:"brand_id"`
BrandCategory int `json:"brand_category_id"`
CreativeInfo appnexusBidExtCreative `json:"creative_info"`
DealPriority int `json:"deal_priority"`
SyntaxNode marked this conversation as resolved.
Show resolved Hide resolved
}

type appnexusBidExt struct {
Expand Down Expand Up @@ -543,9 +544,10 @@ func (a *AppNexusAdapter) MakeBids(internalRequest *openrtb.BidRequest, external
}

bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
Bid: &bid,
BidType: bidType,
BidVideo: impVideo,
Bid: &bid,
BidType: bidType,
BidVideo: impVideo,
DealPriority: bidExt.Appnexus.DealPriority,
})
} else {
errs = append(errs, err)
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexusplatformtest/exemplary/simple-auction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -118,7 +119,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexusplatformtest/video/simple-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -118,7 +119,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/amp/simple-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -129,7 +130,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/amp/simple-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -120,7 +121,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/exemplary/native-1.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"brand_category_id": 350,
"auction_id": 5607483846416358664,
"bidder_id": 2,
"bid_ad_type": 3
"bid_ad_type": 3,
"deal_priority": 5
}
}
}
Expand Down Expand Up @@ -136,7 +137,8 @@
"brand_category_id": 350,
"auction_id": 5607483846416358664,
"bidder_id": 2,
"bid_ad_type": 3
"bid_ad_type": 3,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/exemplary/simple-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -127,7 +128,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/exemplary/simple-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -118,7 +119,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/exemplary/video-invalid-category.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -116,7 +117,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 1,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
6 changes: 4 additions & 2 deletions adapters/appnexus/appnexustest/supplemental/displaymanager-test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -144,7 +145,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
12 changes: 8 additions & 4 deletions adapters/appnexus/appnexustest/supplemental/multi-bid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 4
}
}
},
Expand All @@ -112,7 +113,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
}]
Expand Down Expand Up @@ -150,7 +152,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 4
}
}
},
Expand All @@ -177,7 +180,8 @@
"auction_id": 8189378542222915032,
"bid_ad_type": 0,
"bidder_id": 2,
"ranking_price": 0.000000
"ranking_price": 0.000000,
"deal_priority": 5
}
}
},
Expand Down
8 changes: 5 additions & 3 deletions adapters/bidder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,12 @@ func NewBidderResponse() *BidderResponse {
// TypedBid.Bid.Ext will become "response.seatbid[i].bid.ext.bidder" in the final OpenRTB response.
// TypedBid.BidType will become "response.seatbid[i].bid.ext.prebid.type" in the final OpenRTB response.
// TypedBid.BidVideo will become "response.seatbid[i].bid.ext.prebid.video" in the final OpenRTB response.
// TypedBid.DealPriority will become "response.seatbid[i].bid.dealPriority" in the final OpenRTB response.
type TypedBid struct {
Bid *openrtb.Bid
BidType openrtb_ext.BidType
BidVideo *openrtb_ext.ExtBidPrebidVideo
Bid *openrtb.Bid
BidType openrtb_ext.BidType
BidVideo *openrtb_ext.ExtBidPrebidVideo
DealPriority int
}

// RequestData and ResponseData exist so that prebid-server core code can implement its "debug" functionality
Expand Down
5 changes: 3 additions & 2 deletions endpoints/openrtb2/video_auction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,9 @@ func createBidExtension(videoRequest *openrtb_ext.BidRequestVideo) ([]byte, erro
}

prebid := openrtb_ext.ExtRequestPrebid{
Cache: &cache,
Targeting: &targeting,
Cache: &cache,
Targeting: &targeting,
SupportDeals: videoRequest.SupportDeals,
}
extReq := openrtb_ext.ExtRequest{Prebid: prebid}

Expand Down
17 changes: 10 additions & 7 deletions exchange/bidder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,13 @@ type adaptedBidder interface {
// pbsOrtbBid.bidType will become "response.seatbid[i].bid.ext.prebid.type" in the final OpenRTB response.
// pbsOrtbBid.bidTargets does not need to be filled out by the Bidder. It will be set later by the exchange.
// pbsOrtbBid.bidVideo is optional but should be filled out by the Bidder if bidType is video.
// pbsOrtbBid.dealPriority will become "response.seatbid[i].bid.dealPriority" in the final OpenRTB response.
type pbsOrtbBid struct {
bid *openrtb.Bid
bidType openrtb_ext.BidType
bidTargets map[string]string
bidVideo *openrtb_ext.ExtBidPrebidVideo
bid *openrtb.Bid
bidType openrtb_ext.BidType
bidTargets map[string]string
bidVideo *openrtb_ext.ExtBidPrebidVideo
dealPriority int
}

// pbsOrtbSeatBid is a SeatBid returned by an adaptedBidder.
Expand Down Expand Up @@ -182,9 +184,10 @@ func (bidder *bidderAdapter) requestBid(ctx context.Context, request *openrtb.Bi
bidResponse.Bids[i].Bid.Price = bidResponse.Bids[i].Bid.Price * bidAdjustment * conversionRate
}
seatBid.bids = append(seatBid.bids, &pbsOrtbBid{
bid: bidResponse.Bids[i].Bid,
bidType: bidResponse.Bids[i].BidType,
bidVideo: bidResponse.Bids[i].BidVideo,
bid: bidResponse.Bids[i].Bid,
bidType: bidResponse.Bids[i].BidType,
bidVideo: bidResponse.Bids[i].BidVideo,
dealPriority: bidResponse.Bids[i].DealPriority,
})
}
} else {
Expand Down
9 changes: 7 additions & 2 deletions exchange/bidder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,15 @@ func TestSingleBidder(t *testing.T) {
Bid: &openrtb.Bid{
Price: firstInitialPrice,
},
BidType: openrtb_ext.BidTypeBanner,
BidType: openrtb_ext.BidTypeBanner,
DealPriority: 4,
},
{
Bid: &openrtb.Bid{
Price: secondInitialPrice,
},
BidType: openrtb_ext.BidTypeVideo,
BidType: openrtb_ext.BidTypeVideo,
DealPriority: 5,
},
},
}
Expand Down Expand Up @@ -88,6 +90,9 @@ func TestSingleBidder(t *testing.T) {
if typedBid.BidType != seatBid.bids[index].bidType {
t.Errorf("Bid %d did not have the right type. Expected %s, got %s", index, typedBid.BidType, seatBid.bids[index].bidType)
}
if typedBid.DealPriority != seatBid.bids[index].dealPriority {
t.Errorf("Bid %d did not have the right deal priority. Expected %s, got %s", index, typedBid.BidType, seatBid.bids[index].bidType)
}
}
if mockBidderResponse.Bids[0].Bid.Price != bidAdjustment*firstInitialPrice {
t.Errorf("Bid[0].Price was not adjusted properly. Expected %f, got %f", bidAdjustment*firstInitialPrice, mockBidderResponse.Bids[0].Bid.Price)
Expand Down
Loading