From fc9f9546ac2a0f782c892d48a558f05ce2c0a984 Mon Sep 17 00:00:00 2001
From: Jim Naumann <muncha@users.noreply.github.com>
Date: Tue, 8 Jun 2021 23:43:41 -0400
Subject: [PATCH] Beachfront: Fix for bid floor issue#1787 (#1878)

Co-authored-by: jim naumann <jim@beachfront.com>
---
 adapters/beachfront/beachfront.go             |  33 +-
 .../supplemental/banner-bad-request-400.json  |   2 +-
 .../supplemental/bidfloor-below-min.json      | 102 -----
 ...-four-variations-on-nothing-adm-video.json | 428 ++++++++++++++++++
 .../bidfloor-test-ext-wins-adm-video.json     | 124 +++++
 .../bidfloor-test-imp-wins-adm-video.json     | 125 +++++
 adapters/beachfront/params_test.go            |  36 +-
 static/bidder-params/beachfront.json          |  21 +-
 8 files changed, 747 insertions(+), 124 deletions(-)
 delete mode 100644 adapters/beachfront/beachfronttest/supplemental/bidfloor-below-min.json
 create mode 100644 adapters/beachfront/beachfronttest/supplemental/bidfloor-four-variations-on-nothing-adm-video.json
 create mode 100644 adapters/beachfront/beachfronttest/supplemental/bidfloor-test-ext-wins-adm-video.json
 create mode 100644 adapters/beachfront/beachfronttest/supplemental/bidfloor-test-imp-wins-adm-video.json

diff --git a/adapters/beachfront/beachfront.go b/adapters/beachfront/beachfront.go
index c5f6c4d5b1e..6eba9923e64 100644
--- a/adapters/beachfront/beachfront.go
+++ b/adapters/beachfront/beachfront.go
@@ -294,14 +294,12 @@ func getBannerRequest(request *openrtb2.BidRequest) (beachfrontBannerRequest, []
 			continue
 		}
 
