Between Adapter: fix for issue#1718

prebid#1787 - removed bidfloor reading from bid ext; - since BetweenSSP supports default bidfloor, removed default bidfloor from code - removed bidfloor from test samples
egsk · May 28, 2021 · 2900fb5 · 2900fb5
1 parent 67b88ed
commit 2900fb5
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 34 deletions.
diff --git a/adapters/between/between.go b/adapters/between/between.go
@@ -22,7 +22,6 @@ type BetweenAdapter struct {
 
 // BetweenSSP requires bidfloor > 0.
 // If BidFloor of openrtb_ext.ExtImpBetween is zero, set it to defaultBidFloor value, see addImpProps
-const defaultBidfloor = 0.00001
 
 func (a *BetweenAdapter) MakeRequests(request *openrtb.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
 	var errors []error
@@ -126,19 +125,6 @@ func buildImpBanner(imp *openrtb.Imp) error {
 	return nil
 }
 
-// Add Between required properties to Imp object
-func addImpProps(imp *openrtb.Imp, secure *int8, betweenExt *openrtb_ext.ExtImpBetween) {
-	imp.Secure = secure
-	if betweenExt.BidFloor <= 0 {
-		imp.BidFloor = defaultBidfloor
-	} else {
-		imp.BidFloor = betweenExt.BidFloor
-	}
-	if betweenExt.BidFloorCur != "" {
-		imp.BidFloorCur = betweenExt.BidFloorCur
-	}
-}
-
 // Adding header fields to request header
 func addHeaderIfNonEmpty(headers http.Header, headerName string, headerValue string) {
 	if len(headerValue) > 0 {
@@ -167,9 +153,7 @@ func preprocess(request *openrtb.BidRequest) (*openrtb_ext.ExtImpBetween, []erro
 			errors = append(errors, err)
 			continue
 		}
-
-		addImpProps(&imp, &secure, betweenExt)
-
+		imp.Secure = &secure
 		if err := buildImpBanner(&imp); err != nil {
 			errors = append(errors, err)
 			continue

diff --git a/adapters/between/betweentest/exemplary/multi-request.json b/adapters/between/betweentest/exemplary/multi-request.json
@@ -71,7 +71,6 @@
                   "publisher_id": "1"
                 }
               },
-              "bidfloor": 1e-05,
               "secure": 0
             },
             {
@@ -92,7 +91,6 @@
                   "publisher_id": "1"
                 }
               },
-              "bidfloor": 1e-05,
               "secure": 0
             }
           ],

diff --git a/adapters/between/betweentest/exemplary/secure-detect.json b/adapters/between/betweentest/exemplary/secure-detect.json
@@ -46,7 +46,6 @@
                   "w": 728,
                   "h": 90
                 },
-                "bidfloor": 1e-05,
                 "secure": 1,
                 "ext": {
                   "bidder": {

diff --git a/adapters/between/betweentest/exemplary/simple-site-banner.json b/adapters/between/betweentest/exemplary/simple-site-banner.json
@@ -21,9 +21,7 @@
         "ext": {
           "bidder": {
             "host": "127.0.0.1",
-            "publisher_id": "1",
-            "bid_floor_cur": "RUB",
-            "bid_floor": 1000
+            "publisher_id": "1"
           }
         }
       }
@@ -48,15 +46,11 @@
                 "w": 728,
                 "h": 90
               },
-              "bidfloor": 1000,
-              "bidfloorcur": "RUB",
               "secure": 0,
               "ext": {
                 "bidder": {
                   "host": "127.0.0.1",
-                  "publisher_id": "1",
-                  "bid_floor_cur": "RUB",
-                  "bid_floor": 1000
+                  "publisher_id": "1"
                 }
               }
             }

diff --git a/adapters/between/betweentest/supplemental/bad-dsp-request-example.json b/adapters/between/betweentest/supplemental/bad-dsp-request-example.json
@@ -46,7 +46,6 @@
                 "w": 728,
                 "h": 90
               },
-              "bidfloor": 1e-05,
               "secure": 0,
               "ext": {
                 "bidder": {

diff --git a/adapters/between/betweentest/supplemental/bad-response-body.json b/adapters/between/betweentest/supplemental/bad-response-body.json
@@ -42,7 +42,6 @@
                 "w": 300,
                 "h": 250
               },
-              "bidfloor": 1e-05,
               "secure": 0,
               "ext": {
                 "bidder": {

diff --git a/adapters/between/betweentest/supplemental/dsp-server-internal-error-example.json b/adapters/between/betweentest/supplemental/dsp-server-internal-error-example.json
@@ -46,7 +46,6 @@
                 "w": 728,
                 "h": 90
               },
-              "bidfloor": 1e-05,
               "secure": 0,
               "ext": {
                 "bidder": {

diff --git a/adapters/between/betweentest/supplemental/no-bids.json b/adapters/between/betweentest/supplemental/no-bids.json
@@ -46,7 +46,6 @@
                 "w": 728,
                 "h": 90
               },
-              "bidfloor": 1e-05,
               "secure": 0,
               "ext": {
                 "bidder": {

diff --git a/adapters/between/betweentest/supplemental/unknown-status-code-example.json b/adapters/between/betweentest/supplemental/unknown-status-code-example.json
@@ -14,7 +14,6 @@
           "w": 728,
           "h": 90
         },
-        "bidfloor": 1e-05,
         "secure": 0,
         "ext": {
           "bidder": {
@@ -44,7 +43,6 @@
                 "w": 728,
                 "h": 90
               },
-              "bidfloor": 1e-05,
               "secure": 0,
               "ext": {
                 "bidder": {