New Adapter: Admatic

adapters/admatic/admatic.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"net/url"
 	"text/template"
 
 	"github.com/prebid/openrtb/v20/openrtb2"
@@ -32,85 +31,67 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server co
 }
 
 func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
+	var requests []*adapters.RequestData
+	var errs []error
 
-	host := ""
-
+	requestCopy := *request
 	for _, imp := range request.Imp {
-		admaticExt, err := getImpressionExt(imp)
+		requestCopy.Imp = []openrtb2.Imp{imp}
+
+		endpoint, err := a.buildEndpointFromRequest(&imp)
 		if err != nil {
-			return nil, []error{err}
+			errs = append(errs, err)
+			continue
 		}
 
-		if host == "" {
-			host = admaticExt.Host
-		} else if host != admaticExt.Host {
-			return nil, []error{&errortypes.BadInput{
-				Message: "There must be only one Host",
-			}}
+		requestJSON, err := json.Marshal(requestCopy)
+		if err != nil {
+			errs = append(errs, err)
+			continue
 		}
-	}
-
-	resolvedUrl, err := a.resolveUrl(host)
-
-	if err != nil {
-		return nil, []error{err}
-	}
 
-	requestJSON, err := json.Marshal(request)
-	if err != nil {
-		return nil, []error{err}
-	}
+		request := &adapters.RequestData{
+			Method: http.MethodPost,
+			Body:   requestJSON,
+			Uri:    endpoint,
+			ImpIDs: openrtb_ext.GetImpIDs(requestCopy.Imp),
+		}
 
-	requestData := &adapters.RequestData{
-		Method: "POST",
-		Uri:    resolvedUrl,
-		Body:   requestJSON,
-		ImpIDs: openrtb_ext.GetImpIDs(request.Imp),
+		requests = append(requests, request)
 	}
 
-	return []*adapters.RequestData{requestData}, nil
+	return requests, errs
 }
 
-func getImpressionExt(imp openrtb2.Imp) (*openrtb_ext.ImpExtAdmatic, error) {
-	var bidderExt adapters.ExtImpBidder
-	if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
-		return nil, &errortypes.BadInput{
-			Message: "Bidder extension not provided or can't be unmarshalled",
+func (a *adapter) buildEndpointFromRequest(imp *openrtb2.Imp) (string, error) {
+	var impExt adapters.ExtImpBidder
+	if err := json.Unmarshal(imp.Ext, &impExt); err != nil {
+		return "", &errortypes.BadInput{
+			Message: fmt.Sprintf("Failed to deserialize bidder impression extension: %v", err),
 		}
 	}
 
 	var admaticExt openrtb_ext.ImpExtAdmatic
-	if err := json.Unmarshal(bidderExt.Bidder, &admaticExt); err != nil {
-		return nil, &errortypes.BadInput{
-			Message: "Error while unmarshaling bidder extension",
+	if err := json.Unmarshal(impExt.Bidder, &admaticExt); err != nil {
+		return "", &errortypes.BadInput{
+			Message: fmt.Sprintf("Failed to deserialize AdMatic extension: %v", err),
 		}
 	}
 
-	return &admaticExt, nil
-}
-
-// resolveUrl "un-templates" the endpoint by replacing macroses and adding the required query parameters
-func (a *adapter) resolveUrl(host string) (string, error) {
-	params := macros.EndpointTemplateParams{Host: host}
-
-	endpointStr, err := macros.ResolveMacros(a.endpoint, params)
-	if err != nil {
-		return "", err
+	endpointParams := macros.EndpointTemplateParams{
+		Host: admaticExt.Host,
 	}
 
-	parsedUrl, err := url.Parse(endpointStr)
-	if err != nil {
-		return "", err
-	}
-
-	return parsedUrl.String(), nil
+	return macros.ResolveMacros(a.endpoint, endpointParams)
 }
 
 func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
-	if responseData.StatusCode == http.StatusNoContent {
+	if adapters.IsResponseStatusCodeNoContent(responseData) {
 		return nil, nil
 	}
-
+	if err := adapters.CheckResponseStatusCodeForErrors(responseData); err != nil {
+		return nil, []error{err}
+	}
 	var response openrtb2.BidResponse
 	if err := json.Unmarshal(responseData.Body, &response); err != nil {
 		return nil, []error{err}

adapters/admatic/admatic_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/prebid/prebid-server/v2/adapters/adapterstest"
 	"github.com/prebid/prebid-server/v2/config"
 	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestJsonSamples(t *testing.T) {
@@ -19,3 +20,10 @@ func TestJsonSamples(t *testing.T) {
 
 	adapterstest.RunJSONBidderTest(t, "admatictest", bidder)
 }
+
+func TestEndpointTemplateMalformed(t *testing.T) {
+	_, buildErr := Builder(openrtb_ext.BidderAso, config.Adapter{
+		Endpoint: "host={{Host}}"}, config.Server{ExternalUrl: "http://hosturl.com"})
+
+	assert.Error(t, buildErr)
+}

adapters/admatic/admatictest/exemplary/banner.json

@@ -14,7 +14,8 @@
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr"
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345
           }
         }
       }
@@ -23,7 +24,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id-banner",
           "imp": [
@@ -39,7 +40,8 @@
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr"
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345
                 }
               }
             }

adapters/admatic/admatictest/exemplary/native.json

@@ -9,7 +9,8 @@
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr"
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345
           }
         }
       }
