verizonmedia: override tag ID and site ID + split up multi-imp requests

prebid · Oct 1, 2019 · c3643de · c3643de
1 parent 9bf7dcf
commit c3643de
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 63 deletions.
diff --git a/adapters/verizonmedia/verizonmedia.go b/adapters/verizonmedia/verizonmedia.go
@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/http"
+
 	"github.com/mxmCherry/openrtb"
 	"github.com/prebid/prebid-server/adapters"
 	"github.com/prebid/prebid-server/errortypes"
 	"github.com/prebid/prebid-server/openrtb_ext"
-	"net/http"
 )
 
 type VerizonMediaAdapter struct {
@@ -25,8 +26,8 @@ func (a *VerizonMediaAdapter) SkipNoCookies() bool {
 }
 
 func (a *VerizonMediaAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
-
 	errors := make([]error, 0, 1)
+
 	if len(request.Imp) == 0 {
 		err := &errortypes.BadInput{
 			Message: "No impression in the bid request",
@@ -35,68 +36,82 @@ func (a *VerizonMediaAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo
 		return nil, errors
 	}
 
-	var bidderExt adapters.ExtImpBidder
-	err := json.Unmarshal(request.Imp[0].Ext, &bidderExt)
-	if err != nil {
-		err = &errortypes.BadInput{
-			Message: "ext.bidder not provided",
-		}
-		errors = append(errors, err)
-		return nil, errors
+	reqs := make([]*adapters.RequestData, 0, len(request.Imp))
+	headers := http.Header{}
+
+	headers.Add("Content-Type", "application/json;charset=utf-8")
+	headers.Add("Accept", "application/json")
+	headers.Add("x-openrtb-version", "2.5")
+
+	if request.Device != nil && request.Device.UA != "" {
+		headers.Set("User-Agent", request.Device.UA)
 	}
-	var verizonMediaExt openrtb_ext.ExtImpVerizonMedia
-	err = json.Unmarshal(bidderExt.Bidder, &verizonMediaExt)
-	if err != nil {
-		err = &errortypes.BadInput{
-			Message: err.Error(),
+
+	for idx, imp := range request.Imp {
+		var bidderExt adapters.ExtImpBidder
+		err := json.Unmarshal(imp.Ext, &bidderExt)
+		if err != nil {
+			err = &errortypes.BadInput{
+				Message: fmt.Sprintf("imp #%d: ext.bidder not provided", idx),
+			}
+			errors = append(errors, err)
+			continue
 		}
-		errors = append(errors, err)
-		return nil, errors
-	}
 
-	if verizonMediaExt.Dcn == "" {
-		err = &errortypes.BadInput{
-			Message: "Missing param dcn",
+		var verizonMediaExt openrtb_ext.ExtImpVerizonMedia
+		err = json.Unmarshal(bidderExt.Bidder, &verizonMediaExt)
+		if err != nil {
+			err = &errortypes.BadInput{
+				Message: fmt.Sprintf("imp #%d: %s", idx, err.Error()),
+			}
+			errors = append(errors, err)
+			continue
 		}
-		errors = append(errors, err)
-		return nil, errors
-	}
 
-	if verizonMediaExt.Pos == "" {
-		err = &errortypes.BadInput{
-			Message: "Missing param pos",
+		if verizonMediaExt.Dcn == "" {
+			err = &errortypes.BadInput{
+				Message: fmt.Sprintf("imp #%d: missing param dcn", idx),
+			}
+			errors = append(errors, err)
+			continue
 		}
-		errors = append(errors, err)
-		return nil, errors
-	}
 
-	siteCopy := *request.Site
-	request.Site = &siteCopy
-	if err := changeRequestForBidService(request, &verizonMediaExt); err != nil {
-		errors = append(errors, err)
-		return nil, errors
-	}
+		if verizonMediaExt.Pos == "" {
+			err = &errortypes.BadInput{
+				Message: fmt.Sprintf("imp #%d: missing param pos", idx),
+			}
+			errors = append(errors, err)
+			continue
+		}
 
-	reqJSON, err := json.Marshal(request)
-	if err != nil {
-		errors = append(errors, err)
-		return nil, errors
-	}
+		// Split up multi-impression requests into multiple requests so that
+		// each split request is only associated to a single impression
+		reqCopy := *request
+		reqCopy.Imp = []openrtb.Imp{imp}
 
-	thisURI := a.URI
+		siteCopy := *request.Site
+		reqCopy.Site = &siteCopy
 
-	headers := http.Header{}
-	headers.Add("Content-Type", "application/json;charset=utf-8")
-	headers.Add("Accept", "application/json")
-	headers.Set("User-Agent", request.Device.UA)
-	headers.Add("x-openrtb-version", "2.5")
+		if err := changeRequestForBidService(&reqCopy, &verizonMediaExt); err != nil {
+			errors = append(errors, err)
+			continue
+		}
 
-	return []*adapters.RequestData{{
-		Method:  "POST",
-		Uri:     thisURI,
-		Body:    reqJSON,
-		Headers: headers,
-	}}, errors
+		reqJSON, err := json.Marshal(&reqCopy)
+		if err != nil {
+			errors = append(errors, err)
+			continue
+		}
+
+		reqs = append(reqs, &adapters.RequestData{
+			Method:  "POST",
+			Uri:     a.URI,
+			Body:    reqJSON,
+			Headers: headers,
+		})
+	}
+
+	return reqs, errors
 }
 
 func (a *VerizonMediaAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
@@ -166,12 +181,9 @@ func getImpInfo(impId string, imps []openrtb.Imp) (bool, openrtb_ext.BidType) {
 }
 
 func changeRequestForBidService(request *openrtb.BidRequest, extension *openrtb_ext.ExtImpVerizonMedia) error {
-	if request.Imp[0].TagID == "" {
-		request.Imp[0].TagID = extension.Pos
-	}
-	if request.Site.ID == "" {
-		request.Site.ID = extension.Dcn
-	}
+	/* Always override the tag ID and site ID of the request */
+	request.Imp[0].TagID = extension.Pos
+	request.Site.ID = extension.Dcn
 
 	if request.Imp[0].Banner == nil {
 		return nil

diff --git a/adapters/verizonmedia/verizonmediatest/exemplary/simple-banner.json b/adapters/verizonmedia/verizonmediatest/exemplary/simple-banner.json
@@ -7,6 +7,7 @@
         "banner": {
           "format": [{"w": 728, "h": 90}]
         },
+        "tagid": "123",
         "ext": {
           "bidder": {
             "dcn": "dcn1",
@@ -20,7 +21,7 @@
       "ip": "127.0.0.1"
     },
     "site": {
-      "id": ""
+      "id": "test-site-id"
     }
   },
 

diff --git a/adapters/verizonmedia/verizonmediatest/supplemental/required-nobidder-info.json b/adapters/verizonmedia/verizonmediatest/supplemental/required-nobidder-info.json
@@ -11,5 +11,5 @@
     ]
   },
 
-  "expectedMakeRequestsErrors": ["ext.bidder not provided"]
+  "expectedMakeRequestsErrors": ["imp #0: ext.bidder not provided"]
 }
diff --git a/adapters/verizonmedia/verizonmediatest/supplemental/required-params-dcn.json b/adapters/verizonmedia/verizonmediatest/supplemental/required-params-dcn.json
@@ -16,5 +16,5 @@
     "site": {}
   },
 
-  "expectedMakeRequestsErrors": ["Missing param dcn"]
+  "expectedMakeRequestsErrors": ["imp #0: missing param dcn"]
 }
diff --git a/adapters/verizonmedia/verizonmediatest/supplemental/required-params-pos.json b/adapters/verizonmedia/verizonmediatest/supplemental/required-params-pos.json
@@ -17,5 +17,5 @@
     "site": {}
   },
 
-  "expectedMakeRequestsErrors": ["Missing param pos"]
+  "expectedMakeRequestsErrors": ["imp #0: missing param pos"]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,5 +11,5 @@ @@
         ]
       },
-      "expectedMakeRequestsErrors": ["ext.bidder not provided"]
+      "expectedMakeRequestsErrors": ["imp #0: ext.bidder not provided"]
     }