-
Notifications
You must be signed in to change notification settings - Fork 0
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
Support page type and position #5
Open
thetalkeren
wants to merge
22
commits into
master
Choose a base branch
from
support-page-type-and-position
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
9b6abb6
support-native
ahmadlob 4135d81
added page type and position to bidder params
f22b460
support-native
ahmadlob a7c6c87
support-native
ahmadlob 1d98949
support-native
ahmadlob d1b9ce2
support-native
ahmadlob 60de3a5
support-native
ahmadlob 749c15e
Merge remote-tracking branch 'origin/master' into support-page-type-a…
587d569
fixed position code and test
3061236
support-native
ahmadlob 38fefab
Merge pull request #4 from taboola/support-native
ahmadlob fdd3b57
Merge remote-tracking branch 'origin/master' into support-page-type-a…
58b9ae2
merged from master (native support) and resolved conflicts
cbacb42
put pageType in requestExt instead of siteExt
a93c138
support-native
ahmadlob 0a81621
support-native
ahmadlob 3e242bd
Merge pull request #6 from taboola/support-native
ahmadlob 6a628a5
Merge remote-tracking branch 'origin/master' into support-page-type-a…
b7b28e1
Merge remote-tracking branch 'upstream/master' into support-page-type…
d3f938a
merged from upstream
f045be8
removed redundant override adm (ahmad)
b81d7ed
changed Position *int8 to *int
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
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 |
---|---|---|
|
@@ -3,45 +3,60 @@ package taboola | |
import ( | ||
"encoding/json" | ||
"fmt" | ||
"github.com/prebid/openrtb/v17/adcom1" | ||
"github.com/prebid/openrtb/v17/native1" | ||
nativeResponse "github.com/prebid/openrtb/v17/native1/response" | ||
"github.com/prebid/openrtb/v17/openrtb2" | ||
"github.com/prebid/prebid-server/adapters" | ||
"github.com/prebid/prebid-server/config" | ||
"github.com/prebid/prebid-server/errortypes" | ||
"github.com/prebid/prebid-server/macros" | ||
"github.com/prebid/prebid-server/openrtb_ext" | ||
"net/http" | ||
"text/template" | ||
) | ||
|
||
type adapter struct { | ||
endpoint string | ||
endpoint *template.Template | ||
} | ||
|
||
const ( | ||
NATIVE_ENDPOINT_PREFIX = "native" | ||
DISPLAY_ENDPOINT_PREFIX = "display" | ||
) | ||
|
||
// Builder builds a new instance of the Foo adapter for the given bidder with the given config. | ||
func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) { | ||
endpointTemplate, err := template.New("endpointTemplate").Parse(config.Endpoint) | ||
if err != nil { | ||
return nil, fmt.Errorf("unable to parse endpoint url template: %v", err) | ||
} | ||
bidder := &adapter{ | ||
endpoint: config.Endpoint, | ||
endpoint: endpointTemplate, | ||
} | ||
return bidder, nil | ||
} | ||
|
||
func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) { | ||
|
||
taboolaRequest, errs := createTaboolaRequest(request) | ||
var requests []*adapters.RequestData | ||
|
||
taboolaRequests, errs := createTaboolaRequests(request) | ||
if len(errs) > 0 { | ||
return nil, errs | ||
} | ||
|
||
requestJSON, err := json.Marshal(taboolaRequest) | ||
if err != nil { | ||
return nil, []error{err} | ||
} | ||
|
||
requestData := &adapters.RequestData{ | ||
Method: "POST", | ||
Uri: a.endpoint + "/" + taboolaRequest.Site.ID, | ||
Body: requestJSON, | ||
for _, taboolaRequest := range taboolaRequests { | ||
if len(taboolaRequest.Imp) > 0 { | ||
request, err := a.buildRequest(taboolaRequest) | ||
if err != nil { | ||
return nil, []error{fmt.Errorf("unable to build request %v", err)} | ||
} | ||
requests = append(requests, request) | ||
} | ||
} | ||
|
||
return []*adapters.RequestData{requestData}, errs | ||
return requests, errs | ||
} | ||
|
||
func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) { | ||
|
@@ -79,6 +94,20 @@ func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.R | |
errs = append(errs, err) | ||
continue | ||
} | ||
if bidType == openrtb_ext.BidTypeNative { | ||
var nativePayload nativeResponse.Response | ||
if err := json.Unmarshal(json.RawMessage(seatBid.Bid[i].AdM), &nativePayload); err != nil { | ||
errs = append(errs, err) | ||
continue | ||
} | ||
overrideEventTrackers(&nativePayload) | ||
nativePayloadJson, err := json.Marshal(nativePayload) | ||
if err != nil { | ||
errs = append(errs, err) | ||
continue | ||
} | ||
seatBid.Bid[i].AdM = string(nativePayloadJson) | ||
} | ||
b := &adapters.TypedBid{ | ||
Bid: &seatBid.Bid[i], | ||
BidType: bidType, | ||
|
@@ -89,8 +118,50 @@ func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.R | |
return bidResponse, errs | ||
} | ||
|
||
func createTaboolaRequest(request *openrtb2.BidRequest) (taboolaRequest *openrtb2.BidRequest, errors []error) { | ||
func (a *adapter) buildRequest(request *openrtb2.BidRequest) (*adapters.RequestData, error) { | ||
requestJSON, err := json.Marshal(request) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
//set MediaType based on first imp | ||
var mediaType string | ||
if request.Imp[0].Banner != nil { | ||
mediaType = DISPLAY_ENDPOINT_PREFIX | ||
} else if request.Imp[0].Native != nil { | ||
mediaType = NATIVE_ENDPOINT_PREFIX | ||
} else { | ||
return nil, fmt.Errorf("unsupported media type for imp: %v", request.Imp[0]) | ||
} | ||
|
||
url, err := a.buildEndpointURL(request.Site.ID, mediaType) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
requestData := &adapters.RequestData{ | ||
Method: "POST", | ||
Uri: url, | ||
Body: requestJSON, | ||
} | ||
|
||
return requestData, nil | ||
} | ||
|
||
// Builds endpoint url based on adapter-specific pub settings from imp.ext | ||
func (a *adapter) buildEndpointURL(publisherId string, mediaType string) (string, error) { | ||
endpointParams := macros.EndpointTemplateParams{PublisherID: publisherId, MediaType: mediaType} | ||
resolvedUrl, err := macros.ResolveMacros(a.endpoint, endpointParams) | ||
if err != nil { | ||
return "", err | ||
} | ||
return resolvedUrl, nil | ||
} | ||
|
||
func createTaboolaRequests(request *openrtb2.BidRequest) (taboolaRequests []*openrtb2.BidRequest, errors []error) { | ||
modifiedRequest := *request | ||
var nativeImp []openrtb2.Imp | ||
var bannerImp []openrtb2.Imp | ||
var errs []error | ||
|
||
var taboolaExt openrtb_ext.ImpExtTaboola | ||
|
@@ -114,6 +185,19 @@ func createTaboolaRequest(request *openrtb2.BidRequest) (taboolaRequest *openrtb | |
imp.BidFloor = taboolaExt.BidFloor | ||
modifiedRequest.Imp[i] = imp | ||
} | ||
|
||
if modifiedRequest.Imp[i].Banner != nil { | ||
if taboolaExt.Position != nil { | ||
bannerCopy := *imp.Banner | ||
bannerCopy.Pos = adcom1.PlacementPosition(*taboolaExt.Position).Ptr() | ||
imp.Banner = &bannerCopy | ||
modifiedRequest.Imp[i] = imp | ||
} | ||
bannerImp = append(bannerImp, modifiedRequest.Imp[i]) | ||
} else if modifiedRequest.Imp[i].Native != nil { | ||
nativeImp = append(nativeImp, modifiedRequest.Imp[i]) | ||
} | ||
|
||
} | ||
|
||
publisher := &openrtb2.Publisher{ | ||
|
@@ -145,20 +229,43 @@ func createTaboolaRequest(request *openrtb2.BidRequest) (taboolaRequest *openrtb | |
modifiedRequest.BAdv = taboolaExt.BAdv | ||
} | ||
|
||
return &modifiedRequest, errs | ||
if taboolaExt.PageType != "" { | ||
modifiedRequest.Ext = makeRequestExt(taboolaExt.PageType, errs) | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
taboolaRequests = append(taboolaRequests, overrideBidRequestImp(&modifiedRequest, nativeImp)) | ||
taboolaRequests = append(taboolaRequests, overrideBidRequestImp(&modifiedRequest, bannerImp)) | ||
|
||
return taboolaRequests, errs | ||
} | ||
|
||
func makeRequestExt(pageType string, errs []error) json.RawMessage { | ||
requestExt := &RequestExt{ | ||
PageType: pageType, | ||
} | ||
|
||
requestExtJson, err := json.Marshal(requestExt) | ||
if err != nil { | ||
errs = append(errs, err) | ||
return make([]byte, 0) | ||
} | ||
return requestExtJson | ||
|
||
} | ||
|
||
func getMediaType(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 | ||
} else if imp.Native != nil { | ||
return openrtb_ext.BidTypeNative, nil | ||
} | ||
} | ||
} | ||
|
||
return "", &errortypes.BadInput{ | ||
Message: fmt.Sprintf("Failed to find banner impression \"%s\" ", impID), | ||
Message: fmt.Sprintf("Failed to find banner/native impression \"%s\" ", impID), | ||
} | ||
} | ||
|
||
|
@@ -171,3 +278,25 @@ func evaluateDomain(publisherDomain string, request *openrtb2.BidRequest) (resul | |
} | ||
return "" | ||
} | ||
|
||
func overrideBidRequestImp(originBidRequest *openrtb2.BidRequest, imp []openrtb2.Imp) (bidRequest *openrtb2.BidRequest) { | ||
bidRequestResult := *originBidRequest | ||
bidRequestResult.Imp = imp | ||
return &bidRequestResult | ||
} | ||
|
||
func overrideEventTrackers(nativePayload *nativeResponse.Response) { | ||
// convert evventrackers to the deprecated imptrackers and jstracker because it's not supported in native 1.1v | ||
for _, eventTracker := range nativePayload.EventTrackers { | ||
if eventTracker.Event != native1.EventTypeImpression { | ||
continue | ||
} | ||
switch eventTracker.Method { | ||
case native1.EventTrackingMethodImage: | ||
nativePayload.ImpTrackers = append(nativePayload.ImpTrackers, eventTracker.URL) | ||
case native1.EventTrackingMethodJS: | ||
nativePayload.JSTracker = fmt.Sprintf("<script src=\"%s\"></script>", eventTracker.URL) | ||
} | ||
} | ||
nativePayload.EventTrackers = nil | ||
} |
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
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
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.
@ahmadlob please take a look here