Smaato: Split multiple media types (prebid#1930)

Co-authored-by: Bernhard Pickenbrock <[email protected]>

Author: el-chuck

adapters/smaato/smaato.go

@@ -17,7 +17,7 @@ import (
 	"github.com/prebid/prebid-server/util/timeutil"
 )
 
-const clientVersion = "prebid_server_0.3"
+const clientVersion = "prebid_server_0.4"
 
 type adMarkupType string
 
@@ -160,24 +160,53 @@ func (adapter *adapter) makeIndividualRequests(request *openrtb2.BidRequest) ([]
 	errors := make([]error, 0, len(imps))
 
 	for _, imp := range imps {
-		request.Imp = []openrtb2.Imp{imp}
-		if err := prepareIndividualRequest(request); err != nil {
-			errors = append(errors, err)
-			continue
-		}
-
-		requestData, err := adapter.makeRequest(request)
+		impsByMediaType, err := splitImpressionsByMediaType(&imp)
 		if err != nil {
 			errors = append(errors, err)
 			continue
 		}
 
-		requests = append(requests, requestData)
+		for _, impByMediaType := range impsByMediaType {
+			request.Imp = []openrtb2.Imp{impByMediaType}
+			if err := prepareIndividualRequest(request); err != nil {
+				errors = append(errors, err)
+				continue
+			}
+
+			requestData, err := adapter.makeRequest(request)
+			if err != nil {
+				errors = append(errors, err)
+				continue
+			}
+
+			requests = append(requests, requestData)
+		}
 	}
 
 	return requests, errors
 }
 
+func splitImpressionsByMediaType(imp *openrtb2.Imp) ([]openrtb2.Imp, error) {
+	if imp.Banner == nil && imp.Video == nil {
+		return nil, &errortypes.BadInput{Message: "Invalid MediaType. Smaato only supports Banner and Video."}
+	}
+
+	imps := make([]openrtb2.Imp, 0, 2)
+
+	if imp.Banner != nil {
+		impCopy := *imp
+		impCopy.Video = nil
+		imps = append(imps, impCopy)
+	}
+
+	if imp.Video != nil {
+		imp.Banner = nil
+		imps = append(imps, *imp)
+	}
+
+	return imps, nil
+}
+
 func (adapter *adapter) makePodRequests(request *openrtb2.BidRequest) ([]*adapters.RequestData, []error) {
 	pods, orderedKeys, errors := groupImpressionsByPod(request.Imp)
 	requests := make([]*adapters.RequestData, 0, len(pods))
@@ -436,7 +465,7 @@ func setImpForAdspace(imp *openrtb2.Imp) error {
 		return nil
 	}
 
-	return &errortypes.BadInput{Message: "Invalid MediaType. Smaato only supports Banner and Video."}
+	return nil
 }
 
 func setImpForAdBreak(imps []openrtb2.Imp) error {

adapters/smaato/smaatotest/exemplary/multiple-impressions.json

@@ -31,6 +31,7 @@
             }
           ]
         },
+        "bidfloor": 0.00123,
         "ext": {
           "bidder": {
             "publisherId": "1100042525",
@@ -65,6 +66,7 @@
             "rewarded": 0
           }
         },
+        "bidfloor": 0.00456,
         "ext": {
           "bidder": {
             "publisherId": "1100042526",
@@ -114,6 +116,7 @@
             {
               "id": "1C86242D-9535-47D6-9576-7B1FE87F282C",
               "tagid": "130563103",
+              "bidfloor": 0.00123,
               "banner": {
                 "h": 50,
                 "w": 320,
@@ -159,7 +162,7 @@
             "keywords": "power tools"
           },
           "ext": {
-            "client": "prebid_server_0.3"
+            "client": "prebid_server_0.4"
           }
         }
       },
@@ -208,6 +211,7 @@
             {
               "id": "postbid_iframe",
               "tagid": "130563104",
+              "bidfloor": 0.00456,
               "video": {
                 "w": 1024,
                 "h": 768,
@@ -264,7 +268,7 @@
             "keywords": "power tools"
           },
           "ext": {
-            "client": "prebid_server_0.3"
+            "client": "prebid_server_0.4"
           }
         }
       },