@@ -18,7 +19,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id-native",
           "imp": [
@@ -29,7 +30,8 @@
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr"
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345
                 }
               }
             }

adapters/admatic/admatictest/exemplary/optional-params.json

@@ -14,7 +14,8 @@
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr",
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345,
             "bidFloor": 0.1,
             "isTest": false
           }
@@ -25,7 +26,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id-banner",
           "imp": [
@@ -41,7 +42,8 @@
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr",
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345,
                   "bidFloor": 0.1,
                   "isTest": false
                 }

adapters/admatic/admatictest/exemplary/video.json

@@ -11,7 +11,8 @@
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr"
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345
           }
         }
       }
@@ -20,7 +21,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id",
           "imp": [
@@ -33,7 +34,8 @@
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr"
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345
                 }
               }
             }

adapters/admatic/admatictest/supplemental/response-200-without-body.json

@@ -5,11 +5,17 @@
       {
         "id": "test-imp-id",
         "banner": {
-          "format": [{"w": 728, "h": 90}]
+          "format": [
+            {
+              "w": 728,
+              "h": 90
+            }
+          ]
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr"
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345
           }
         }
       }
@@ -19,18 +25,24 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id",
           "imp": [
             {
               "id": "test-imp-id",
               "banner": {
-                "format": [{"w": 728, "h": 90}]
+                "format": [
+                  {
+                    "w": 728,
+                    "h": 90
+                  }
+                ]
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr"
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345
                 }
               }
             }

adapters/admatic/admatictest/supplemental/response-204.json

@@ -5,11 +5,17 @@
       {
         "id": "test-imp-id",
         "banner": {
-          "format": [{"w": 728, "h": 90}]
+          "format": [
+            {
+              "w": 728,
+              "h": 90
+            }
+          ]
         },
         "ext": {
           "bidder": {
-            "host": "admatic.rtb.admatic.com.tr"
+            "host": "layer.serve.admatic.com.tr",
+            "networkId": 12345
           }
         }
       }
@@ -19,18 +25,24 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "http://pbs.admatic.com.tr?host=admatic.rtb.admatic.com.tr",
+        "uri": "http://pbs.admatic.com.tr?host=layer.serve.admatic.com.tr",
         "body": {
           "id": "test-request-id",
           "imp": [
             {
               "id": "test-imp-id",
               "banner": {
-                "format": [{"w": 728, "h": 90}]
+                "format": [
+                  {
+                    "w": 728,
+                    "h": 90
+                  }
+                ]
               },
               "ext": {
                 "bidder": {
-                  "host": "admatic.rtb.admatic.com.tr"
+                  "host": "layer.serve.admatic.com.tr",
+                  "networkId": 12345
                 }
               }
             }