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

Adot: Add OpenRTB macros resolution #2118

Merged
merged 3 commits into from
Jan 10, 2022
Merged

Adot: Add OpenRTB macros resolution #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1051c
[SUPPORT-4097] feature: add macros resolution
ramyferjaniadot Dec 22, 2021
6131b01
[SUPPORT-4097] chore: Remove useless comments
ramyferjaniadot Jan 6, 2022
80af27a
Merge pull request #5 from adotmob/support-4097-chore-remove_useless_…
ramyferjaniadot Jan 6, 2022
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
13 changes: 13 additions & 0 deletions adapters/adot/adot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"encoding/json"
"fmt"
"net/http"
"strconv"
"strings"

"github.com/mxmCherry/openrtb/v15/openrtb2"
"github.com/prebid/prebid-server/adapters"
Expand Down Expand Up @@ -85,6 +87,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
for _, sb := range bidResp.SeatBid {
for i := range sb.Bid {
if bidType, err := getMediaTypeForBid(&sb.Bid[i]); err == nil {
resolveMacros(&sb.Bid[i])
bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
Bid: &sb.Bid[i],
BidType: bidType,
Expand Down Expand Up @@ -116,3 +119,13 @@ func getMediaTypeForBid(bid *openrtb2.Bid) (openrtb_ext.BidType, error) {

return "", fmt.Errorf("unrecognized bid type in response from adot")
}

// resolveMacros resolves OpenRTB macros in nurl and adm
func resolveMacros(bid *openrtb2.Bid) {
if bid == nil {
return
}
price := strconv.FormatFloat(bid.Price, 'f', -1, 64)
bid.NURL = strings.Replace(bid.NURL, "${AUCTION_PRICE}", price, -1)
bid.AdM = strings.Replace(bid.AdM, "${AUCTION_PRICE}", price, -1)
}
10 changes: 7 additions & 3 deletions adapters/adot/adot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ func TestJsonSamples(t *testing.T) {
adapterstest.RunJSONBidderTest(t, "adottest", bidder)
}

//Test the media type error
func TestMediaTypeError(t *testing.T) {
_, err := getMediaTypeForBid(nil)

Expand All @@ -37,7 +36,6 @@ func TestMediaTypeError(t *testing.T) {
assert.Error(t, err)
}

//Test the bid response when the bidder return a status code 204
func TestBidResponseNoContent(t *testing.T) {
bidder, buildErr := Builder(openrtb_ext.BidderAdot, config.Adapter{
Endpoint: "https://dsp.adotmob.com/headerbidding/bidrequest"})
Expand All @@ -54,7 +52,6 @@ func TestBidResponseNoContent(t *testing.T) {
}
}

//Test the media type for a bid response
func TestMediaTypeForBid(t *testing.T) {
byteBanner, _ := json.Marshal(&adotBidExt{Adot: bidExt{"banner"}})
byteVideo, _ := json.Marshal(&adotBidExt{Adot: bidExt{"video"}})
Expand All @@ -75,3 +72,10 @@ func TestMediaTypeForBid(t *testing.T) {
t.Errorf("the type is not the valid one. actual: %v, expected: %v", bidTypeNative, openrtb_ext.BidTypeVideo)
}
}

func TestResolveMacros(t *testing.T) {
bid := &openrtb2.Bid{AdM: "adm:imp_${AUCTION_PRICE} amd:creativeview_${AUCTION_PRICE}", NURL: "nurl_${AUCTION_PRICE}", Price: 123.45}
resolveMacros(bid)
assert.Equal(t, "adm:imp_123.45 amd:creativeview_123.45", bid.AdM)
assert.Equal(t, "nurl_123.45", bid.NURL)
}
6 changes: 4 additions & 2 deletions adapters/adot/adottest/exemplary/simple-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"id": "test-request-banner-id",
"impid": "test-imp-banner-id",
"price": 1.16346,
"adm": "some-test-ad",
"adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
"nurl": "nurl.link/win?p=${AUCTION_PRICE}",
"w": 320,
"h": 50,
"ext": {
Expand All @@ -78,7 +79,8 @@
"id": "test-request-banner-id",
"impid": "test-imp-banner-id",
"price": 1.16346,
"adm": "some-test-ad",
"adm": "some-test-ad imp_1.16346 creativeview_1.16346",
"nurl": "nurl.link/win?p=1.16346",
"w": 320,
"h": 50,
"ext": {
Expand Down
8 changes: 5 additions & 3 deletions adapters/adot/adottest/exemplary/simple-interstitial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
"bid": [{
"id": "test-request-inter-id",
"impid": "test-imp-inter-id",
"adm": "some-test-ad",
"price": 1.16346,
"adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
"nurl": "nurl.link/win?p=${AUCTION_PRICE}",
"w": 320,
"h": 480,
"ext": {
Expand All @@ -82,8 +83,9 @@
"bid": {
"id": "test-request-inter-id",
"impid": "test-imp-inter-id",
"price": 1.16346,
"adm": "some-test-ad",
"price": 1.16346,
"adm": "some-test-ad imp_1.16346 creativeview_1.16346",
"nurl": "nurl.link/win?p=1.16346",
"w": 320,
"h": 480,
"ext": {
Expand Down
6 changes: 4 additions & 2 deletions adapters/adot/adottest/exemplary/simple-native.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"id": "test-request-native-id",
"impid": "test-imp-native-id",
"price": 1.16346,
"adm" : "native-ad",
"adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
"nurl": "nurl.link/win?p=${AUCTION_PRICE}",
"w": 300,
"h": 250,
"ext": {
Expand All @@ -70,7 +71,8 @@
"id": "test-request-native-id",
"impid": "test-imp-native-id",
"price": 1.16346,
"adm" : "native-ad",
"adm": "some-test-ad imp_1.16346 creativeview_1.16346",
"nurl": "nurl.link/win?p=1.16346",
"w": 300,
"h": 250,
"ext": {
Expand Down
6 changes: 4 additions & 2 deletions adapters/adot/adottest/exemplary/simple-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
"id": "test-request-video-id",
"impid": "test-imp-video-id",
"price": 1.16346,
"adm": "some-test-ad",
"adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
"nurl": "nurl.link/win?p=${AUCTION_PRICE}",
"w": 300,
"h": 250,
"ext": {
Expand All @@ -102,7 +103,8 @@
"id": "test-request-video-id",
"impid": "test-imp-video-id",
"price": 1.16346,
"adm": "some-test-ad",
"adm": "some-test-ad imp_1.16346 creativeview_1.16346",
"nurl": "nurl.link/win?p=1.16346",
"w": 300,
"h": 250,
"ext": {
Expand Down