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

adform bidder video bid response support #1573

Merged
merged 4 commits into from
Nov 17, 2020
Merged

adform bidder video bid response support #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5689c1
adform bidder video bid response
braizhas Nov 10, 2020
640a48c
adform bidder json tests
braizhas Nov 12, 2020
01a2364
video bid responses on legacy auction endpoint
braizhas Nov 12, 2020
ec250e3
fixed currency values
braizhas Nov 17, 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
25 changes: 19 additions & 6 deletions adapters/adform/adform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ type adformBid struct {
Height uint64 `json:"height,omitempty"`
DealId string `json:"deal_id,omitempty"`
CreativeId string `json:"win_crid,omitempty"`
VastContent string `json:"vast_content,omitempty"`
}

const priceTypeGross = "gross"
Expand Down Expand Up @@ -241,20 +242,21 @@ func toPBSBidSlice(adformBids []*adformBid, r *adformRequest) pbs.PBSBidSlice {
bids := make(pbs.PBSBidSlice, 0)

for i, bid := range adformBids {
if bid.Banner == "" || bid.ResponseType != "banner" {
adm, bidType := getAdAndType(bid)
if adm == "" {
continue
}
pbsBid := pbs.PBSBid{
BidID: r.adUnits[i].bidId,
AdUnitCode: r.adUnits[i].adUnitCode,
BidderCode: r.bidderCode,
Price: bid.Price,
Adm: bid.Banner,
Adm: adm,
Width: bid.Width,
Height: bid.Height,
DealId: bid.DealId,
Creative_id: bid.CreativeId,
CreativeMediaType: string(openrtb_ext.BidTypeBanner),
CreativeMediaType: string(bidType),
}

bids = append(bids, &pbsBid)
Expand Down Expand Up @@ -632,25 +634,36 @@ func toOpenRtbBidResponse(adformBids []*adformBid, r *openrtb.BidRequest) *adapt
}

for i, bid := range adformBids {
if bid.Banner == "" || bid.ResponseType != "banner" {
adm, bidType := getAdAndType(bid)
if adm == "" {
continue
}

openRtbBid := openrtb.Bid{
ID: r.Imp[i].ID,
ImpID: r.Imp[i].ID,
Price: bid.Price,
AdM: bid.Banner,
AdM: adm,
W: bid.Width,
H: bid.Height,
DealID: bid.DealId,
CrID: bid.CreativeId,
}

bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{Bid: &openRtbBid, BidType: openrtb_ext.BidTypeBanner})
bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{Bid: &openRtbBid, BidType: bidType})
currency = bid.Currency
}

bidResponse.Currency = currency

return bidResponse
}

