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

Adview: adapter currency fix. #2060

Merged
merged 19 commits into from
Nov 23, 2021
Merged

Adview: adapter currency fix. #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dc07339
adview adapter v1.0
wildcat0601 Aug 30, 2021
2121b66
fix for review #1982.
wildcat0601 Aug 31, 2021
b8a4d78
fix format test json.
wildcat0601 Aug 31, 2021
4b60aa1
recover ext in request to adview bid.
wildcat0601 Aug 31, 2021
93fb6c7
remove invalid mediatype test
wildcat0601 Aug 31, 2021
1dce3fa
remove tabs from codes
wildcat0601 Sep 1, 2021
a482d51
tab issue fix.
wildcat0601 Sep 1, 2021
cab079d
fix gofmt
AdviewOpen Sep 1, 2021
c426908
1.fixed error log process.
wildcat0601 Sep 2, 2021
048c8ef
Merge branch 'master' of https://github.com/adview/prebid-server
wildcat0601 Sep 2, 2021
de429fa
Merge branch 'prebid:master' into master
AdviewOpen Oct 25, 2021
77747c7
for adapter currency fix.
wildcat0601 Oct 26, 2021
ef9ab39
(1)remove unused codes
wildcat0601 Oct 29, 2021
9c9c479
(1)add currency convert of request process.
wildcat0601 Nov 4, 2021
ef39579
Merge branch 'prebid:master' into master
AdviewOpen Nov 8, 2021
26e317d
add currency test case.
wildcat0601 Nov 9, 2021
9a26bcc
just removed case.
wildcat0601 Nov 9, 2021
8228da0
Merge branch 'prebid:master' into master
AdviewOpen Nov 19, 2021
e985bcc
add currency test script for new currency convert commit.
wildcat0601 Nov 19, 2021
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
20 changes: 19 additions & 1 deletion adapters/adview/adview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"strings"
"text/template"

"github.com/mxmCherry/openrtb/v15/openrtb2"
Expand Down Expand Up @@ -58,6 +59,22 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapte
}
}

// Check if imp comes with bid floor amount defined in a foreign currency
if imp.BidFloor > 0 && imp.BidFloorCur != "" && strings.ToUpper(imp.BidFloorCur) != "USD" {
// Convert to US dollars
convertedValue, err := requestInfo.ConvertCurrency(imp.BidFloor, imp.BidFloorCur, "USD")
if err != nil {
return nil, []error{err}
}
// Update after conversion. All imp elements inside request.Imp are shallow copies
// therefore, their non-pointer values are not shared memory and are safe to modify.
imp.BidFloorCur = "USD"
imp.BidFloor = convertedValue
}

// Set the CUR of bid to USD after converting all floors
request.Cur = []string{"USD"}

url, err := a.buildEndpointURL(&advImpExt)
if err != nil {
return nil, []error{err}
Expand Down Expand Up @@ -100,7 +117,8 @@ func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.R
}

bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp))
bidResponse.Currency = response.Cur
bidResponse.Currency = "USD" //we just support USD for resp

var errors []error
for _, seatBid := range response.SeatBid {
for i, bid := range seatBid.Bid {
Expand Down
2 changes: 2 additions & 0 deletions adapters/adview/adviewtest/exemplary/banner-app-format.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "some-request-id",
"cur": ["USD"],
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
Expand Down Expand Up @@ -134,6 +135,7 @@
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
Expand Down
2 changes: 2 additions & 0 deletions adapters/adview/adviewtest/exemplary/banner-app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "some-request-id",
"cur": ["USD"],
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
Expand Down Expand Up @@ -124,6 +125,7 @@
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
Expand Down
2 changes: 2 additions & 0 deletions adapters/adview/adviewtest/exemplary/native-app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "some-request-id",
"cur": ["USD"],
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
Expand Down Expand Up @@ -122,6 +123,7 @@
],
"expectedBidResponses": [
{
"currency": "USD",
"bids":[
{
"bid": {
Expand Down
2 changes: 2 additions & 0 deletions adapters/adview/adviewtest/exemplary/video-app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "some-request-id",
"cur": ["USD"],
"device": {
"ua": "test-user-agent",
"ip": "123.123.123.123",
Expand Down Expand Up @@ -133,6 +134,7 @@
],
"expectedBidResponses": [
{
"currency": "USD",
"bids":[
{
"bid": {
Expand Down
1 change: 1 addition & 0 deletions adapters/adview/adviewtest/supplemental/bad-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "test-request-id",
"cur": ["USD"],
"imp": [{
"ext": {
"bidder": {
Expand Down
44 changes: 44 additions & 0 deletions adapters/adview/adviewtest/supplemental/currency_rate_not_found.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
]
},
"bidfloor": 1.00,
"bidfloorcur": "JPY",
"ext":{
"bidder": {
"placementId": "posid00001",
"accountId": "accountid01"
}
}
}
],
"ext": {
"prebid": {
"currency": {
"rates": {
"MXN": {
"USD": 0.05
}
},
"usepbsrates": false
}
}
}
},
"expectedMakeRequestsErrors": [
{
"value": "Currency conversion rate not found: 'JPY' => 'USD'",
"comparison": "literal"
}
]
}
1 change: 1 addition & 0 deletions adapters/adview/adviewtest/supplemental/empty-response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "test-request-id",
"cur": ["USD"],
"imp": [{
"ext": {
"bidder": {
Expand Down
1 change: 1 addition & 0 deletions adapters/adview/adviewtest/supplemental/nobid-response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "test-request-id",
"cur": ["USD"],
"imp": [{
"ext": {
"bidder": {
Expand Down
1 change: 1 addition & 0 deletions adapters/adview/adviewtest/supplemental/server-error.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "test-request-id",
"cur": ["USD"],
"imp": [{
"ext": {
"bidder": {
Expand Down
1 change: 1 addition & 0 deletions adapters/adview/adviewtest/supplemental/unparsable-response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"uri": "https://bid.adview.com/agent/thirdAdxService/accountid01",
"body": {
"id": "test-request-id",
"cur": ["USD"],
"imp": [{
"ext": {
"bidder": {
Expand Down