-
Notifications
You must be signed in to change notification settings - Fork 760
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.
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
New Adapter: Compass #2102
Merged
Merged
New Adapter: Compass #2102
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package compass | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/http" | ||
|
|
||
| "github.com/mxmCherry/openrtb/v15/openrtb2" | ||
| "github.com/prebid/prebid-server/adapters" | ||
| "github.com/prebid/prebid-server/config" | ||
| "github.com/prebid/prebid-server/errortypes" | ||
| "github.com/prebid/prebid-server/openrtb_ext" | ||
| ) | ||
|
|
||
| type adapter struct { | ||
| endpoint string | ||
| } | ||
|
|
||
| type reqBodyExt struct { | ||
| CompassBidderExt reqBodyExtBidder `json:"bidder"` | ||
| } | ||
|
|
||
| type reqBodyExtBidder struct { | ||
| Type string `json:"type"` | ||
| PlacementID string `json:"placementId,omitempty"` | ||
| EndpointID string `json:"endpointId,omitempty"` | ||
| } | ||
|
|
||
| func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) { | ||
| bidder := &adapter{ | ||
| endpoint: config.Endpoint, | ||
| } | ||
| return bidder, nil | ||
| } | ||
|
|
||
| func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { | ||
| var errs []error | ||
| var err error | ||
| var adapterRequests []*adapters.RequestData | ||
|
|
||
| reqCopy := *request | ||
| for _, imp := range request.Imp { | ||
| reqCopy.Imp = []openrtb2.Imp{imp} | ||
|
|
||
| var bidderExt adapters.ExtImpBidder | ||
| var compassExt openrtb_ext.ImpExtCompass | ||
|
|
||
| if err = json.Unmarshal(reqCopy.Imp[0].Ext, &bidderExt); err != nil { | ||
SyntaxNode marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return nil, append(errs, err) | ||
| } | ||
| if err = json.Unmarshal(bidderExt.Bidder, &compassExt); err != nil { | ||
| return nil, append(errs, err) | ||
| } | ||
|
|
||
| temp := reqBodyExt{CompassBidderExt: reqBodyExtBidder{}} | ||
|
|
||
| if compassExt.PlacementID != "" { | ||
| temp.CompassBidderExt.PlacementID = compassExt.PlacementID | ||
| temp.CompassBidderExt.Type = "publisher" | ||
| } else if compassExt.EndpointID != "" { | ||
guscarreon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| temp.CompassBidderExt.EndpointID = compassExt.EndpointID | ||
| temp.CompassBidderExt.Type = "network" | ||
| } | ||
|
|
||
| finalyImpExt, err := json.Marshal(temp) | ||
| if err != nil { | ||
| return nil, append(errs, err) | ||
| } | ||
|
|
||
| reqCopy.Imp[0].Ext = finalyImpExt | ||
|
|
||
| adapterReq, errors := a.makeRequest(&reqCopy) | ||
| if adapterReq != nil { | ||
| adapterRequests = append(adapterRequests, adapterReq) | ||
| } | ||
| errs = append(errs, errors...) | ||
| } | ||
| return adapterRequests, errs | ||
| } | ||
|
|
||
| func (a *adapter) makeRequest(request *openrtb2.BidRequest) (*adapters.RequestData, []error) { | ||
SyntaxNode marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var errs []error | ||
|
|
||
| reqJSON, err := json.Marshal(request) | ||
| if err != nil { | ||
| return nil, append(errs, err) | ||
| } | ||
|
|
||
| headers := http.Header{} | ||
| headers.Add("Content-Type", "application/json;charset=utf-8") | ||
| headers.Add("Accept", "application/json") | ||
| return &adapters.RequestData{ | ||
| Method: "POST", | ||
| Uri: a.endpoint, | ||
| Body: reqJSON, | ||
| Headers: headers, | ||
| }, errs | ||
| } | ||
|
|
||
| func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) { | ||
| if responseData.StatusCode == http.StatusNoContent { | ||
| return nil, nil | ||
| } | ||
|
|
||
| if responseData.StatusCode != http.StatusOK { | ||
| err := &errortypes.BadServerResponse{ | ||
| Message: fmt.Sprintf("Unexpected status code: %d. Run with request.debug = 1 for more info.", responseData.StatusCode), | ||
| } | ||
| return nil, []error{err} | ||
| } | ||
|
|
||
| var response openrtb2.BidResponse | ||
| if err := json.Unmarshal(responseData.Body, &response); err != nil { | ||
| return nil, []error{err} | ||
| } | ||
|
|
||
| bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp)) | ||
| bidResponse.Currency = response.Cur | ||
| for _, seatBid := range response.SeatBid { | ||
| for i := range seatBid.Bid { | ||
| bidType, err := getMediaTypeForImp(seatBid.Bid[i].ImpID, request.Imp) | ||
| if err != nil { | ||
| return nil, []error{err} | ||
| } | ||
|
|
||
| b := &adapters.TypedBid{ | ||
| Bid: &seatBid.Bid[i], | ||
| BidType: bidType, | ||
| } | ||
| bidResponse.Bids = append(bidResponse.Bids, b) | ||
| } | ||
| } | ||
| return bidResponse, nil | ||
| } | ||
|
|
||
| func getMediaTypeForImp(impID string, imps []openrtb2.Imp) (openrtb_ext.BidType, error) { | ||
| for _, imp := range imps { | ||
| if imp.ID == impID { | ||
| if imp.Banner != nil { | ||
| return openrtb_ext.BidTypeBanner, nil | ||
| } | ||
| if imp.Banner == nil && imp.Video != nil { | ||
SyntaxNode marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return openrtb_ext.BidTypeVideo, nil | ||
| } | ||
| if imp.Banner == nil && imp.Video == nil && imp.Native != nil { | ||
SyntaxNode marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return openrtb_ext.BidTypeNative, nil | ||
| } | ||
| } | ||
| } | ||
SyntaxNode marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| return "", &errortypes.BadInput{ | ||
| Message: fmt.Sprintf("Failed to find impression \"%s\"", impID), | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package compass | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/prebid/prebid-server/adapters/adapterstest" | ||
| "github.com/prebid/prebid-server/config" | ||
| "github.com/prebid/prebid-server/openrtb_ext" | ||
| ) | ||
|
|
||
| func TestJsonSamples(t *testing.T) { | ||
| bidder, buildErr := Builder(openrtb_ext.BidderCompass, config.Adapter{ | ||
| Endpoint: "http://sa-lb.deliverimp.com/pserver"}) | ||
|
|
||
| if buildErr != nil { | ||
| t.Fatalf("Builder returned unexpected error %v", buildErr) | ||
| } | ||
|
|
||
| adapterstest.RunJSONBidderTest(t, "compasstest", bidder) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| { | ||
| "mockBidRequest": { | ||
| "id": "test-request-id", | ||
| "device": { | ||
| "ip": "123.123.123.123", | ||
| "ua": "iPad" | ||
| }, | ||
| "app": { | ||
| "id": "1", | ||
| "bundle": "com.wls.testwlsapplication" | ||
| }, | ||
| "imp": [ | ||
| { | ||
| "id": "test-imp-id", | ||
| "tagid": "test", | ||
| "banner": { | ||
| "format": [ | ||
| { | ||
| "w": 300, | ||
| "h": 250 | ||
| }, | ||
| { | ||
| "w": 300, | ||
| "h": 600 | ||
| } | ||
| ] | ||
| }, | ||
| "ext": { | ||
| "bidder": { | ||
| "endpointId": "test" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "httpCalls": [ | ||
| { | ||
| "expectedRequest": { | ||
| "uri": "http://sa-lb.deliverimp.com/pserver", | ||
| "body": { | ||
| "id": "test-request-id", | ||
| "imp": [ | ||
| { | ||
| "id": "test-imp-id", | ||
| "tagid": "test", | ||
| "banner": { | ||
| "format": [ | ||
| { | ||
| "w": 300, | ||
| "h": 250 | ||
| }, | ||
| { | ||
| "w": 300, | ||
| "h": 600 | ||
| } | ||
| ] | ||
| }, | ||
| "ext": { | ||
| "bidder": { | ||
| "endpointId": "test", | ||
| "type": "network" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "app": { | ||
| "id": "1", | ||
| "bundle": "com.wls.testwlsapplication" | ||
| }, | ||
| "device": { | ||
| "ip": "123.123.123.123", | ||
| "ua": "iPad" | ||
| } | ||
| } | ||
| }, | ||
| "mockResponse": { | ||
| "status": 200, | ||
| "body": { | ||
| "id": "test-request-id", | ||
| "seatbid": [ | ||
| { | ||
| "bid": [ | ||
| { | ||
| "id": "test_bid_id", | ||
| "impid": "test-imp-id", | ||
| "price": 0.27543, | ||
| "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>", | ||
| "cid": "test_cid", | ||
| "crid": "test_crid", | ||
| "dealid": "test_dealid", | ||
| "w": 300, | ||
| "h": 250, | ||
| "ext": { | ||
| "prebid": { | ||
| "type": "banner" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "seat": "compass" | ||
| } | ||
| ], | ||
| "cur": "USD" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "expectedBidResponses": [ | ||
| { | ||
| "bids": [ | ||
| { | ||
| "bid": { | ||
| "id": "test_bid_id", | ||
| "impid": "test-imp-id", | ||
| "price": 0.27543, | ||
| "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>", | ||
| "cid": "test_cid", | ||
| "crid": "test_crid", | ||
| "dealid": "test_dealid", | ||
| "w": 300, | ||
| "h": 250, | ||
| "ext": { | ||
| "prebid": { | ||
| "type": "banner" | ||
| } | ||
| } | ||
| }, | ||
| "type": "banner" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: This is no longer required with the last fix refactor you pushed. You can replace all
return nil, append(errs, err)statements withreturn nil, []error{err}like you do inMakeBids. The last return of this method will becomereturn adapterRequests, nilwhich is a bit more straightforward IMHO.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, refactored