+		setBidFloor(&beachfrontExt, &request.Imp[i])
+
 		slot := beachfrontSlot{
 			Id:       appid,
 			Slot:     request.Imp[i].ID,
-			Bidfloor: beachfrontExt.BidFloor,
-		}
-
-		if beachfrontExt.BidFloor <= minBidFloor {
-			slot.Bidfloor = 0
+			Bidfloor: request.Imp[i].BidFloor,
 		}
 
 		for j := 0; j < len(request.Imp[i].Banner.Format); j++ {
@@ -468,12 +466,7 @@ func getVideoRequests(request *openrtb2.BidRequest) ([]beachfrontVideoRequest, [
 		imp.Banner = nil
 		imp.Ext = nil
 		imp.Secure = &secure
-
-		if beachfrontExt.BidFloor <= minBidFloor {
-			imp.BidFloor = 0
-		} else {
-			imp.BidFloor = beachfrontExt.BidFloor
-		}
+		setBidFloor(&beachfrontExt, &imp)
 
 		if imp.Video.H == 0 && imp.Video.W == 0 {
 			imp.Video.W = defaultVideoWidth
@@ -564,6 +557,24 @@ func (a *BeachfrontAdapter) MakeBids(internalRequest *openrtb2.BidRequest, exter
 	return bidResponse, errs
 }
 
+func setBidFloor(ext *openrtb_ext.ExtImpBeachfront, imp *openrtb2.Imp) {
+	var floor float64
+
+	if imp.BidFloor > 0 {
+		floor = imp.BidFloor
+	} else if ext.BidFloor > 0 {
+		floor = ext.BidFloor
+	} else {
+		floor = minBidFloor
+	}
+
+	if floor <= minBidFloor {
+		floor = 0
+	}
+
+	imp.BidFloor = floor
+}
+
 func (a *BeachfrontAdapter) getBidType(externalRequest *adapters.RequestData) openrtb_ext.BidType {
 	t := strings.Split(externalRequest.Uri, "=")[0]
 	if t == a.extraInfo.VideoEndpoint {
diff --git a/adapters/beachfront/beachfronttest/supplemental/banner-bad-request-400.json b/adapters/beachfront/beachfronttest/supplemental/banner-bad-request-400.json
index 426499586f5..7463e2bf374 100644
--- a/adapters/beachfront/beachfronttest/supplemental/banner-bad-request-400.json
+++ b/adapters/beachfront/beachfronttest/supplemental/banner-bad-request-400.json
@@ -34,7 +34,7 @@
             {
               "slot": "",
               "id": "dudAppId",
-              "bidfloor": 5.02,
+              "bidfloor": 0.02,
               "sizes": [
                 {
                   "w": 300,
diff --git a/adapters/beachfront/beachfronttest/supplemental/bidfloor-below-min.json b/adapters/beachfront/beachfronttest/supplemental/bidfloor-below-min.json
deleted file mode 100644
index 70b89e5db1d..00000000000
--- a/adapters/beachfront/beachfronttest/supplemental/bidfloor-below-min.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "mockBidRequest": {
-    "id": "some_test_ad",
-    "site": {
-      "page": "https://some.domain.us/some/page.html"
-    },
-    "imp": [
-      {
-        "banner": {
-          "format": [
-            {
-              "w": 300,
-              "h": 250
-            }
-          ]
-        },
-        "ext": {
-          "bidder": {
-            "bidfloor": 0.002,
-            "appId": "bannerAppId1"
-          }
-        }
-      }
-    ]
-  },
-
-  "httpCalls": [
-    {
-      "expectedRequest": {
-        "uri": "https://qa.beachrtb.com/prebid_display",
-        "body": {
-          "slots": [
-            {
-              "slot": "",
-              "id": "bannerAppId1",
-              "bidfloor": 0,
-              "sizes": [
-                {
-                  "w": 300,
-                  "h": 250
-                }
-              ]
-            }
-          ],
-          "domain": "some.domain.us",
-          "page": "https://some.domain.us/some/page.html",
-          "real204": true,
-          "referrer": "",
-          "search": "",
-          "secure": 1,
-          "requestId": "some_test_ad",
-          "isMobile": 0,
-          "ip": "",
-          "deviceModel": "",
-          "deviceOs": "",
-          "dnt": 0,
-          "ua": "",
-          "adapterName": "BF_PREBID_S2S",
-          "adapterVersion": "0.9.2",
-          "user": {},
-          "schain": {
-            "complete": 0,
-            "nodes": null,
-            "ver": ""
-          }
-        }
-      },
-      "mockResponse": {
-        "status": 200,
-        "body": [
-          {
-            "crid": "crid_1",
-            "price": 2.942808,
-            "w": 300,
-            "h": 250,
-            "slot": "div-gpt-ad-1460505748561-0",
-            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
-          }
-        ]
-      }
-    }
-  ],
-  "expectedBidResponses": [
-    {
-      "bids": [
-        {
-          "bid": {
-            "id": "div-gpt-ad-1460505748561-0Banner",
-            "impid": "div-gpt-ad-1460505748561-0",
-            "price": 2.942808,
-            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
-            "crid": "crid_1",
-            "w": 300,
-            "h": 250
-          },
-          "type": "banner"
-        }
-      ]
-    }
-  ]
-}
-
diff --git a/adapters/beachfront/beachfronttest/supplemental/bidfloor-four-variations-on-nothing-adm-video.json b/adapters/beachfront/beachfronttest/supplemental/bidfloor-four-variations-on-nothing-adm-video.json
new file mode 100644
index 00000000000..ad63cbac59b
--- /dev/null
+++ b/adapters/beachfront/beachfronttest/supplemental/bidfloor-four-variations-on-nothing-adm-video.json
@@ -0,0 +1,428 @@
+{
+  "mockBidRequest": {
+    "id": "adm-video",
+    "imp": [
+      {
+        "id": "video1",
+        "ext": {
+          "bidder": {
+            "bidfloor": 0.01,
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }, {
+        "id": "video2",
+        "bidfloor": 0.01,
+        "ext": {
+          "bidder": {
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }, {
+        "id": "video3",
+        "ext": {
+          "bidder": {
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }, {
+        "id": "video4",
+        "bidfloor": 0.01,
+        "ext": {
+          "bidder": {
+            "bidfloor": 0.01,
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }
+    ],
+    "site": {
+      "page": "https://some.domain.us/some/page.html"
+    },
+    "device":{
+      "ip":"192.168.168.168"
+    }
+  },
+
+  "httpCalls": [
+    {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "id": "video1",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video1",
+                  "price": 20,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+    }, {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "id": "video2",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video2",
+                  "price": 20,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+    }, {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "id": "video3",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video3",
+                  "price": 20,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+    }, {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "id": "video4",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video4",
+                  "price": 20,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+
+    }
+  ],
+
+  "expectedBidResponses": [
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video1AdmVideo",
+            "impid": "video1",
+            "price": 20,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }, {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video2AdmVideo",
+            "impid": "video2",
+            "price": 20,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }, {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video3AdmVideo",
+            "impid": "video3",
+            "price": 20,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }, {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video4AdmVideo",
+            "impid": "video4",
+            "price": 20,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+
+    }
+  ]
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-ext-wins-adm-video.json b/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-ext-wins-adm-video.json
new file mode 100644
index 00000000000..6b898901496
--- /dev/null
+++ b/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-ext-wins-adm-video.json
@@ -0,0 +1,124 @@
+{
+  "mockBidRequest": {
+    "id": "adm-video",
+    "imp": [
+      {
+        "id": "video1",
+        "ext": {
+          "bidder": {
+            "bidfloor": 3.01,
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }
+    ],
+    "site": {
+      "page": "https://some.domain.us/some/page.html"
+    },
+    "device":{
+      "ip":"192.168.168.168"
+    }
+  },
+
+  "httpCalls": [
+    {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "bidfloor": 3.01,
+              "id": "video1",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video1",
+                  "price": 200,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+    }
+  ],
+
+  "expectedBidResponses": [
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video1AdmVideo",
+            "impid": "video1",
+            "price": 200,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }
+  ]
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-imp-wins-adm-video.json b/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-imp-wins-adm-video.json
new file mode 100644
index 00000000000..8ebb6967b32
--- /dev/null
+++ b/adapters/beachfront/beachfronttest/supplemental/bidfloor-test-imp-wins-adm-video.json
@@ -0,0 +1,125 @@
+{
+  "mockBidRequest": {
+    "id": "adm-video",
+    "imp": [
+      {
+        "id": "video1",
+        "bidfloor": 45.21,
+        "ext": {
+          "bidder": {
+            "bidfloor": 103.01,
+            "appId": "videoAppId1"
+          }
+        },
+        "video": {
+          "mimes": [
+            "video/mp4"
+          ],
+          "context": "instream",
+          "w": 300,
+          "h": 250
+        }
+      }
+    ],
+    "site": {
+      "page": "https://some.domain.us/some/page.html"
+    },
+    "device":{
+      "ip":"192.168.168.168"
+    }
+  },
+
+  "httpCalls": [
+    {
+      "expectedRequest": {
+        "uri": "https://qa.beachrtb.com/bid.json?exchange_id=videoAppId1",
+        "body": {
+          "id": "adm-video",
+          "imp": [
+            {
+              "video": {
+                "w": 300,
+                "h": 250,
+                "mimes": [
+                  "video/mp4"
+                ]
+              },
+              "bidfloor": 45.21,
+              "id": "video1",
+              "secure": 1
+            }
+          ],
+          "site": {
+            "page": "https://some.domain.us/some/page.html",
+            "domain": "some.domain.us"
+          },
+          "cur": [
+            "USD"
+          ],
+          "device":{
+            "devicetype": 2,
+            "ip":"192.168.168.168"
+          }
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "adm-video",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "5fd7c8a6ff2f1f0d42ee6427",
+                  "impid": "video1",
+                  "price": 200,
+                  "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+                  "adid": "1088",
+                  "adomain": [
+                    "beachfront.io"
+                  ],
+                  "cid": "277",
+                  "crid": "532",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "duration": 30
+                  }
+                }
+              ],
+              "seat": "bfio-s-1"
+            }
+          ]
+        }
+      }
+    }
+  ],
+
+  "expectedBidResponses": [
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "video1AdmVideo",
+            "impid": "video1",
+            "price": 200,
+            "adm": "<VAST version=\"2.0\"><Ad><Wrapper>http://example.com/vast.xml</Wrapper></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "duration": 30
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }
+  ]
+}
diff --git a/adapters/beachfront/params_test.go b/adapters/beachfront/params_test.go
index ebc0a768900..a387a2f0af3 100644
--- a/adapters/beachfront/params_test.go
+++ b/adapters/beachfront/params_test.go
@@ -34,10 +34,42 @@ func TestInvalidParams(t *testing.T) {
 }
 
 var validParams = []string{
-	`{"appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76", "bidfloor":0.01}`,
+	`{"appId":"eitherBannerOrVideoAppId", "bidfloor":9.21}`,
+	`{"appId":"eitherBannerOrVideoAppId", "bidfloor":9.23129837662781}`,
+	`{"appId":"eitherBannerOrVideoAppId", "bidfloor":0.01}`,
+	`{"appId":"eitherBannerOrVideoAppId", "bidfloor":0}`,
+	`{"appId":"eitherBannerOrVideoAppId"}`,
+	`{"appIds": {
+		"banner":"aBannerAppId"
+		}
+	}`,
+	`{"appIds": {
+		"video":"aVideoAppId"
+		}
+	}`,
+	`{"appIds": {
+		"video":"aVideoAppId",
+		"banner":"aBannerAppId"
+		}
+	}`,
+	`{"bidfloor":2.50,
+		"appIds": {
+			"video":"aVideoAppId",
+			"banner":"aBannerAppId"
+		},
+		"videoResponseType":"nurl"
+	}`,
 }
 
 var invalidParams = []string{
 	`{"appId":1176, "bidfloor":0.01}`,
-	`{"appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76"}`,
+	`{"appIds":"eitherBannerOrVideoAppId"}`,
+	`{"appIds":{"cerebralUplink":"cerebralUplinkAppId"}}`,
+	`{"appId":"eitherBannerOrVideoAppId",
+		"appIds": {
+			"video":"aVideoAppId",
+			"banner":"aBannerAppId"
+		}
+	}`,
+	`{}`,
 }
diff --git a/static/bidder-params/beachfront.json b/static/bidder-params/beachfront.json
index a7751b279cc..5b1e71a9ba8 100644
--- a/static/bidder-params/beachfront.json
+++ b/static/bidder-params/beachfront.json
@@ -4,7 +4,7 @@
   "description": "A schema which validates params accepted by the Beachfront adapter",
   "type": "object",
   "properties": {
-    "appId" : {
+    "appId": {
       "type": "string",
       "description": "The id of an inventory target. This can only be used in requests that contain one media type. It will be applied to all imps in the request."
     },
@@ -14,17 +14,23 @@
       "properties": {
         "video" : {
           "type": "string",
+          "title": "Video appId",
           "description": "An appId string that will be applied to video requests in this imp."
         },
         "banner" : {
           "type": "string",
+          "title": "Banner appId",
           "description": "An appId string that will be applied to banner requests in this imp."
         }
-      }
+      },
+      "anyOf":[
+        {"required":["video"]},
+        {"required":["banner"]}
+      ] 
     },
     "bidfloor": {
       "type": "number",
-      "description": "The price floor for the bid."
+      "description": "The price floor for the bid. Will override the bidfloor set for the impression."
     },
     "videoResponseType": {
       "type": "string",
@@ -32,9 +38,8 @@
     }
   },
 
-  "required": ["bidfloor"],
-  "oneOf": [{
-      "required": ["appId"] }, {
-      "required": ["appIds"]
-    }]
+  "oneOf": [
+    { "required": ["appIds"] },
+    { "required": ["appId"] }
+  ]
 }