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

consumable: Correct width and height reported in response #1459

Merged
merged 1 commit into from
Aug 27, 2020
Merged

consumable: Correct width and height reported in response #1459

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 21 deletions adapters/consumable/consumable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ type decision struct {
CreativeID string `json:"creativeId,omitempty"`
Contents []contents `json:"contents"`
ImpressionUrl *string `json:"impressionUrl,omitempty"`
Width uint64 `json:"width,omitempty"` // Consumable extension, not defined by Adzerk
Height uint64 `json:"height,omitempty"` // Consumable extension, not defined by Adzerk
}

type contents struct {
Expand Down Expand Up @@ -241,23 +243,13 @@ func (a *ConsumableAdapter) MakeBids(
for impID, decision := range serverResponse.Decisions {

if decision.Pricing != nil && decision.Pricing.ClearPrice != nil {

imp := getImp(impID, internalRequest.Imp)
if imp == nil {
errors = append(errors, &errortypes.BadServerResponse{
Message: fmt.Sprintf(
"ignoring bid id=%s, request doesn't contain any impression with id=%s", internalRequest.ID, impID),
})
continue
}

bid := openrtb.Bid{}
bid.ID = internalRequest.ID
bid.ImpID = impID
bid.Price = *decision.Pricing.ClearPrice
bid.AdM = retrieveAd(decision)
bid.W = imp.Banner.Format[0].W // TODO: Review to check if this is correct behaviour
bid.H = imp.Banner.Format[0].H
bid.W = decision.Width
bid.H = decision.Height
bid.CrID = strconv.FormatInt(decision.AdID, 10)
bid.Exp = 30 // TODO: Check this is intention of TTL

Expand All @@ -279,15 +271,6 @@ func (a *ConsumableAdapter) MakeBids(
return bidderResponse, errors
}

func getImp(impId string, imps []openrtb.Imp) *openrtb.Imp {
for _, imp := range imps {
if imp.ID == impId {
return &imp
}
}
return nil
}

func extractExtensions(impression openrtb.Imp) (*adapters.ExtImpBidder, *openrtb_ext.ExtImpConsumable, []error) {
var bidderExt adapters.ExtImpBidder
if err := json.Unmarshal(impression.Ext, &bidderExt); err != nil {
Expand Down