Bid floor (prebid#1085)

flux-dev-team · Nov 13, 2019 · 61cf26a · 61cf26a
1 parent 289f742
commit 61cf26a
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 57 deletions.
diff --git a/adapters/tappx/params_test.go b/adapters/tappx/params_test.go
@@ -2,9 +2,8 @@ package tappx
 
 import (
 	"encoding/json"
-	"testing"
-
 	"github.com/prebid/prebid-server/openrtb_ext"
+	"testing"
 )
 
 func TestValidParams(t *testing.T) {
@@ -34,7 +33,8 @@ func TestInvalidParams(t *testing.T) {
 }
 
 var validParams = []string{
-	`{"tappxkey":"pub-12345-android-9876", "endpoint":"ZZ1INTERNALTEST149147915", "host":"test.tappx.com/"}`,
+	`{"tappxkey":"pub-12345-android-9876", "endpoint":"ZZ1INTERNALTEST149147915", "host":"test.tappx.com"}`,
+	`{"tappxkey":"pub-12345-android-9876", "endpoint":"ZZ1INTERNALTEST149147915", "host":"test.tappx.com", "bidfloor":0.5}`,
 }
 
 var invalidParams = []string{

diff --git a/adapters/tappx/tappx.go b/adapters/tappx/tappx.go
@@ -10,12 +10,14 @@ import (
 	"github.com/prebid/prebid-server/macros"
 	"github.com/prebid/prebid-server/openrtb_ext"
 	"net/http"
+	"net/url"
 	"strconv"
 	"text/template"
 	"time"
 )
 
-const TAPPX_BIDDER_VERSION = "1.0"
+const TAPPX_BIDDER_VERSION = "1.1"
+const TYPE_CNN = "prebid"
 
 type TappxAdapter struct {
 	http             *adapters.HTTPAdapter
@@ -26,7 +28,7 @@ func NewTappxBidder(client *http.Client, endpointTemplate string) *TappxAdapter
 	a := &adapters.HTTPAdapter{Client: client}
 	template, err := template.New("endpointTemplate").Parse(endpointTemplate)
 	if err != nil {
-		glog.Fatal("Unable to parse endpoint url template")
+		glog.Fatal("Unable to parse endpoint url template: " + err.Error())
 		return nil
 	}
 	return &TappxAdapter{
@@ -35,12 +37,6 @@ func NewTappxBidder(client *http.Client, endpointTemplate string) *TappxAdapter
 	}
 }
 
-type tappxParams struct {
-	Host     string `json:"host"`
-	TappxKey string `json:"tappxkey"`
-	Endpoint string `json:"endpoint"`
-}
-
 func (a *TappxAdapter) Name() string {
 	return "tappx"
 }
@@ -78,6 +74,10 @@ func (a *TappxAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapte
 		return nil, []error{err}
 	}
 
+	if tappxExt.BidFloor > 0 {
+		request.Imp[0].BidFloor = tappxExt.BidFloor
+	}
+
 	reqJSON, err := json.Marshal(request)
 	if err != nil {
 		return nil, []error{&errortypes.BadInput{
@@ -98,54 +98,60 @@ func (a *TappxAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapte
 
 // Builds enpoint url based on adapter-specific pub settings from imp.ext
 func (a *TappxAdapter) buildEndpointURL(params *openrtb_ext.ExtImpTappx, test int) (string, error) {
-	reqHost, reqKey, reqEndpoint := "", "", ""
-	if params.Host != "" {
-		reqHost = params.Host
-	}
-	if params.Endpoint != "" {
-		reqEndpoint = params.Endpoint
-	}
-	if params.TappxKey != "" {
-		reqKey = params.TappxKey
-	}
 
-	if reqHost == "" {
+	if params.Host == "" {
 		return "", &errortypes.BadInput{
 			Message: "Tappx host undefined",
 		}
 	}
 
-	endpointParams := macros.EndpointTemplateParams{Host: reqHost}
-	host, err := macros.ResolveMacros(a.endpointTemplate, endpointParams)
-
-	if err != nil {
+	if params.Endpoint == "" {
 		return "", &errortypes.BadInput{
-			Message: "Unable to parse endpoint url template",
+			Message: "Tappx endpoint undefined",
 		}
 	}
 
-	if reqKey == "" {
+	if params.TappxKey == "" {
 		return "", &errortypes.BadInput{
 			Message: "Tappx key undefined",
 		}
 	}
 
-	if reqEndpoint == "" {
+	endpointParams := macros.EndpointTemplateParams{Host: params.Host}
+	host, err := macros.ResolveMacros(a.endpointTemplate, endpointParams)
+
+	if err != nil {
 		return "", &errortypes.BadInput{
-			Message: "Tappx endpoint undefined",
+			Message: "Unable to parse endpoint url template: " + err.Error(),
+		}
+	}
+
+	thisURI, err := url.Parse(host)
+
+	if err != nil {
+		return "", &errortypes.BadInput{
+			Message: "Malformed URL: " + err.Error(),
 		}
 	}
 
-	thisURI := host + params.Endpoint + "?tappxkey=" + params.TappxKey
+	thisURI.Path += params.Endpoint
+
+	queryParams := url.Values{}
+
+	queryParams.Add("tappxkey", params.TappxKey)
 
 	if test == 0 {
 		t := time.Now().UnixNano() / (int64(time.Millisecond) / int64(time.Nanosecond))
-		thisURI = thisURI + "&ts=" + strconv.Itoa(int(t))
+		queryParams.Add("ts", strconv.Itoa(int(t)))
 	}
 
-	thisURI = thisURI + "&v=" + TAPPX_BIDDER_VERSION
+	queryParams.Add("v", TAPPX_BIDDER_VERSION)
+
+	queryParams.Add("type_cnn", TYPE_CNN)
+
+	thisURI.RawQuery = queryParams.Encode()
 
-	return thisURI, nil
+	return thisURI.String(), nil
 }
 
 func (a *TappxAdapter) MakeBids(internalRequest *openrtb.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {

diff --git a/adapters/tappx/tappx_test.go b/adapters/tappx/tappx_test.go
@@ -2,10 +2,32 @@ package tappx
 
 import (
 	"github.com/prebid/prebid-server/adapters/adapterstest"
+	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/stretchr/testify/assert"
 	"net/http"
+	"regexp"
 	"testing"
 )
 
 func TestJsonSamples(t *testing.T) {
 	adapterstest.RunJSONBidderTest(t, "tappxtest", NewTappxBidder(new(http.Client), "https://{{.Host}}"))
 }
+
+func TestTsValue(t *testing.T) {
+	adapter := NewTappxBidder(new(http.Client), "https://{{.Host}}")
+	var test int
+	test = 0
+	var tappxExt openrtb_ext.ExtImpTappx
+	tappxExt.Host = "example.host.tappx.com"
+	tappxExt.Endpoint = "DUMMYENDPOINT"
+	tappxExt.TappxKey = "dummy-tappx-key"
+
+	url, err := adapter.buildEndpointURL(&tappxExt, test)
+
+	match, err := regexp.MatchString(`https://example\.host\.tappx\.com/DUMMYENDPOINT\?tappxkey=dummy-tappx-key&ts=[0-9]{13}&type_cnn=prebid&v=1\.1`, url)
+	if err != nil {
+		t.Errorf("Error while running regex validation: %s", err.Error())
+		return
+	}
+	assert.True(t, match)
+}
diff --git a/adapters/tappx/tappxtest/exemplary/single-banner-impression.json b/adapters/tappx/tappxtest/exemplary/single-banner-impression.json
@@ -13,7 +13,7 @@
          "bidder": {
             "tappxkey": "pub-12345-android-9876",
             "endpoint": "PREBIDTEMPLATE",
-            "host": "test.tappx.com/"
+            "host": "test.tappx.com"
           }
         }
       }
@@ -33,7 +33,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&v=1.0",
+        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&type_cnn=prebid&v=1.1",
         "body": {
           "id": "0000000000001",
           "test": 1,
@@ -48,7 +48,7 @@
                 "bidder": {
                   "tappxkey": "pub-12345-android-9876",
                   "endpoint": "PREBIDTEMPLATE",
-                 "host": "test.tappx.com/"
+                 "host": "test.tappx.com"
                 }
               }
             }

diff --git a/adapters/tappx/tappxtest/exemplary/single-video-impression.json b/adapters/tappx/tappxtest/exemplary/single-video-impression.json
@@ -16,7 +16,7 @@
           "bidder": {
             "tappxkey": "pub-12345-android-9876",
             "endpoint": "PREBIDTEMPLATE",
-            "host": "test.tappx.com/"
+            "host": "test.tappx.com"
           }
         }
       }
@@ -35,7 +35,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&v=1.0",
+        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&type_cnn=prebid&v=1.1",
         "body": {
           "id": "0000000000001",
           "test": 1,
@@ -52,7 +52,7 @@
               "ext": {
                 "bidder": {
                 "endpoint": "PREBIDTEMPLATE",
-                "host": "test.tappx.com/",
+                "host": "test.tappx.com",
                 "tappxkey": "pub-12345-android-9876"
                 }
               }

diff --git a/adapters/tappx/tappxtest/params/race/banner.json b/adapters/tappx/tappxtest/params/race/banner.json
@@ -1,5 +1,5 @@
 {
     "tappxkey": "pub-12345-android-9876",
     "endpoint": "PREBIDTEMPLATE",
-    "host": "test.tappx.com/"
+    "host": "test.tappx.com"
 }
diff --git a/adapters/tappx/tappxtest/params/race/video.json b/adapters/tappx/tappxtest/params/race/video.json
@@ -1,5 +1,5 @@
 {
     "tappxkey": "pub-12345-android-9876",
     "endpoint": "PREBIDTEMPLATE",
-    "host": "test.tappx.com/"
+    "host": "test.tappx.com"
 }
diff --git a/adapters/tappx/tappxtest/supplemental/204status.json b/adapters/tappx/tappxtest/supplemental/204status.json
@@ -13,7 +13,7 @@
           "bidder": {
             "tappxkey": "pub-12345-android-9876",
             "endpoint": "PREBIDTEMPLATE",
-            "host": "test.tappx.com/"
+            "host": "test.tappx.com"
           }
         }
       }
@@ -30,7 +30,7 @@
   "httpCalls": [
     {
       "expectedRequest": {
-        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&v=1.0",
+        "uri": "https://test.tappx.com/PREBIDTEMPLATE?tappxkey=pub-12345-android-9876&type_cnn=prebid&v=1.1",
         "body": {
           "id": "0000000000001",
           "test": 1,
@@ -45,7 +45,7 @@
                 "bidder": {
                   "tappxkey": "pub-12345-android-9876",
                   "endpoint": "PREBIDTEMPLATE",
-                  "host": "test.tappx.com/"
+                  "host": "test.tappx.com"
                 }
               }
             }

diff --git a/adapters/tappx/tappxtest/supplemental/banner-impression-badhost.json b/adapters/tappx/tappxtest/supplemental/banner-impression-badhost.json
@@ -0,0 +1,39 @@
+{
+  "mockBidRequest": {
+    "id": "0000000000001",
+    "imp": [
+      {
+        "id": "adunit-1",
+        "banner": {
+          "w": 300,
+          "h": 250
+        },
+        "ext": {
+          "bidder": {
+            "host": "example.ho%st.tappx.com",
+            "endpoint": "PREBIDTEMPLATE",
+            "tappxkey": "pub-12345-android-9876"
+          }
+        }
+      }
+    ],
+    "app": {
+      "id": "app_001",
+      "bundle": "com.rovio.angrybirds",
+      "publisher": {
+        "id": "2"
+      }
+    },
+    "user": {
+      "buyeruid": "A-38327932832"
+    }
+  },
+
+  "expectedMakeRequestsErrors": [
+    {
+      "value": "Malformed URL: parse https://example.ho%st.tappx.com: invalid URL escape \"%st\"",
+      "comparison": "literal"
+    }
+  ]
+
+}
diff --git a/adapters/tappx/tappxtest/supplemental/banner-impression-noendpoint.json b/adapters/tappx/tappxtest/supplemental/banner-impression-noendpoint.json
@@ -11,7 +11,7 @@
         "ext": {
           "bidder": {
             "tappxkey": "pub-12345-android-9876",
-            "host": "test.tappx.com/"
+            "host": "test.tappx.com"
           }
         }
       }

diff --git a/adapters/tappx/tappxtest/supplemental/banner-impression-nokey.json b/adapters/tappx/tappxtest/supplemental/banner-impression-nokey.json
@@ -11,7 +11,7 @@
         "ext": {
           "bidder": {
             "endpoint": "PREBIDTEMPLATE",
-            "host": "test.tappx.com/"
+            "host": "test.tappx.com"
           }
         }
       }