func getAdAndType(bid *adformBid) (string, openrtb_ext.BidType) {
if bid.ResponseType == "banner" {
return bid.Banner, openrtb_ext.BidTypeBanner
} else if bid.ResponseType == "vast_content" {
return bid.VastContent, openrtb_ext.BidTypeVideo
}
return "", ""
}
67 changes: 55 additions & 12 deletions adapters/adform/adform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ func createAdformServerResponse(testData aBidInfo) ([]byte, error) {
DealId: testData.tags[2].dealId,
CreativeId: testData.tags[2].creativeId,
},
{
ResponseType: "vast_content",
VastContent: testData.tags[3].content,
Price: testData.tags[3].price,
Currency: "EUR",
Width: testData.width,
Height: testData.height,
DealId: testData.tags[3].dealId,
CreativeId: testData.tags[3].creativeId,
},
}
adformServerResponse, err := json.Marshal(bids)
return adformServerResponse, err
Expand All @@ -123,10 +133,21 @@ func TestAdformBasicResponse(t *testing.T) {
if err != nil {
t.Fatalf("Should not have gotten adapter error: %v", err)
}
if len(bids) != 2 {
t.Fatalf("Received %d bids instead of 2", len(bids))
if len(bids) != 3 {
t.Fatalf("Received %d bids instead of 3", len(bids))
}
expectedTypes := []openrtb_ext.BidType{
openrtb_ext.BidTypeBanner,
openrtb_ext.BidTypeBanner,
openrtb_ext.BidTypeVideo,
}
for _, bid := range bids {

for i, bid := range bids {

if bid.CreativeMediaType != string(expectedTypes[i]) {
t.Errorf("Expected a %s bid. Got: %s", expectedTypes[i], bid.CreativeMediaType)
}

matched := false
for _, tag := range adformTestData.tags {
if bid.AdUnitCode == tag.code {
Expand Down Expand Up @@ -224,7 +245,7 @@ func preparePrebidRequest(serverUrl string, t *testing.T) *pbs.PBSRequest {

func preparePrebidRequestBody(requestData aBidInfo, t *testing.T) *bytes.Buffer {
prebidRequest := pbs.PBSRequest{
AdUnits: make([]pbs.AdUnit, 3),
AdUnits: make([]pbs.AdUnit, 4),
Device: &openrtb.Device{
UA: requestData.deviceUA,
IP: requestData.deviceIP,
Expand Down Expand Up @@ -326,6 +347,7 @@ func createTestData(secure bool) aBidInfo {
{mid: 32344, keyValues: "color:red,age:30-40", keyWords: "red,blue", cdims: "300x300,400x200", priceType: "gross", code: "code1", price: 1.23, content: "banner-content1", dealId: "dealId1", creativeId: "creativeId1"},
{mid: 32345, priceType: "net", code: "code2", minp: 23.1, cdims: "300x200"}, // no bid for ad unit
{mid: 32346, code: "code3", price: 1.24, content: "banner-content2", dealId: "dealId2", url: "https://adform.com?a=b"},
{mid: 32347, code: "code4", content: "vast-xml"},
},
secure: secure,
currency: "EUR",
Expand Down Expand Up @@ -379,6 +401,11 @@ func createOpenRtbRequest(testData *aBidInfo) *openrtb.BidRequest {
func TestOpenRTBStandardResponse(t *testing.T) {
testData := createTestData(true)
request := createOpenRtbRequest(&testData)
expectedTypes := []openrtb_ext.BidType{
openrtb_ext.BidTypeBanner,
openrtb_ext.BidTypeBanner,
openrtb_ext.BidTypeVideo,
}

responseBody, err := createAdformServerResponse(testData)
if err != nil {
Expand All @@ -390,16 +417,17 @@ func TestOpenRTBStandardResponse(t *testing.T) {
bidder := new(AdformAdapter)
bidResponse, errs := bidder.MakeBids(request, nil, httpResponse)

if len(bidResponse.Bids) != 2 {
t.Fatalf("Expected 2 bids. Got %d", len(bidResponse.Bids))
if len(bidResponse.Bids) != 3 {
t.Fatalf("Expected 3 bids. Got %d", len(bidResponse.Bids))
}
if len(errs) != 0 {
t.Errorf("Expected 0 errors. Got %d", len(errs))
}

for _, typeBid := range bidResponse.Bids {
if typeBid.BidType != openrtb_ext.BidTypeBanner {
t.Errorf("Expected a banner bid. Got: %s", bidResponse.Bids[0].BidType)
for i, typeBid := range bidResponse.Bids {

if typeBid.BidType != expectedTypes[i] {
t.Errorf("Expected a %s bid. Got: %s", expectedTypes[i], typeBid.BidType)
}
bid := typeBid.Bid
matched := false
Expand Down Expand Up @@ -561,10 +589,10 @@ func assertAdformServerRequest(testData aBidInfo, r *http.Request, isOpenRtb boo
var midsWithCurrency = ""
var queryString = ""
if isOpenRtb {
midsWithCurrency = "bWlkPTMyMzQ0JnJjdXI9RVVSJm1rdj1jb2xvcjpyZWQsYWdlOjMwLTQwJm1rdz1yZWQsYmx1ZSZjZGltcz0zMDB4MzAwLDQwMHgyMDA&bWlkPTMyMzQ1JnJjdXI9RVVSJmNkaW1zPTMwMHgyMDAmbWlucD0yMy4xMA&bWlkPTMyMzQ2JnJjdXI9RVVS"
midsWithCurrency = "bWlkPTMyMzQ0JnJjdXI9RVVSJm1rdj1jb2xvcjpyZWQsYWdlOjMwLTQwJm1rdz1yZWQsYmx1ZSZjZGltcz0zMDB4MzAwLDQwMHgyMDA&bWlkPTMyMzQ1JnJjdXI9RVVSJmNkaW1zPTMwMHgyMDAmbWlucD0yMy4xMA&bWlkPTMyMzQ2JnJjdXI9RVVS&bWlkPTMyMzQ3JnJjdXI9RVVS"
queryString = "CC=1&adid=6D92078A-8246-4BA4-AE5B-76104861E7DC&eids=eyJ0ZXN0LmNvbSI6eyJvdGhlcl91c2VyX2lkIjpbMF0sInNvbWVfdXNlcl9pZCI6WzFdfSwidGVzdDIub3JnIjp7Im90aGVyX3VzZXJfaWQiOlsyXX19&fd=1&gdpr=1&gdpr_consent=abc&ip=111.111.111.111&pt=gross&rp=4&stid=transaction-id&url=https%3A%2F%2Fadform.com%3Fa%3Db&" + midsWithCurrency
} else {
midsWithCurrency = "bWlkPTMyMzQ0JnJjdXI9VVNEJm1rdj1jb2xvcjpyZWQsYWdlOjMwLTQwJm1rdz1yZWQsYmx1ZSZjZGltcz0zMDB4MzAwLDQwMHgyMDA&bWlkPTMyMzQ1JnJjdXI9VVNEJmNkaW1zPTMwMHgyMDAmbWlucD0yMy4xMA&bWlkPTMyMzQ2JnJjdXI9VVNE" // no way to pass currency in legacy adapter
midsWithCurrency = "bWlkPTMyMzQ0JnJjdXI9VVNEJm1rdj1jb2xvcjpyZWQsYWdlOjMwLTQwJm1rdz1yZWQsYmx1ZSZjZGltcz0zMDB4MzAwLDQwMHgyMDA&bWlkPTMyMzQ1JnJjdXI9VVNEJmNkaW1zPTMwMHgyMDAmbWlucD0yMy4xMA&bWlkPTMyMzQ2JnJjdXI9VVNE&bWlkPTMyMzQ3JnJjdXI9VVNE" // no way to pass currency in legacy adapter
queryString = "CC=1&adid=6D92078A-8246-4BA4-AE5B-76104861E7DC&fd=1&gdpr=1&gdpr_consent=abc&ip=111.111.111.111&pt=gross&rp=4&stid=transaction-id&" + midsWithCurrency
}

Expand Down Expand Up @@ -646,7 +674,7 @@ func TestPriceTypeUrlParameterCreation(t *testing.T) {
// Asserts that toOpenRtbBidResponse() creates a *adapters.BidderResponse with
// the currency of the last valid []*adformBid element and the expected number of bids
func TestToOpenRtbBidResponse(t *testing.T) {
expectedBids := 3
expectedBids := 4
lastCurrency, anotherCurrency, emptyCurrency := "EUR", "USD", ""

request := &openrtb.BidRequest{
Expand All @@ -672,6 +700,11 @@ func TestToOpenRtbBidResponse(t *testing.T) {
Ext: json.RawMessage(`{"bidder1": { "mid": "32344" }}`),
Banner: &openrtb.Banner{},
},
{
ID: "video-imp-no4",
Ext: json.RawMessage(`{"bidder1": { "mid": "32345" }}`),
Banner: &openrtb.Banner{},
},
},
Device: &openrtb.Device{UA: "ua", IP: "ip"},
User: &openrtb.User{BuyerUID: "buyerUID"},
Expand Down Expand Up @@ -703,6 +736,16 @@ func TestToOpenRtbBidResponse(t *testing.T) {
ResponseType: "banner",
Banner: "banner-content4",
Price: 1.25,
Currency: emptyCurrency,
Width: 300,
Height: 200,
DealId: "dealId4",
CreativeId: "creativeId4",
},
{
ResponseType: "vast_content",
VastContent: "vast-content",
Price: 1.25,
Currency: lastCurrency,
Width: 300,
Height: 200,
Expand Down
99 changes: 99 additions & 0 deletions adapters/adform/adformtest/exemplary/multiformat-impression.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "banner-imp-id",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
]
},
"ext": {
"bidder": {
"mid": 12345
}
}
},
{
"id": "video-imp-id",
"video": {
"w": 640,
"h": 480
},
"ext": {
"bidder": {
"mid": 54321
}
}
}
]
},
"httpCalls": [
{
"expectedRequest": {
"uri": "http://adx.adform.net/adx?CC=1&fd=1&gdpr=&gdpr_consent=&ip=&rp=4&stid=&bWlkPTEyMzQ1JnJjdXI9VVNE&bWlkPTU0MzIxJnJjdXI9VVNE"
},
"mockResponse": {
"status": 200,
"body": [
{
"response": "banner",
"banner": "<adm>",
"win_bid": 0.5,
"win_cur": "USD",
"width": 300,
"height": 250,
"deal_id": null,
"win_crid": "20078830"
},
{
"response": "vast_content",
"vast_content": "<vast>",
"win_bid": 0.7,
"win_cur": "USD",
"width": 640,
"height": 480,
"deal_id": "DID-123-22",
"win_crid": "20078831"
}
]
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "banner-imp-id",
"impid": "banner-imp-id",
"price": 0.5,
"adm": "<adm>",
"crid": "20078830",
"w": 300,
"h": 250
},
"type": "banner"
},
{
"bid": {
"id": "video-imp-id",
"impid": "video-imp-id",
"price": 0.7,
"adm": "<vast>",
"crid": "20078831",
"dealid": "DID-123-22",
"w": 640,
"h": 480
},
"type": "video"
}
]
}
]
}
64 changes: 64 additions & 0 deletions adapters/adform/adformtest/exemplary/single-banner-impression.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
]
},
"ext": {
"bidder": {
"mid": 12345
}
}
}
]
},
"httpCalls": [
{
"expectedRequest": {
"uri": "http://adx.adform.net/adx?CC=1&fd=1&gdpr=&gdpr_consent=&ip=&rp=4&stid=&bWlkPTEyMzQ1JnJjdXI9VVNE"
},
"mockResponse": {
"status": 200,
"body": [
{
"response": "banner",
"banner": "<adm>",
"win_bid": 0.5,
"win_cur": "USD",
"width": 300,
"height": 250,
"deal_id": null,
"win_crid": "20078830"
}
]
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "test-imp-id",
"impid": "test-imp-id",
"price": 0.5,
"adm": "<adm>",
"crid": "20078830",
"w": 300,
"h": 250
},
"type": "banner"
}
]
}
]
}
Loading