diff --git a/src/main/java/org/prebid/server/auction/ExchangeService.java b/src/main/java/org/prebid/server/auction/ExchangeService.java index f33b2113d3d..10cdcb17486 100644 --- a/src/main/java/org/prebid/server/auction/ExchangeService.java +++ b/src/main/java/org/prebid/server/auction/ExchangeService.java @@ -1094,14 +1094,12 @@ private BidderBid updateBidderBidWithBidPriceChanges(BidderBid bidderBid, final ObjectNode bidExt = bid.getExt(); final ObjectNode updatedBidExt = bidExt != null ? bidExt : mapper.mapper().createObjectNode(); + updateExtWithOrigPriceValues(updatedBidExt, price, bidCurrency); + if (adjustedPrice.compareTo(price) != 0) { bid.setPrice(adjustedPrice); - addPropertyToNode(updatedBidExt, ORIGINAL_BID_CPM, new DecimalNode(price)); - } - // add origbidcur if conversion occurred - if (priceInAdServerCurrency.compareTo(price) != 0 && StringUtils.isNotBlank(bidCurrency)) { - addPropertyToNode(updatedBidExt, ORIGINAL_BID_CURRENCY, new TextNode(bidCurrency)); } + if (!updatedBidExt.isEmpty()) { bid.setExt(updatedBidExt); } @@ -1112,6 +1110,7 @@ private BidderBid updateBidderBidWithBidPriceChanges(BidderBid bidderBid, private static BidAdjustmentMediaType resolveBidAdjustmentMediaType(String bidImpId, List imps, BidType bidType) { + switch (bidType) { case banner: return BidAdjustmentMediaType.banner; @@ -1131,12 +1130,17 @@ private static BidAdjustmentMediaType resolveBidAdjustmentVideoMediaType(String .filter(imp -> imp.getId().equals(bidImpId)) .map(Imp::getVideo) .filter(Objects::nonNull) - .findFirst().orElse(null); - if (bidImpVideo == null || Objects.equals(bidImpVideo.getPlacement(), 1)) { - return BidAdjustmentMediaType.video; + .findFirst() + .orElse(null); + + if (bidImpVideo == null) { + return null; } - return BidAdjustmentMediaType.video_outstream; + final Integer placement = bidImpVideo.getPlacement(); + return placement == null || Objects.equals(placement, 1) + ? BidAdjustmentMediaType.video + : BidAdjustmentMediaType.video_outstream; } private static BigDecimal bidAdjustmentForBidder(String bidder, @@ -1175,7 +1179,14 @@ private static BigDecimal adjustPrice(BigDecimal priceAdjustmentFactor, BigDecim : price; } - private void addPropertyToNode(ObjectNode node, String propertyName, JsonNode propertyValue) { + private static void updateExtWithOrigPriceValues(ObjectNode updatedBidExt, BigDecimal price, String bidCurrency) { + addPropertyToNode(updatedBidExt, ORIGINAL_BID_CPM, new DecimalNode(price)); + if (StringUtils.isNotBlank(bidCurrency)) { + addPropertyToNode(updatedBidExt, ORIGINAL_BID_CURRENCY, new TextNode(bidCurrency)); + } + } + + private static void addPropertyToNode(ObjectNode node, String propertyName, JsonNode propertyValue) { node.set(propertyName, propertyValue); } diff --git a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java index 52a9bfee524..fec38e9c305 100644 --- a/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java +++ b/src/test/java/org/prebid/server/auction/ExchangeServiceTest.java @@ -20,6 +20,7 @@ import com.iab.openrtb.request.Regs; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.User; +import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; @@ -137,6 +138,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; +import static org.prebid.server.proto.openrtb.ext.response.BidType.video; public class ExchangeServiceTest extends VertxTest { @@ -2562,6 +2564,72 @@ public void shouldReturnBidsWithAdjustedPricesWhenAdjustmentFactorPresent() { .containsExactly(BigDecimal.valueOf(4.936)); } + @Test + public void shouldReturnBidsWithAdjustedPricesWithVideoInstreamMediaTypeIfVideoPlacementEqualsOne() { + // given + final Bidder bidder = mock(Bidder.class); + givenBidder("bidder", bidder, givenSeatBid(singletonList( + BidderBid.of(Bid.builder().impid("123").price(BigDecimal.valueOf(2)).build(), video, null)))); + + final ExtRequestBidadjustmentfactors givenAdjustments = ExtRequestBidadjustmentfactors.builder() + .mediatypes(new EnumMap<>(Collections.singletonMap(BidAdjustmentMediaType.video, + Collections.singletonMap("bidder", BigDecimal.valueOf(3.456))))) + .build(); + + final BidRequest bidRequest = givenBidRequest(singletonList(givenImp(singletonMap("bidder", 2), impBuilder -> + impBuilder.id("123").video(Video.builder().placement(1).build()))), + builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .aliases(emptyMap()) + .bidadjustmentfactors(givenAdjustments) + .auctiontimestamp(1000L) + .build()))); + + // when + exchangeService.holdAuction(givenRequestContext(bidRequest)).result(); + + // then + final List capturedBidResponses = captureBidResponses(); + assertThat(capturedBidResponses) + .extracting(BidderResponse::getSeatBid) + .flatExtracting(BidderSeatBid::getBids) + .extracting(BidderBid::getBid) + .extracting(Bid::getPrice) + .containsExactly(BigDecimal.valueOf(6.912)); + } + + @Test + public void shouldReturnBidsWithAdjustedPricesWithVideoInstreamMediaTypeIfVideoPlacementIsMissing() { + // given + final Bidder bidder = mock(Bidder.class); + givenBidder("bidder", bidder, givenSeatBid(singletonList( + BidderBid.of(Bid.builder().impid("123").price(BigDecimal.valueOf(2)).build(), video, null)))); + + final ExtRequestBidadjustmentfactors givenAdjustments = ExtRequestBidadjustmentfactors.builder() + .mediatypes(new EnumMap<>(Collections.singletonMap(BidAdjustmentMediaType.video, + Collections.singletonMap("bidder", BigDecimal.valueOf(3.456))))) + .build(); + + final BidRequest bidRequest = givenBidRequest(singletonList(givenImp(singletonMap("bidder", 2), impBuilder -> + impBuilder.id("123").video(Video.builder().build()))), + builder -> builder.ext(ExtRequest.of(ExtRequestPrebid.builder() + .aliases(emptyMap()) + .bidadjustmentfactors(givenAdjustments) + .auctiontimestamp(1000L) + .build()))); + + // when + exchangeService.holdAuction(givenRequestContext(bidRequest)).result(); + + // then + final List capturedBidResponses = captureBidResponses(); + assertThat(capturedBidResponses) + .extracting(BidderResponse::getSeatBid) + .flatExtracting(BidderSeatBid::getBids) + .extracting(BidderBid::getBid) + .extracting(Bid::getPrice) + .containsExactly(BigDecimal.valueOf(6.912)); + } + @Test public void shouldReturnBidsWithAdjustedPricesWhenAdjustmentMediaFactorPresent() { // given diff --git a/src/test/java/org/prebid/server/it/IntegrationTest.java b/src/test/java/org/prebid/server/it/IntegrationTest.java index 50562374cc7..b94ddb29a29 100644 --- a/src/test/java/org/prebid/server/it/IntegrationTest.java +++ b/src/test/java/org/prebid/server/it/IntegrationTest.java @@ -142,7 +142,7 @@ private static String cacheResponseFromRequestJson( final List responseCacheObjects = new ArrayList<>(); for (PutObject putItem : puts) { final String id = putItem.getType().equals("json") - ? putItem.getValue().get("id").textValue() + "@" + putItem.getValue().get("price") + ? putItem.getValue().get("id").textValue() + "@" + resolvePriceForJsonMediaType(putItem) : putItem.getValue().textValue(); final String uuid = jsonNodeMatcher.get(id).textValue(); @@ -154,6 +154,12 @@ private static String cacheResponseFromRequestJson( } } + private static String resolvePriceForJsonMediaType(PutObject putItem) { + final JsonNode extObject = putItem.getValue().get("ext"); + final JsonNode origBidCpm = extObject != null ? extObject.get("origbidcpm") : null; + return origBidCpm != null ? origBidCpm.toString() : putItem.getValue().get("price").toString(); + } + /** * Cache debug fields "requestbody" and "responsebody" are escaped JSON strings. * This comparator allows to compare them with actual values as usual JSON objects. diff --git a/src/test/resources/org/prebid/server/it/amp/test-cache-request.json b/src/test/resources/org/prebid/server/it/amp/test-cache-request.json index 7c28d6d1435..95464bcc14a 100644 --- a/src/test/resources/org/prebid/server/it/amp/test-cache-request.json +++ b/src/test/resources/org/prebid/server/it/amp/test-cache-request.json @@ -20,7 +20,8 @@ ] } ] - } + }, + "origbidcpm": 12.09 } } }, @@ -47,9 +48,11 @@ "bidder_id": 2, "bid_ad_type": 0, "ranking_price": 0.0 - } + }, + "origbidcpm": 5.5, + "origbidcur": "USD" } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json b/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json index aed8243dab0..61f318451dd 100644 --- a/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json +++ b/src/test/resources/org/prebid/server/it/cache/update/test-auction-response.json @@ -22,7 +22,8 @@ "hb_size_rubicon": "120x600", "hb_bidder_rubicon": "rubicon" } - } + }, + "origbidcpm": 4.26 } }, { @@ -64,7 +65,8 @@ 1 ] } - } + }, + "origbidcpm": 3 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json index abad9534372..0b93547a87d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-auction-acuityads-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-cache-acuityads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-cache-acuityads-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-cache-acuityads-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/acuityads/test-cache-acuityads-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adform/test-auction-adform-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adform/test-auction-adform-response.json index e0d90f1b57b..7576195d232 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adform/test-auction-adform-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adform/test-auction-adform-response.json @@ -36,7 +36,7 @@ } }, "origbidcpm": 0.5, - "origbidcur" : "USD" + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adform/test-cache-adform-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adform/test-cache-adform-request.json index b215a87b2ae..26a321bbb8e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adform/test-cache-adform-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adform/test-cache-adform-request.json @@ -10,9 +10,9 @@ "crid": "crid12", "w": 400, "h": 300, - "ext" : { - "origbidcpm" : 0.5, - "origbidcur" : "USD" + "ext": { + "origbidcpm": 0.5, + "origbidcur": "USD" } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json index 993b88788f9..d90d275e956 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-auction-adgeneration-response.json @@ -37,7 +37,9 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 46.6, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-cache-adgeneration-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-cache-adgeneration-request.json index 63fb9c70fc4..4bb4c33440d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-cache-adgeneration-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adgeneration/test-cache-adgeneration-request.json @@ -10,8 +10,12 @@ "crid": "Dummy_supership.jp", "dealid": "test-deal-id", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 46.6, + "origbidcur": "USD" + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json index 8b389a3c4d4..d624b162f8f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-auction-adhese-response.json @@ -40,7 +40,9 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 1.00, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-cache-adhese-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-cache-adhese-request.json index d2827ac7466..348ad5694e8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-cache-adhese-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adhese/test-cache-adhese-request.json @@ -12,9 +12,11 @@ "w": 728, "h": 90, "ext": { - "adType": "leaderboard" + "adType": "leaderboard", + "origbidcpm": 1, + "origbidcur": "USD" } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json index ef8116a9727..48a11b705a1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-auction-adkernel-response.json @@ -35,7 +35,8 @@ "cacheId": "71615e3d-8a18-4099-a807-3952199b532a" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-cache-adkernel-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-cache-adkernel-request.json index 24e8a750053..46e0f16459f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-cache-adkernel-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkernel/test-cache-adkernel-request.json @@ -12,7 +12,10 @@ "tag-example.com" ], "cid": "1001", - "crid": "2002" + "crid": "2002", + "ext": { + "origbidcpm": 2.25 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json index 19e0218fcf8..f97e4ebd45a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-auction-adkerneladn-response.json @@ -45,7 +45,8 @@ "cacheId": "a3558327-7696-4606-a5e9-43413bd7faea" } } - } + }, + "origbidcpm": 2.25 } }, { @@ -87,7 +88,8 @@ "cacheId": "aedec380-879a-4029-8e7a-5a51676c887c" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-cache-adkerneladn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-cache-adkerneladn-request.json index 5c65a9406db..7328b9759fd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-cache-adkerneladn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adkerneladn/test-cache-adkerneladn-request.json @@ -15,7 +15,10 @@ "crid": "crid022", "cat": [ "IAB2" - ] + ], + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -35,7 +38,10 @@ "IAB2" ], "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 0.5 + } } }, { @@ -44,4 +50,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json index 9aced8de0dc..2562e18083c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-auction-adman-response.json @@ -34,7 +34,8 @@ "cacheId": "9092799c-93b0-4e11-a232-2c0151d5d275" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -83,7 +84,8 @@ "cacheId": "99dc3357-34ac-4819-9f68-0820039a542f" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-cache-adman-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-cache-adman-request.json index 58471d39985..c393baa5ecf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adman/test-cache-adman-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adman/test-cache-adman-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -29,7 +32,10 @@ "IAB2" ], "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -38,4 +44,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json index 11c619ffa29..a5daef3a66a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-auction-admixer-response.json @@ -31,7 +31,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 }, "id": "1", "impid": "impId001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-cache-admixer-request.json b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-cache-admixer-request.json index c6692479e4a..cdadbec00c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-cache-admixer-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/admixer/test-cache-admixer-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json index c8de82b117d..540c539d72b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-auction-adocean-response.json @@ -34,7 +34,9 @@ "cacheId": "ca2a4dd3-f974-4eff-be5c-986bf4e083ce" } } - } + }, + "origbidcpm": 10, + "origbidcur": "EUR" } } ], @@ -56,7 +58,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"adoceanmyaozpniqismex\",\"impid\":\"impId12\",\"price\":10,\"adm\":\" \",\"crid\":\"0af345b42983cc4bc0\",\"w\":300,\"h\":250}}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"adoceanmyaozpniqismex\",\"impid\":\"impId12\",\"price\":10,\"adm\":\" \",\"crid\":\"0af345b42983cc4bc0\",\"w\":300,\"h\":250,\"ext\":{\"origbidcpm\":10,\"origbidcur\":\"EUR\"}}}]}", "responsebody": "{\"responses\":[{\"uuid\":\"ca2a4dd3-f974-4eff-be5c-986bf4e083ce\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-cache-adocean-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-cache-adocean-request.json index 950f2ead307..ff29e737082 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-cache-adocean-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adocean/test-cache-adocean-request.json @@ -9,8 +9,12 @@ "adm": " ", "crid": "0af345b42983cc4bc0", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 10, + "origbidcur": "EUR" + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json index 8d2191746a6..994436d63d4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-auction-adoppler-response.json @@ -37,6 +37,7 @@ } } }, + "origbidcpm": 3.33, "bidder": { "ads": { "video": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-cache-adoppler-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-cache-adoppler-request.json index 0acc8877698..84882986b0a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-cache-adoppler-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adoppler/test-cache-adoppler-request.json @@ -19,9 +19,10 @@ "video": { "duration": 121 } - } + }, + "origbidcpm": 3.33 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json index 592b15c557f..7a5b68f431e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-auction-adot-response.json @@ -35,6 +35,7 @@ } } }, + "origbidcpm": 1.16346, "bidder": { "adot": { "media_type": "banner" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-cache-adot-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-cache-adot-request.json index 108b95bc4ca..b819f42ff94 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adot/test-cache-adot-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adot/test-cache-adot-request.json @@ -13,7 +13,8 @@ "ext": { "adot": { "media_type": "banner" - } + }, + "origbidcpm": 1.16346 } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json index d364f881b12..9be20ec68ab 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-auction-adpone-response.json @@ -36,7 +36,8 @@ "cacheId": "01005d2c-555d-41c6-995d-335663819de0" } } - } + }, + "origbidcpm": 6.66 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-cache-adpone-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-cache-adpone-request.json index 8b7ec8bb518..81b4d940e3d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-cache-adpone-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adpone/test-cache-adpone-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 6.66 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json index 61b973e5af7..5f8730c2da0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-auction-adprime-response.json @@ -34,7 +34,8 @@ "cacheId": "9092799c-93b0-4e11-a232-2c0151d5d275" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -83,7 +84,8 @@ "cacheId": "99dc3357-34ac-4819-9f68-0820039a542f" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-cache-adprime-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-cache-adprime-request.json index 58471d39985..c393baa5ecf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-cache-adprime-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adprime/test-cache-adprime-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -29,7 +32,10 @@ "IAB2" ], "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -38,4 +44,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json index c6f9798b729..9f8315b4af2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-auction-adtarget-response.json @@ -34,7 +34,8 @@ "cacheId": "f5c5f34c-ad41-4894-b42b-dd5c86978a4a" } } - } + }, + "origbidcpm": 8.43 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-cache-adtarget-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-cache-adtarget-request.json index 25d582fd85c..1435c8dccf3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-cache-adtarget-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtarget/test-cache-adtarget-request.json @@ -9,8 +9,11 @@ "adm": "adm14", "crid": "crid14", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 8.43 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json index 4eeef9fce47..b35f2382588 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-auction-adtelligent-response.json @@ -34,7 +34,8 @@ "cacheId": "f5c5f34c-ad41-4894-b42b-dd5c86978a4a" } } - } + }, + "origbidcpm": 8.43 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-cache-adtelligent-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-cache-adtelligent-request.json index 25d582fd85c..1435c8dccf3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-cache-adtelligent-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adtelligent/test-cache-adtelligent-request.json @@ -9,8 +9,11 @@ "adm": "adm14", "crid": "crid14", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 8.43 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json index 6bdcf3da2fa..ce7b7a00b09 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-auction-advangelists-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-cache-advangelists-request.json b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-cache-advangelists-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-cache-advangelists-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/advangelists/test-cache-advangelists-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json index 91534243c49..41b4e26b7a2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-auction-aja-response.json @@ -46,7 +46,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 9.99 } }, { @@ -82,7 +83,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-cache-aja-request.json b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-cache-aja-request.json index d354d797b62..fd30a5cc539 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/aja/test-cache-aja-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/aja/test-cache-aja-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -28,7 +31,10 @@ "cid": "cid002", "crid": "crid002", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.99 + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json index 6945a023670..ffd21bb3c2e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-auction-amx-response.json @@ -34,6 +34,7 @@ } } }, + "origbidcpm": 0.01, "bidder": { "himp": [ "https://example.com/imp-tracker/pixel.gif?param=1¶m2=2" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-cache-amx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-cache-amx-request.json index 1abde115df3..edf786668eb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/amx/test-cache-amx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/amx/test-cache-amx-request.json @@ -15,7 +15,8 @@ "himp": [ "https://example.com/imp-tracker/pixel.gif?param=1¶m2=2" ], - "startdelay": 0 + "startdelay": 0, + "origbidcpm": 0.01 } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-auction-applogy-response.json b/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-auction-applogy-response.json index f5d2424bf08..761a1500a26 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-auction-applogy-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-auction-applogy-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -79,7 +80,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 5.55 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-cache-applogy-request.json b/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-cache-applogy-request.json index 883ffec2c36..53a307b9388 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-cache-applogy-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/applogy/test-cache-applogy-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 5.55 + } } }, { @@ -34,4 +40,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json index 5b0c273da41..e9aedf3778f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-auction-avocet-response.json @@ -52,7 +52,8 @@ "cacheId": "ce120de7-25d0-4384-8983-8a9462149c8c" } } - } + }, + "origbidcpm": 0.5 } } ], @@ -67,7 +68,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"api\":1,\"w\":1024,\"h\":576,\"ext\":{\"avocet\":{\"duration\":30}}}},{\"type\":\"xml\",\"value\":\"some-test-ad\",\"expiry\":120}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"api\":1,\"w\":1024,\"h\":576,\"ext\":{\"avocet\":{\"duration\":30},\"origbidcpm\":0.5}}},{\"type\":\"xml\",\"value\":\"some-test-ad\",\"expiry\":120}]}", "responsebody": "{\"responses\":[{\"uuid\":\"78f9a6dd-d08c-4b80-ba0f-0159b9add9bf\"},{\"uuid\":\"ce120de7-25d0-4384-8983-8a9462149c8c\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-cache-avocet-request.json b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-cache-avocet-request.json index 859a825806c..5d81aa72f02 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-cache-avocet-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/avocet/test-cache-avocet-request.json @@ -19,7 +19,8 @@ "ext": { "avocet": { "duration": 30 - } + }, + "origbidcpm": 0.500000 } } }, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json index b98f55e0f01..f8d297a7434 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-auction-beachfront-response.json @@ -34,7 +34,9 @@ "cacheId": "9c33f779-d352-4d85-8ad2-8a245dc276ce" } } - } + }, + "origbidcpm": 2.942807912826538, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-cache-beachfront-request.json b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-cache-beachfront-request.json index 66f5085cd81..a02c60a8931 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-cache-beachfront-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beachfront/test-cache-beachfront-request.json @@ -9,8 +9,12 @@ "adm": "
", "crid": "crid_3", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 2.942807912826538, + "origbidcur": "USD" + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-request.json b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-request.json index f22fe111f8d..77bf6494d39 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-request.json @@ -50,7 +50,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json index 6487685eeaf..be20b61a166 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-auction-beintoo-response.json @@ -35,7 +35,9 @@ "cacheId": "9a5d11a7-de5a-4ce4-8e89-d37f18a10045" } } - } + }, + "origbidcpm": 2.942808, + "origbidcur": "USD" } } ], @@ -45,116 +47,6 @@ ], "cur": "USD", "ext": { - "debug": { - "httpcalls": { - "beintoo": [ - { - "uri": "{{ beintoo.exchange_uri }}", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"uuid\",\"banner\":{\"format\":[],\"w\":300,\"h\":250},\"tagid\":\"25251\",\"secure\":0}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"Android Chrome/60\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"BT-UID\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"some_test_auction\",\"seatbid\":[{\"seat\":\"12356\",\"bid\":[{\"id\":\"uuid\",\"adm\":\"
\",\"impid\":\"uuid\",\"ttl\":300,\"crid\":\"94395500\",\"w\":300,\"price\":2.942808,\"adid\":\"94395500\",\"h\":250}]}],\"cur\":\"USD\"}", - "status": 200 - } - ], - "cache": [ - { - "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"uuid\",\"impid\":\"uuid\",\"price\":2.942808,\"adm\":\"
\",\"adid\":\"94395500\",\"crid\":\"94395500\",\"w\":300,\"h\":250}}]}", - "responsebody": "{\"responses\":[{\"uuid\":\"9a5d11a7-de5a-4ce4-8e89-d37f18a10045\"}]}", - "status": 200 - } - ] - }, - "resolvedrequest": { - "id": "tid", - "imp": [ - { - "id": "uuid", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "ext": { - "prebid": { - "bidder": { - "beintoo": { - "tagid": "25251" - } - } - } - } - } - ], - "site": { - "domain": "example.com", - "page": "http://www.example.com", - "publisher": { - "id": "publisherId" - }, - "ext": { - "amp": 0 - } - }, - "device": { - "ua": "Android Chrome/60", - "dnt": 2, - "ip": "193.168.244.1", - "pxratio": 4.2, - "language": "en", - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], - "source": { - "fd": 1, - "tid": "tid" - }, - "regs": { - "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } - } - } - } - }, "responsetimemillis": { "cache": "{{ cache.response_time_ms }}", "beintoo": "{{ beintoo.response_time_ms }}" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-beintoo-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-beintoo-bid-request.json index 7948350ea6e..d39a70171d6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-beintoo-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-beintoo-bid-request.json @@ -52,7 +52,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-cache-beintoo-request.json b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-cache-beintoo-request.json index e1f7a597707..ab94570d5cc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-cache-beintoo-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/beintoo/test-cache-beintoo-request.json @@ -10,7 +10,11 @@ "price": 2.942808, "crid": "94395500", "adid": "94395500", - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 2.942808, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json b/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json index 0e8a1ffcae8..42331a0d7fd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/between/test-auction-between-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/between/test-cache-between-request.json b/src/test/resources/org/prebid/server/it/openrtb2/between/test-cache-between-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/between/test-cache-between-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/between/test-cache-between-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-auction-brightroll-response.json b/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-auction-brightroll-response.json index 0ad98b1147b..2143fa051e0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-auction-brightroll-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-auction-brightroll-response.json @@ -34,7 +34,8 @@ "cacheId": "3c7dedc8-dd68-4ba3-ba27-9d4e933cd4b3" } } - } + }, + "origbidcpm": 8.43 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-cache-brightroll-request.json b/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-cache-brightroll-request.json index e63ae15fab1..6c9031bfb98 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-cache-brightroll-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/brightroll/test-cache-brightroll-request.json @@ -9,8 +9,11 @@ "adm": "adm17", "crid": "crid17", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 8.43 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json index 092d59b8a0b..07870d131b3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-auction-colossus-response.json @@ -34,7 +34,8 @@ "cacheId": "9092799c-93b0-4e11-a232-2c0151d5d275" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -83,7 +84,8 @@ "cacheId": "99dc3357-34ac-4819-9f68-0820039a542f" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-cache-colossus-request.json b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-cache-colossus-request.json index 58471d39985..c393baa5ecf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-cache-colossus-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/colossus/test-cache-colossus-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -29,7 +32,10 @@ "IAB2" ], "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -38,4 +44,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json index b7e1cc8a733..0fae2a3a710 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-auction-connectad-response.json @@ -34,7 +34,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-cache-connectad-request.json b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-cache-connectad-request.json index c6692479e4a..cdadbec00c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-cache-connectad-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/connectad/test-cache-connectad-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json index e78b04b6df8..dad5c8d7b4a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-auction-consumable-response.json @@ -35,7 +35,8 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-cache-consumable-request.json b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-cache-consumable-request.json index e15f6f829c4..4b8401a4022 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-cache-consumable-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/consumable/test-cache-consumable-request.json @@ -10,9 +10,12 @@ "crid": "1234567890", "w": 300, "h": 250, - "exp": 30 + "exp": 30, + "ext": { + "origbidcpm": 0.5 + } }, "expiry": 30 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json b/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json index 2a6bc6f5e3c..9777151aa0e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-auction-conversant-response.json @@ -34,7 +34,8 @@ "cacheId": "618de608-9f7d-4152-82bf-81d34a617cfc" } } - } + }, + "origbidcpm": 5.0 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-cache-conversant-request.json b/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-cache-conversant-request.json index 04019dc5b72..c03ef8836a4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-cache-conversant-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/conversant/alias/test-cache-conversant-request.json @@ -9,8 +9,11 @@ "adm": "adm4", "crid": "crid4", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 5 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json b/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json index 06c5adcab7b..a58466548d0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-auction-conversant-response.json @@ -34,7 +34,8 @@ "cacheId": "c9eb3deb-2054-40f5-9cf3-f9047dc240a2" } } - } + }, + "origbidcpm": 6.0 } }, { @@ -75,7 +76,8 @@ "cacheId": "8300a9d5-4654-4406-b6b9-7bc5060e8a36" } } - } + }, + "origbidcpm": 5.0 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-cache-conversant-request.json b/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-cache-conversant-request.json index 05883337b06..8bdf96b6f6c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-cache-conversant-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/conversant/test-cache-conversant-request.json @@ -9,7 +9,10 @@ "adm": "adm4", "crid": "crid4", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 6 + } } }, { @@ -21,7 +24,10 @@ "adm": "adm41", "crid": "crid41", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 5 + } } }, { @@ -30,4 +36,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json index 4f09a89542b..48cee000fce 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-auction-cpmstar-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -79,7 +80,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 5.55 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-cache-cpmstar-request.json b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-cache-cpmstar-request.json index 883ffec2c36..53a307b9388 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-cache-cpmstar-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/cpmstar/test-cache-cpmstar-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 5.55 + } } }, { @@ -34,4 +40,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-request.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-request.json index 6282fac2e20..efa548099d7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-request.json @@ -66,7 +66,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, @@ -97,4 +96,4 @@ "gdpr": 0 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json index c72cf8a0c3b..f0a3d32d2b4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-auction-datablocks-response.json @@ -46,7 +46,8 @@ "cacheId": "62019cff-d657-42fc-8366-16c34e1fd28c" } } - } + }, + "origbidcpm": 9.99 } }, { @@ -82,7 +83,8 @@ "cacheId": "c1662cf6-f00a-4066-b71a-46d97abccc35" } } - } + }, + "origbidcpm": 7.77 } } ], @@ -92,144 +94,6 @@ ], "cur": "USD", "ext": { - "debug": { - "httpcalls": { - "cache": [ - { - "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adm\":\"adm001\",\"adid\":\"adid001\",\"cid\":\"cid001\",\"crid\":\"crid001\",\"w\":300,\"h\":250}},{\"type\":\"json\",\"value\":{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"nurl\":\"https://example.com/nurl\",\"adm\":\"prebid.org wrapper\",\"adomain\":[\"psacentral.org\"],\"cid\":\"cid002\",\"crid\":\"crid002\",\"w\":300,\"h\":250}},{\"type\":\"xml\",\"value\":\"prebid.org wrapper\",\"expiry\":120}]}", - "responsebody": "{\"responses\":[{\"uuid\":\"c1662cf6-f00a-4066-b71a-46d97abccc35\"},{\"uuid\":\"dbaa191c-5a56-4655-85eb-da079f94e09f\"},{\"uuid\":\"62019cff-d657-42fc-8366-16c34e1fd28c\"}]}", - "status": 200 - } - ], - "datablocks": [ - { - "uri": "{{ datablocks.exchange_uri }}?sid=2", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId002\",\"video\":{\"mimes\":[\"video/mp4\"],\"w\":300,\"h\":250,\"pos\":1},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":2}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"DB-UID\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"crid\":\"crid002\",\"cid\":\"cid002\",\"nurl\":\"https://example.com/nurl\",\"adomain\":[\"psacentral.org\"],\"h\":250,\"w\":300}],\"seat\":\"datablocks\"}]}", - "status": 200 - }, - { - "uri": "{{ datablocks.exchange_uri }}?sid=1", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId001\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}]},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":1}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"DB-UID\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adid\":\"adid001\",\"crid\":\"crid001\",\"cid\":\"cid001\",\"adm\":\"adm001\",\"h\":250,\"w\":300}],\"seat\":\"datablocks\"}]}", - "status": 200 - } - ] - }, - "resolvedrequest": { - "id": "tid", - "imp": [ - { - "id": "impId001", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "ext": { - "prebid": { - "bidder": { - "datablocks": { - "host": "localhost:8090", - "sourceId": 1 - } - } - } - } - }, - { - "id": "impId002", - "video": { - "mimes": [ - "video/mp4" - ], - "w": 300, - "h": 250, - "pos": 1 - }, - "ext": { - "prebid": { - "bidder": { - "datablocks": { - "host": "localhost:8090", - "sourceId": 2 - } - } - } - } - } - ], - "site": { - "domain": "example.com", - "page": "http://www.example.com", - "publisher": { - "id": "publisherId" - }, - "ext": { - "amp": 0 - } - }, - "device": { - "ua": "userAgent", - "dnt": 2, - "ip": "193.168.244.1", - "pxratio": 4.2, - "language": "en", - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], - "source": { - "fd": 1, - "tid": "tid" - }, - "regs": { - "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } - } - } - } - }, "responsetimemillis": { "datablocks": "{{ datablocks.response_time_ms }}", "cache": "{{ cache.response_time_ms }}" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-cache-datablocks-request.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-cache-datablocks-request.json index abf2fab21df..bb6e149acf3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-cache-datablocks-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-cache-datablocks-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 7.77 + } } }, { @@ -28,7 +31,10 @@ "cid": "cid002", "crid": "crid002", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.99 + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-1.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-1.json index d83e947f165..83cb6e14a8d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-1.json @@ -59,7 +59,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, @@ -85,4 +84,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-2.json b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-2.json index 0352ce9e783..0034fc7b142 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-2.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/datablocks/test-datablocks-bid-request-2.json @@ -59,7 +59,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, @@ -85,4 +84,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json index 25d77da5ec2..9050d8c2de1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-auction-deepintent-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-cache-deepintent-request.json b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-cache-deepintent-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-cache-deepintent-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/deepintent/test-cache-deepintent-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json index 578a2e07b4d..954f2eaf1eb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-auction-dmx-response.json @@ -33,7 +33,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-cache-dmx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-cache-dmx-request.json index d969bb8dc78..c7f7c6561f7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-cache-dmx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/dmx/test-cache-dmx-request.json @@ -9,9 +9,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json index 74d80b920ab..2265d6910b5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-auction-emxdigital-response.json @@ -35,7 +35,9 @@ "cacheId": "9a5d11a7-de5a-4ce4-8e89-d37f18a10045" } } - } + }, + "origbidcpm": 2.942808, + "origbidcur": "USD" } } ], @@ -58,7 +60,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"uuid\",\"impid\":\"uuid\",\"price\":2.942808,\"adm\":\"
\",\"adid\":\"94395500\",\"crid\":\"94395500\",\"w\":300,\"h\":250}}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"uuid\",\"impid\":\"uuid\",\"price\":2.942808,\"adm\":\"
\",\"adid\":\"94395500\",\"crid\":\"94395500\",\"w\":300,\"h\":250,\"ext\":{\"origbidcpm\":2.942808,\"origbidcur\":\"USD\"}}}]}", "responsebody": "{\"responses\":[{\"uuid\":\"9a5d11a7-de5a-4ce4-8e89-d37f18a10045\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-cache-emxdigital-request.json b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-cache-emxdigital-request.json index e1f7a597707..ab94570d5cc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-cache-emxdigital-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/emxdigital/test-cache-emxdigital-request.json @@ -10,7 +10,11 @@ "price": 2.942808, "crid": "94395500", "adid": "94395500", - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 2.942808, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-auction-engagebdr-response.json b/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-auction-engagebdr-response.json index 220d77bd2dc..f81e3bc43f8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-auction-engagebdr-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-auction-engagebdr-response.json @@ -47,7 +47,9 @@ "cacheId": "6628e262-d023-406b-b3e9-9a9aded76a7d" } } - } + }, + "origbidcpm": 9.81, + "origbidcur": "USD" } }, { @@ -87,7 +89,9 @@ "cacheId": "739f1ac0-3ac3-4c02-8b74-ceb1fa4d96a1" } } - } + }, + "origbidcpm": 9.81, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-cache-engagebdr-request.json b/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-cache-engagebdr-request.json index f331fc452b9..ca658c64465 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-cache-engagebdr-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/engagebdr/test-cache-engagebdr-request.json @@ -15,7 +15,11 @@ "cid": "campaign1", "crid": "abcde-12345", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.81, + "origbidcur": "USD" + } } }, { @@ -33,7 +37,11 @@ "cid": "campaign1", "crid": "abcde-12345", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.81, + "origbidcur": "USD" + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json index f5f19965a02..28957592517 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-auction-eplanning-response.json @@ -35,7 +35,8 @@ "cacheId": "6fb008f6-9e09-43ad-830b-ffed21345119" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-cache-eplanning-request.json b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-cache-eplanning-request.json index 99455d2b388..12332199b4e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-cache-eplanning-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/eplanning/test-cache-eplanning-request.json @@ -10,8 +10,11 @@ "adid": "adid12345", "crid": "abcdef123456789", "w": 600, - "h": 300 + "h": 300, + "ext": { + "origbidcpm": 0.5 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-auction-facebook-response.json b/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-auction-facebook-response.json index b6addc2d715..99320a8e3b4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-auction-facebook-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-auction-facebook-response.json @@ -35,7 +35,8 @@ "cacheId": "446d71ac-0337-4871-9fda-4552323a269b" } } - } + }, + "origbidcpm": 10.0 } }, { @@ -70,7 +71,8 @@ "cacheId": "3d90394a-0301-4faf-b0e8-5d26a88f6ef0" } } - } + }, + "origbidcpm": 9.0 } }, { @@ -112,7 +114,8 @@ "cacheId": "6d7addba-3984-4a69-b84f-6f1daa02b407" } } - } + }, + "origbidcpm": 15.0 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-cache-facebook-request.json b/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-cache-facebook-request.json index b166d3f5a8b..0242592d867 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-cache-facebook-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/facebook/test-cache-facebook-request.json @@ -10,7 +10,10 @@ "adid": "10", "crid": "10", "w": 0, - "h": 0 + "h": 0, + "ext": { + "origbidcpm": 15 + } } }, { @@ -23,7 +26,10 @@ "adid": "10", "crid": "10", "w": 0, - "h": 0 + "h": 0, + "ext": { + "origbidcpm": 10 + } } }, { @@ -36,7 +42,10 @@ "adid": "10", "crid": "10", "w": 0, - "h": 50 + "h": 50, + "ext": { + "origbidcpm": 9 + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json index ba9bb7be433..cc55636d5e0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-auction-gamma-response.json @@ -39,7 +39,9 @@ "cacheId": "7e703396-6b75-4a10-9ef3-bc61ca7ce437" } } - } + }, + "origbidcpm": 0.5, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-cache-gamma-request.json b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-cache-gamma-request.json index 88543083ace..f22078d8d15 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-cache-gamma-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamma/test-cache-gamma-request.json @@ -14,7 +14,11 @@ "cid": "958", "crid": "29681110", "h": 250, - "w": 300 + "w": 300, + "ext": { + "origbidcpm": 0.500000, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json index 39e226734ab..07acaeb922e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-auction-gamoshi-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -79,7 +80,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 5.55 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-cache-gamoshi-request.json b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-cache-gamoshi-request.json index 883ffec2c36..53a307b9388 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-cache-gamoshi-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gamoshi/test-cache-gamoshi-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 5.55 + } } }, { @@ -34,4 +40,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json index 8b377341d58..b42e942dab7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-auction-grid-response.json @@ -36,7 +36,8 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-cache-grid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-cache-grid-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/grid/test-cache-grid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/grid/test-cache-grid-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json index 800002e5d10..2e47a9fd3f4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-auction-gumgum-response.json @@ -32,7 +32,8 @@ "cacheId": "78f9a6dd-d08c-4b80-ba0f-0159b9add9bf" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -64,7 +65,8 @@ "cacheId": "eaf3e2cd-57af-42d1-9daf-38836ae7bca7" } } - } + }, + "origbidcpm": 2 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-cache-gumgum-request.json b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-cache-gumgum-request.json index 40f661376f1..da9c4a20184 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-cache-gumgum-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/gumgum/test-cache-gumgum-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "adid": "adid001", "cid": "cid001", - "crid": "crid001" + "crid": "crid001", + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -21,8 +24,11 @@ "adm": "adm002", "adid": "adid002", "cid": "cid002", - "crid": "crid002" + "crid": "crid002", + "ext": { + "origbidcpm": 2 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json index 90aec3ab37d..5c54a7d91b3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-auction-improvedigital-response.json @@ -36,7 +36,8 @@ "cacheId": "83dedee7-ebfe-4224-a71b-d7fb4a43b7a9" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-cache-improvedigital-request.json b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-cache-improvedigital-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-cache-improvedigital-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/improvedigital/test-cache-improvedigital-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json index 131053efa04..de597b7c6eb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-auction-inmobi-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-cache-inmobi-request.json b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-cache-inmobi-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-cache-inmobi-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/inmobi/test-cache-inmobi-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json index 9952ed75d9e..808afd59e82 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-auction-invibes-response.json @@ -36,7 +36,9 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 1.3, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-cache-invibes-request.json b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-cache-invibes-request.json index 9a4d245261e..e9b35443c42 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-cache-invibes-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/invibes/test-cache-invibes-request.json @@ -11,7 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.3, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json index 62ce4780571..d27caa71b1b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-auction-ix-response.json @@ -34,7 +34,8 @@ "cacheId": "3bd85b54-a5c5-4852-956e-44e8a7b6b5bc" } } - } + }, + "origbidcpm": 4.7 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-cache-ix-request.json b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-cache-ix-request.json index df2845c06f9..7d2917f79f7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ix/test-cache-ix-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ix/test-cache-ix-request.json @@ -9,7 +9,10 @@ "adm": "adm6", "crid": "crid6", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 4.7 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json index 323318350e1..e002c0c4ebf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-auction-kidoz-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -79,7 +80,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 5.55 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-cache-kidoz-request.json b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-cache-kidoz-request.json index 883ffec2c36..53a307b9388 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-cache-kidoz-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kidoz/test-cache-kidoz-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 5.55 + } } }, { @@ -34,4 +40,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json index 22e48c8f0b4..799fb0c9578 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-auction-krushmedia-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-cache-krushmedia-request.json b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-cache-krushmedia-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-cache-krushmedia-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/krushmedia/test-cache-krushmedia-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-request.json b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-request.json index 1cc440f4aaa..5dcf2dab6d5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-request.json @@ -46,7 +46,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-response.json b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-response.json index f606cc5a73d..2852eee7d9e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-auction-kubient-response.json @@ -39,7 +39,8 @@ "cacheId": "78f9a6dd-d08c-4b80-ba0f-0159b9add9bf" } } - } + }, + "origbidcpm": 0.5 } } ], @@ -49,118 +50,6 @@ ], "cur": "USD", "ext": { - "debug": { - "httpcalls": { - "cache": [ - { - "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"w\":1024,\"h\":576}}]}", - "responsebody": "{\"responses\":[{\"uuid\":\"78f9a6dd-d08c-4b80-ba0f-0159b9add9bf\"}]}", - "status": 200 - } - ], - "kubient": [ - { - "uri": "{{ kubient.exchange_uri }}", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"test-imp-banner-id\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"w\":500,\"h\":400},\"ext\":{\"bidder\":{\"zoneid\":\"9042\"}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adid\":\"29681110\",\"adm\":\"some-test-ad\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"h\":576,\"w\":1024}]}]}", - "status": 200 - } - ] - }, - "resolvedrequest": { - "id": "tid", - "imp": [ - { - "id": "test-imp-banner-id", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ], - "w": 500, - "h": 400 - }, - "ext": { - "prebid": { - "bidder": { - "kubient": { - "zoneid": "9042" - } - } - } - } - } - ], - "site": { - "domain": "example.com", - "page": "http://www.example.com", - "publisher": { - "id": "publisherId" - }, - "ext": { - "amp": 0 - } - }, - "device": { - "ua": "userAgent", - "dnt": 2, - "ip": "193.168.244.1", - "pxratio": 4.2, - "language": "en", - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], - "source": { - "fd": 1, - "tid": "tid" - }, - "regs": { - "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } - } - } - } - }, "responsetimemillis": { "cache": "{{ cache.response_time_ms }}", "kubient": "{{ kubient.response_time_ms }}" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-cache-kubient-request.json b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-cache-kubient-request.json index 1ed778530e3..ecd360287a8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-cache-kubient-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-cache-kubient-request.json @@ -14,7 +14,10 @@ "cid": "772", "crid": "29681110", "h": 576, - "w": 1024 + "w": 1024, + "ext": { + "origbidcpm": 0.500000 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-kubient-bid-request-1.json b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-kubient-bid-request-1.json index 30fc51dafc9..bc2f0d052c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-kubient-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/kubient/test-kubient-bid-request-1.json @@ -59,7 +59,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, @@ -85,4 +84,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-auction-lifestreet-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-auction-lifestreet-response.json index c70626ce831..058ed3c61f7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-auction-lifestreet-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-auction-lifestreet-response.json @@ -34,7 +34,8 @@ "cacheId": "f0bfa534-ca56-42bc-9b91-a801f8f202c2" } } - } + }, + "origbidcpm": 4.75 } }, { @@ -75,7 +76,8 @@ "cacheId": "7e5320e5-ad46-439e-a7eb-f4cb826d8ab6" } } - } + }, + "origbidcpm": 3.75 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-cache-lifestreet-request.json b/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-cache-lifestreet-request.json index 74abb79fcbe..48e647cf0ac 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-cache-lifestreet-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lifestreet/test-cache-lifestreet-request.json @@ -9,7 +9,10 @@ "adm": "adm71", "crid": "crid71", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 3.75 + } } }, { @@ -21,7 +24,10 @@ "adm": "adm7", "crid": "crid7", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 4.75 + } } }, { @@ -30,4 +36,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json index e23846981a2..99b376a8b79 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-auction-lockerdome-response.json @@ -36,7 +36,8 @@ "cacheId": "22e22b17-47cb-46fa-a65b-d4c3bc1b4996" } } - } + }, + "origbidcpm": 7.35 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-cache-lockerdome-request.json b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-cache-lockerdome-request.json index 91fa1bdb4d3..6b0984b240f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-cache-lockerdome-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lockerdome/test-cache-lockerdome-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 7.35 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json index 6b5285ded93..adf79d37d1c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-auction-logicad-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-cache-logicad-request.json b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-cache-logicad-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-cache-logicad-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/logicad/test-cache-logicad-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json index 240fbf54e12..520dbd094a2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-auction-lunamedia-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-cache-lunamedia-request.json b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-cache-lunamedia-request.json index 378b8da504a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-cache-lunamedia-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/lunamedia/test-cache-lunamedia-request.json @@ -8,8 +8,11 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json index 707de20c353..b818b43dff4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-auction-marsmedia-response.json @@ -36,7 +36,8 @@ "cacheId": "b888d5e0-6fbf-47e9-affe-5bd9083adfc6" } } - } + }, + "origbidcpm": 7.35 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-cache-marsmedia-request.json b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-cache-marsmedia-request.json index 91fa1bdb4d3..6b0984b240f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-cache-marsmedia-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/marsmedia/test-cache-marsmedia-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 7.35 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json index eade228010f..2ca20b7fdd8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-auction-mgid-response.json @@ -36,6 +36,7 @@ } } }, + "origbidcpm": 3.5, "bidder": { "crtype": "banner" } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-cache-mgid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-cache-mgid-request.json index 89ac54117a4..8f1b0132887 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-cache-mgid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mgid/test-cache-mgid-request.json @@ -12,9 +12,10 @@ "w": 300, "h": 250, "ext": { - "crtype": "banner" + "crtype": "banner", + "origbidcpm": 3.5 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json index 25931dc22c1..934d1f9d2ca 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-auction-mobfoxpb-response.json @@ -39,6 +39,7 @@ } } }, + "origbidcpm": 3.33, "bidder": { "prebid": { "type": "banner" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-cache-mobfoxpb-request.json b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-cache-mobfoxpb-request.json index 2a7a175910f..e6e268bf5c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-cache-mobfoxpb-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobfoxpb/test-cache-mobfoxpb-request.json @@ -15,7 +15,8 @@ "ext": { "prebid": { "type": "banner" - } + }, + "origbidcpm": 3.33 } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json index 4eaed0b9abb..505a1783054 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-auction-mobilefuse-response.json @@ -34,7 +34,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-cache-mobilefuse-request.json b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-cache-mobilefuse-request.json index c6692479e4a..cdadbec00c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-cache-mobilefuse-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/mobilefuse/test-cache-mobilefuse-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-auction-nanointeractive-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-auction-nanointeractive-response.json index 7457cc9f30b..1ddbb5f452e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-auction-nanointeractive-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-auction-nanointeractive-response.json @@ -34,7 +34,8 @@ "cacheId": "1e6fb739-d0e7-4b7c-9b00-21aa40dc3301" } } - } + }, + "origbidcpm": 5.78 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-cache-nanointeractive-request.json b/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-cache-nanointeractive-request.json index e186c23ce1a..a59e391f468 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-cache-nanointeractive-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nanointeractive/test-cache-nanointeractive-request.json @@ -9,8 +9,11 @@ "adm": "adm+13", "crid": "crid13", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-auction-ninthdecimal-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-auction-ninthdecimal-response.json index f42828d8358..8a957eabf41 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-auction-ninthdecimal-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-auction-ninthdecimal-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-cache-ninthdecimal-request.json b/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-cache-ninthdecimal-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-cache-ninthdecimal-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ninthdecimal/test-cache-ninthdecimal-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json index 4e20fc3207b..30e94a5234e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-auction-nobid-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-cache-nobid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-cache-nobid-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-cache-nobid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/nobid/test-cache-nobid-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json index ffe12642c3b..c297478c724 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-auction-openx-response.json @@ -34,7 +34,9 @@ "cacheId": "6f10452f-dbf8-4d5c-9f40-760080e08612" } } - } + }, + "origbidcpm": 5.78, + "origbidcur": "USD" } }, { @@ -68,7 +70,9 @@ "cacheId": "16649e72-5dd5-4ab9-ab83-df9a5f06d9d1" } } - } + }, + "origbidcpm": 5.78, + "origbidcur": "USD" } }, { @@ -109,7 +113,9 @@ "cacheId": "857b3394-c5ac-402c-9cca-54ae52b927fc" } } - } + }, + "origbidcpm": 5.78, + "origbidcur": "USD" } }, { @@ -150,7 +156,9 @@ "cacheId": "18b7676c-f024-4a06-aa1a-5d222a643603" } } - } + }, + "origbidcpm": 5.78, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-cache-openx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-cache-openx-request.json index de9ff41f810..971befb3df6 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/openx/test-cache-openx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/openx/test-cache-openx-request.json @@ -9,7 +9,11 @@ "adm": "adm003", "crid": "crid00", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78, + "origbidcur": "USD" + } } }, { @@ -21,7 +25,11 @@ "adm": "adm001", "crid": "crid00", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78, + "origbidcur": "USD" + } } }, { @@ -33,7 +41,11 @@ "adm": "adm002", "crid": "crid00", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78, + "origbidcur": "USD" + } } }, { @@ -45,7 +57,11 @@ "adm": "adm00", "crid": "crid00", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78, + "origbidcur": "USD" + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json index f26057541a9..394b4c8e078 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-auction-orbidder-response.json @@ -31,7 +31,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 }, "id": "1", "impid": "impId001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-cache-orbidder-request.json b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-cache-orbidder-request.json index c6692479e4a..cdadbec00c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-cache-orbidder-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/orbidder/test-cache-orbidder-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json index e3540b10ae0..a2f715698c5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-auction-pubmatic-response.json @@ -34,7 +34,8 @@ "cacheId": "19fdd2e5-8bd5-498d-abde-73ed5405c11e" } } - } + }, + "origbidcpm": 4.75 } }, { @@ -76,6 +77,7 @@ } } }, + "origbidcpm": 4.0, "bidder": { "BidType": 1 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-cache-pubmatic-request.json b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-cache-pubmatic-request.json index 009969220de..0f277bbb0d5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-cache-pubmatic-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubmatic/test-cache-pubmatic-request.json @@ -11,7 +11,8 @@ "w": 300, "h": 600, "ext": { - "BidType": 1 + "BidType": 1, + "origbidcpm": 4 } } }, @@ -24,7 +25,10 @@ "adm": "adm9", "crid": "crid9", "w": 300, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 4.75 + } } }, { @@ -33,4 +37,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json index e0d02cf47b6..318897ab981 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-auction-pubnative-response.json @@ -43,7 +43,8 @@ "cacheId": "88ec8e12-07cc-4c36-b7ab-8982b6ab104e" } } - } + }, + "origbidcpm": 6.66 } }, { @@ -79,7 +80,8 @@ "cacheId": "f3518368-72c3-42db-99f5-44c249eb92d3" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -111,7 +113,8 @@ "cacheId": "4be8fb3d-18dc-4759-ac9f-aa633bced257" } } - } + }, + "origbidcpm": 9.99 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-cache-pubnative-request.json b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-cache-pubnative-request.json index 0f6887be877..8509cc66bd2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-cache-pubnative-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pubnative/test-cache-pubnative-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 6.66 + } } }, { @@ -37,7 +43,10 @@ "adm": "adm003", "adid": "adid003", "cid": "cid003", - "crid": "crid003" + "crid": "crid003", + "ext": { + "origbidcpm": 9.99 + } } }, { @@ -46,4 +55,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json index 1854292af69..123016b5073 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-auction-pulsepoint-response.json @@ -34,7 +34,8 @@ "cacheId": "b537fcb1-28c9-4cd1-bf74-abc7730fd1f4" } } - } + }, + "origbidcpm": 4.75 } }, { @@ -68,7 +69,8 @@ "cacheId": "a4073156-828d-4a22-acdc-84dc4529149e" } } - } + }, + "origbidcpm": 3.75 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-cache-pulsepoint-request.json b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-cache-pulsepoint-request.json index 756aa43f132..562ae10e6a0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-cache-pulsepoint-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/pulsepoint/test-cache-pulsepoint-request.json @@ -9,7 +9,10 @@ "adm": "adm8", "crid": "crid8", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 4.75 + } } }, { @@ -21,8 +24,11 @@ "adm": "adm81", "crid": "crid81", "w": 120, - "h": 180 + "h": 180, + "ext": { + "origbidcpm": 3.75 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json index 514b458bea6..9cd08c95dfc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-auction-revcontent-response.json @@ -36,7 +36,8 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-cache-revcontent-request.json b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-cache-revcontent-request.json index 9f8bad8caff..ec7898f8cee 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-cache-revcontent-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/revcontent/test-cache-revcontent-request.json @@ -11,7 +11,10 @@ "cid": "987", "crid": "12345678", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 0.5 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-auction-rhythmone-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-auction-rhythmone-response.json index e28c1979049..7cfc6d1672f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-auction-rhythmone-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-auction-rhythmone-response.json @@ -49,7 +49,8 @@ "cacheId": "c2bab0d6-3a78-473d-ba1f-340ed92779d2" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-cache-rhythmone-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-cache-rhythmone-request.json index a3bdb88299f..77b97801049 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-cache-rhythmone-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rhythmone/test-cache-rhythmone-request.json @@ -17,7 +17,10 @@ "IAB2" ], "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -26,4 +29,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-auction-rtbhouse-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-auction-rtbhouse-response.json index a7c869c424b..0e4961dd7e1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-auction-rtbhouse-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-auction-rtbhouse-response.json @@ -36,7 +36,8 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-cache-rtbhouse-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-cache-rtbhouse-request.json index f40295ff504..69e35203e9d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-cache-rtbhouse-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rtbhouse/test-cache-rtbhouse-request.json @@ -11,7 +11,10 @@ "cid": "987", "crid": "12345678", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 0.5 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json index b7038b9b337..66c8b5f8f8c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-auction-rubicon-appnexus-response.json @@ -33,7 +33,9 @@ "win": "{{ event.url }}t=win&b=a121a07f-1579-4465-bc5e-5c5b02a0c421&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs", "imp": "{{ event.url }}t=imp&b=a121a07f-1579-4465-bc5e-5c5b02a0c421&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs" } - } + }, + "origbidcpm": 0.9, + "origbidcur": "USD" } }, { @@ -86,7 +88,9 @@ "bid_ad_type": 0, "ranking_price": 0.0 } - } + }, + "origbidcpm": 5.5, + "origbidcur": "USD" } }, { @@ -138,7 +142,9 @@ "bidder_id": 2, "bid_ad_type": 3 } - } + }, + "origbidcpm": 1.0, + "origbidcur": "USD" } } ], @@ -193,7 +199,9 @@ "bid_ad_type": 0, "ranking_price": 0.0 } - } + }, + "origbidcpm": 5.00, + "origbidcur": "USD" } } ], @@ -227,7 +235,9 @@ "win": "{{ event.url }}t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs", "imp": "{{ event.url }}t=imp&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" } - } + }, + "origbidcpm": 0.8, + "origbidcur": "USD" } }, { @@ -284,7 +294,8 @@ } ] } - } + }, + "origbidcpm": 8.43 } }, { @@ -322,7 +333,8 @@ "cacheId": "4fe59ef5-6fb4-48c5-88b6-9870257fc49e" } } - } + }, + "origbidcpm": 4.26 } } ], @@ -367,7 +379,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184840\",\"impid\":\"impId3\",\"price\":5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"cat\":[],\"w\":300,\"h\":250,\"ext\":{\"appnexus\":{\"brand_id\":350,\"brand_category_id\":350,\"auction_id\":8189378542222915031,\"bidder_id\":2,\"bid_ad_type\":0,\"ranking_price\":0.0}},\"wurl\":\"http://localhost:8080/event?t=win&b=7706636740145184840&a=5001&ts=1000&bidder=appnexusAlias&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"466223845\",\"impid\":\"impId2\",\"price\":4.26,\"adm\":\"adm2\",\"crid\":\"crid2\",\"w\":300,\"h\":600,\"wurl\":\"http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"a121a07f-1579-4465-bc5e-5c5b02a0c421\",\"impid\":\"impStoredAuctionResponse\",\"price\":0.9,\"crid\":\"crid1\",\"wurl\":\"http://localhost:8080/event?t=win&b=a121a07f-1579-4465-bc5e-5c5b02a0c421&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"880290288\",\"impid\":\"impId1\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid1\",\"w\":300,\"h\":250,\"ext\":{\"rp\":{\"targeting\":[{\"key\":\"rpfl_1001\",\"values\":[\"2_tier0100\"]}]}},\"wurl\":\"http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"f227a07f-1579-4465-bc5e-5c5b02a0c180\",\"impid\":\"impStoredAuctionResponse\",\"price\":0.8,\"crid\":\"crid1\",\"wurl\":\"http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"928185755156387460\",\"impid\":\"impId131\",\"price\":1,\"adm\":\"{\\\"assets\\\":[{\\\"id\\\":0,\\\"img\\\":{\\\"url\\\":\\\"http://vcdn.adnxs.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\\\",\\\"w\\\":3000,\\\"h\\\":2250,\\\"ext\\\":{\\\"appnexus\\\":{\\\"prevent_crop\\\":0}}}},{\\\"id\\\":1,\\\"title\\\":{\\\"text\\\":\\\"This is an example Prebid Native creative\\\"}},{\\\"id\\\":2,\\\"data\\\":{\\\"value\\\":\\\"Prebid.org\\\"}},{\\\"id\\\":3,\\\"data\\\":{\\\"value\\\":\\\"ThisisaPrebidNativeCreative.Therearemanylikeit,butthisoneismine.\\\"}}],\\\"link\\\":{\\\"url\\\":\\\"http://nym1-ib.adnxs.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\\\"},\\\"imptrackers\\\":[\\\"http://nym1-ib.adnxs.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\\\"],\\\"jstracker\\\":\\\"\\\"}\",\"adid\":\"69595837\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=69595837\",\"cid\":\"958\",\"crid\":\"69595837\",\"cat\":[\"IAB20-3\"],\"ext\":{\"appnexus\":{\"brand_id\":1,\"brand_category_id\":1,\"auction_id\":5607483846416358664,\"bidder_id\":2,\"bid_ad_type\":3}},\"wurl\":\"http://localhost:8080/event?t=win&b=928185755156387460&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"impId3\",\"price\":5.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"w\":300,\"h\":250,\"ext\":{\"appnexus\":{\"brand_id\":1,\"auction_id\":8189378542222915032,\"bidder_id\":2,\"bid_ad_type\":0,\"ranking_price\":0.0}},\"wurl\":\"http://localhost:8080/event?t=win&b=7706636740145184841&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"xml\",\"value\":\"\",\"expiry\":120}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184840\",\"impid\":\"impId3\",\"price\":5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"cat\":[],\"w\":300,\"h\":250,\"ext\":{\"appnexus\":{\"brand_id\":350,\"brand_category_id\":350,\"auction_id\":8189378542222915031,\"bidder_id\":2,\"bid_ad_type\":0,\"ranking_price\":0.0},\"origbidcpm\":5,\"origbidcur\":\"USD\"},\"wurl\":\"http://localhost:8080/event?t=win&b=7706636740145184840&a=5001&ts=1000&bidder=appnexusAlias&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"a121a07f-1579-4465-bc5e-5c5b02a0c421\",\"impid\":\"impStoredAuctionResponse\",\"price\":0.9,\"crid\":\"crid1\",\"ext\":{\"origbidcpm\":0.9,\"origbidcur\":\"USD\"},\"wurl\":\"http://localhost:8080/event?t=win&b=a121a07f-1579-4465-bc5e-5c5b02a0c421&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"impId3\",\"price\":5.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"w\":300,\"h\":250,\"ext\":{\"appnexus\":{\"brand_id\":1,\"auction_id\":8189378542222915032,\"bidder_id\":2,\"bid_ad_type\":0,\"ranking_price\":0.0},\"origbidcpm\":5.5,\"origbidcur\":\"USD\"},\"wurl\":\"http://localhost:8080/event?t=win&b=7706636740145184841&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"f227a07f-1579-4465-bc5e-5c5b02a0c180\",\"impid\":\"impStoredAuctionResponse\",\"price\":0.8,\"crid\":\"crid1\",\"ext\":{\"origbidcpm\":0.8,\"origbidcur\":\"USD\"},\"wurl\":\"http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"466223845\",\"impid\":\"impId2\",\"price\":4.26,\"adm\":\"adm2\",\"crid\":\"crid2\",\"w\":300,\"h\":600,\"ext\":{\"origbidcpm\":4.26},\"wurl\":\"http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"928185755156387460\",\"impid\":\"impId131\",\"price\":1,\"adm\":\"{\\\"assets\\\":[{\\\"id\\\":0,\\\"img\\\":{\\\"url\\\":\\\"http://vcdn.adnxs.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\\\",\\\"w\\\":3000,\\\"h\\\":2250,\\\"ext\\\":{\\\"appnexus\\\":{\\\"prevent_crop\\\":0}}}},{\\\"id\\\":1,\\\"title\\\":{\\\"text\\\":\\\"This is an example Prebid Native creative\\\"}},{\\\"id\\\":2,\\\"data\\\":{\\\"value\\\":\\\"Prebid.org\\\"}},{\\\"id\\\":3,\\\"data\\\":{\\\"value\\\":\\\"ThisisaPrebidNativeCreative.Therearemanylikeit,butthisoneismine.\\\"}}],\\\"link\\\":{\\\"url\\\":\\\"http://nym1-ib.adnxs.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\\\"},\\\"imptrackers\\\":[\\\"http://nym1-ib.adnxs.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\\\"],\\\"jstracker\\\":\\\"\\\"}\",\"adid\":\"69595837\",\"adomain\":[\"appnexus.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=69595837\",\"cid\":\"958\",\"crid\":\"69595837\",\"cat\":[\"IAB20-3\"],\"ext\":{\"appnexus\":{\"brand_id\":1,\"brand_category_id\":1,\"auction_id\":5607483846416358664,\"bidder_id\":2,\"bid_ad_type\":3},\"origbidcpm\":1,\"origbidcur\":\"USD\"},\"wurl\":\"http://localhost:8080/event?t=win&b=928185755156387460&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs\"}},{\"type\":\"json\",\"value\":{\"id\":\"880290288\",\"impid\":\"impId1\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid1\",\"w\":300,\"h\":250,\"ext\":{\"rp\":{\"targeting\":[{\"key\":\"rpfl_1001\",\"values\":[\"2_tier0100\"]}]},\"origbidcpm\":8.43},\"wurl\":\"http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs\"}},{\"type\":\"xml\",\"value\":\"\",\"expiry\":120}]}", "responsebody": "{\"responses\":[{\"uuid\":\"91912e5b-dfa8-42bc-9c7e-df6ce0449c19\"},{\"uuid\":\"765e116a-5773-49d5-a648-0b97a9907a4e\"},{\"uuid\":\"117431c9-807a-41e1-82a7-dcd8f8875493\"},{\"uuid\":\"6cf69b42-96f5-4ba1-a984-a9b4d8ff21cf\"},{\"uuid\":\"c75130ed-bcdd-4821-ad91-90cf835615c5\"},{\"uuid\":\"683fe79f-6df7-4971-ac70-820e0486992d\"},{\"uuid\":\"4fe59ef5-6fb4-48c5-88b6-9870257fc49e\"},{\"uuid\":\"b2528f73-96ab-42ab-8f15-fbe6ed779a26\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-cache-rubicon-appnexus-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-cache-rubicon-appnexus-request.json index b14a948a69a..0d5009c6739 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-cache-rubicon-appnexus-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus/test-cache-rubicon-appnexus-request.json @@ -10,6 +10,9 @@ "crid": "crid2", "w": 300, "h": 600, + "ext": { + "origbidcpm": 4.26 + }, "wurl": "http://localhost:8080/event?t=win&b=466223845&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" } }, @@ -39,7 +42,9 @@ "bidder_id": 2, "bid_ad_type": 0, "ranking_price": 0.0 - } + }, + "origbidcpm": 5, + "origbidcur": "USD" } } }, @@ -67,7 +72,9 @@ "bidder_id": 2, "bid_ad_type": 0, "ranking_price": 0.0 - } + }, + "origbidcpm": 5.5, + "origbidcur": "USD" } } }, @@ -92,7 +99,8 @@ ] } ] - } + }, + "origbidcpm": 8.43 } } }, @@ -120,7 +128,9 @@ "auction_id": 5607483846416358664, "bidder_id": 2, "bid_ad_type": 3 - } + }, + "origbidcpm": 1, + "origbidcur": "USD" }, "wurl": "http://localhost:8080/event?t=win&b=928185755156387460&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs" } @@ -132,6 +142,10 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.9, + "ext": { + "origbidcpm": 0.9, + "origbidcur": "USD" + }, "wurl": "http://localhost:8080/event?t=win&b=a121a07f-1579-4465-bc5e-5c5b02a0c421&a=5001&ts=1000&bidder=appnexus&f=i&int=dmbjs" } }, @@ -142,6 +156,10 @@ "impid": "impStoredAuctionResponse", "crid": "crid1", "price": 0.8, + "ext": { + "origbidcpm": 0.8, + "origbidcur": "USD" + }, "wurl": "http://localhost:8080/event?t=win&b=f227a07f-1579-4465-bc5e-5c5b02a0c180&a=5001&ts=1000&bidder=rubicon&f=i&int=dmbjs" } }, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-auction-rubicon-appnexus-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-auction-rubicon-appnexus-response.json index ee6387c3c1c..15caae7a2c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-auction-rubicon-appnexus-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-auction-rubicon-appnexus-response.json @@ -47,6 +47,7 @@ "imp": "{{ event.url }}t=imp&b=21521324&a=5001&ts=1000&bidder=rubicon&f=i&int=" } }, + "origbidcpm": 12.43, "bidder": { "rp": { "targeting": [ @@ -98,6 +99,7 @@ "imp": "{{ event.url }}t=imp&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=" } }, + "origbidcpm": 8.43, "bidder": { "rp": { "targeting": [ @@ -158,6 +160,8 @@ "imp": "{{ event.url }}t=imp&b=7706636740145184841&a=5001&ts=1000&bidder=appnexus&f=i&int=" } }, + "origbidcpm": 5.5, + "origbidcur": "USD", "bidder": { "appnexus": { "brand_id": 1, @@ -203,6 +207,8 @@ "imp": "{{ event.url }}t=imp&b=222214214214&a=5001&ts=1000&bidder=appnexus&f=i&int=" } }, + "origbidcpm": 2.0, + "origbidcur": "USD", "bidder": { "appnexus": { "brand_id": 1, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-cache-rubicon-appnexus-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-cache-rubicon-appnexus-request.json index 964b53c686f..57715941820 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-cache-rubicon-appnexus-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_appnexus_multi_bid/test-cache-rubicon-appnexus-request.json @@ -20,7 +20,8 @@ ] } ] - } + }, + "origbidcpm": 12.43 }, "wurl": "http://localhost:8080/event?t=win&b=21521324&a=5001&ts=1000&bidder=rubicon&f=i&int=" } @@ -46,7 +47,9 @@ "bidder_id": 2, "bid_ad_type": 1, "ranking_price": 0.0 - } + }, + "origbidcpm": 5.5, + "origbidcur": "USD" }, "wurl": "http://localhost:8080/event?t=win&b=7706636740145184841&a=5001&ts=1000&bidder=appnexus&f=i&int=" } @@ -71,7 +74,8 @@ ] } ] - } + }, + "origbidcpm": 8.43 }, "wurl": "http://localhost:8080/event?t=win&b=880290288&a=5001&ts=1000&bidder=rubicon&f=i&int=" } @@ -100,7 +104,9 @@ "auction_id": 5607483846416358664, "bidder_id": 2, "bid_ad_type": 1 - } + }, + "origbidcpm": 2, + "origbidcur": "USD" }, "wurl": "http://localhost:8080/event?t=win&b=222214214214&a=5001&ts=1000&bidder=appnexus&f=i&int=" } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-request.json index c6e767644af..1221267e675 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-request.json @@ -27,7 +27,7 @@ "prebid": { "bidadjustmentfactors": { "mediatypes": { - "video-outstream": { + "video": { "rubicon": 0.9 } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-response.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-response.json index bdd36cfb342..64d0c8d1cee 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-auction-rubicon-response.json @@ -37,7 +37,7 @@ } } }, - "origbidcpm":3.33 + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-cache-rubicon-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-cache-rubicon-request.json index 46b5f934844..1a56724f9c0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-cache-rubicon-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-cache-rubicon-request.json @@ -13,7 +13,7 @@ "w": 300, "h": 250, "ext": { - "origbidcpm" : 3.33 + "origbidcpm": 3.33 } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-rubicon-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-rubicon-bid-request.json index 3d4262a59fc..e7e5489da4f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-rubicon-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon_core_functionality/test-rubicon-bid-request.json @@ -28,27 +28,27 @@ } ], "site": { - "domain" : "example.com", - "page" : "http://www.example.com", + "domain": "example.com", + "page": "http://www.example.com", "publisher": { "ext": { "rp": { - "account_id" : 2001 + "account_id": 2001 } } }, "ext": { "amp": 0, - "rp" : { - "site_id" : 3001 + "rp": { + "site_id": 3001 } } }, "device": { "ua": "testUa", "ip": "193.168.244.1", - "ext" : { - "rp" : { + "ext": { + "rp": { } } }, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-auction-sharethrough-response.json b/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-auction-sharethrough-response.json index b20ecd3bf0a..ed020233bed 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-auction-sharethrough-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-auction-sharethrough-response.json @@ -36,7 +36,9 @@ "cacheId": "a03927f1-86e1-48fb-9efc-da9104a44e39" } } - } + }, + "origbidcpm": 10, + "origbidcur": "USD" } } ], @@ -59,7 +61,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"bid\",\"impid\":\"bid\",\"price\":10,\"adm\":\"\\n\\t\\t
\\n\\t\\t\\n\\t\\t\\t\\n\",\"adid\":\"arid\",\"cid\":\"cmpKey\",\"crid\":\"creaKey\",\"w\":50,\"h\":50}}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"bid\",\"impid\":\"bid\",\"price\":10,\"adm\":\"\\n\\t\\t
\\n\\t\\t\\n\\t\\t\\t\\n\",\"adid\":\"arid\",\"cid\":\"cmpKey\",\"crid\":\"creaKey\",\"w\":50,\"h\":50,\"ext\":{\"origbidcpm\":10,\"origbidcur\":\"USD\"}}}]}", "responsebody": "{\"responses\":[{\"uuid\":\"a03927f1-86e1-48fb-9efc-da9104a44e39\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-cache-sharethrough-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-cache-sharethrough-request.json index 73dc1156b71..c6eaf04633b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-cache-sharethrough-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sharethrough/test-cache-sharethrough-request.json @@ -11,7 +11,11 @@ "cid": "cmpKey", "crid": "creaKey", "w": 50, - "h": 50 + "h": 50, + "ext": { + "origbidcpm": 10, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-auction-silvermob-response.json b/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-auction-silvermob-response.json index de2439c7f86..a598167bffc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-auction-silvermob-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-auction-silvermob-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-cache-silvermob-request.json b/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-cache-silvermob-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-cache-silvermob-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/silvermob/test-cache-silvermob-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-auction-smaato-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-auction-smaato-response.json index aa67cdd8d88..e456ec3ba67 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-auction-smaato-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-auction-smaato-response.json @@ -31,7 +31,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 }, "id": "1", "impid": "impId001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-cache-smaato-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-cache-smaato-request.json index a8fced07cb3..babc951e8ea 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-cache-smaato-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smaato/test-cache-smaato-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json index 32d906592aa..bb869139f82 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-auction-smartadserver-response.json @@ -39,7 +39,8 @@ "cacheId": "78f9a6dd-d08c-4b80-ba0f-0159b9add9bf" } } - } + }, + "origbidcpm": 0.5 } } ], @@ -54,7 +55,7 @@ "cache": [ { "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"w\":1024,\"h\":576}}]}", + "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"w\":1024,\"h\":576,\"ext\":{\"origbidcpm\":0.5}}}]}", "responsebody": "{\"responses\":[{\"uuid\":\"78f9a6dd-d08c-4b80-ba0f-0159b9add9bf\"}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-cache-smartadserver-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-cache-smartadserver-request.json index 1ed778530e3..ecd360287a8 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-cache-smartadserver-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-cache-smartadserver-request.json @@ -14,7 +14,10 @@ "cid": "772", "crid": "29681110", "h": 576, - "w": 1024 + "w": 1024, + "ext": { + "origbidcpm": 0.500000 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-auction-smartrtb-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-auction-smartrtb-response.json index 651a7c8f18f..eb8f673cacc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-auction-smartrtb-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-auction-smartrtb-response.json @@ -29,7 +29,8 @@ "hb_pb_smartrtb": "0.00" }, "type": "banner" - } + }, + "origbidcpm": 0.01 }, "id": "1", "impid": "impId001", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-cache-smartrtb-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-cache-smartrtb-request.json index 00cfdec611c..295b748894c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-cache-smartrtb-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartrtb/test-cache-smartrtb-request.json @@ -8,8 +8,11 @@ "crid": "test_banner_crid", "id": "1", "impid": "impId001", - "price": 0.01 + "price": 0.01, + "ext": { + "origbidcpm": 0.01 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-auction-smartyads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-auction-smartyads-response.json index 10666bb7c54..606d8d72d88 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-auction-smartyads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-auction-smartyads-response.json @@ -31,7 +31,8 @@ "cacheId": "3c0769d8-0dd9-465c-8bf3-f570605ba698" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-cache-smartyads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-cache-smartyads-request.json index ca8e3ab2f6a..383f37b4df9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-cache-smartyads-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartyads/test-cache-smartyads-request.json @@ -8,7 +8,10 @@ "price": 0.01, "id": "testid", "impid": "testimpid", - "cid": "8048" + "cid": "8048", + "ext": { + "origbidcpm": 0.01 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-auction-somoaudience-response.json b/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-auction-somoaudience-response.json index 3f8b02be95b..4d0343d580a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-auction-somoaudience-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-auction-somoaudience-response.json @@ -34,7 +34,8 @@ "cacheId": "6da10965-53bf-453e-a890-ea94eeb00765" } } - } + }, + "origbidcpm": 8.43 } }, { @@ -68,7 +69,8 @@ "cacheId": "9ce56613-4f34-4b28-8a1e-69683ad26b99" } } - } + }, + "origbidcpm": 7.99 } }, { @@ -109,7 +111,8 @@ "cacheId": "8aa68c39-680d-46f5-ba83-fcd761d436fe" } } - } + }, + "origbidcpm": 9.99 } }, { @@ -148,7 +151,8 @@ "cacheId": "2bf317a1-d300-42df-97d5-8ae4a3fef9e3" } } - } + }, + "origbidcpm": 10.0 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-cache-somoaudience-request.json b/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-cache-somoaudience-request.json index f7f2bbb35a8..c898e428eb5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-cache-somoaudience-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/somoaudience/test-cache-somoaudience-request.json @@ -9,7 +9,10 @@ "adm": "adm16", "crid": "crid16", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 8.43 + } } }, { @@ -21,7 +24,10 @@ "adm": "adm17", "crid": "crid17", "w": 360, - "h": 240 + "h": 240, + "ext": { + "origbidcpm": 7.99 + } } }, { @@ -33,7 +39,10 @@ "adm": "adm18", "crid": "crid18", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 9.99 + } } }, { @@ -52,7 +61,10 @@ "crid": "crid19", "cat": [ "IAB3-1" - ] + ], + "ext": { + "origbidcpm": 10 + } } }, { @@ -61,4 +73,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-auction-sonobi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-auction-sonobi-response.json index 0d40a801f23..09004e0bc3f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-auction-sonobi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-auction-sonobi-response.json @@ -34,7 +34,8 @@ "cacheId": "9092799c-93b0-4e11-a232-2c0151d5d275" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -83,7 +84,8 @@ "cacheId": "99dc3357-34ac-4819-9f68-0820039a542f" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-cache-sonobi-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-cache-sonobi-request.json index 58471d39985..c393baa5ecf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-cache-sonobi-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sonobi/test-cache-sonobi-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -29,7 +32,10 @@ "IAB2" ], "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -38,4 +44,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-response.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-response.json index f6fe198ca04..6edc56d1e7f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-auction-sovrn-response.json @@ -34,7 +34,8 @@ "cacheId": "1e6fb739-d0e7-4b7c-9b00-21aa40dc3301" } } - } + }, + "origbidcpm": 5.78 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-cache-sovrn-request.json b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-cache-sovrn-request.json index aba1be88992..4928606f4a5 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-cache-sovrn-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/sovrn/test-cache-sovrn-request.json @@ -9,8 +9,11 @@ "adm": "adm 13", "crid": "crid13", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 5.78 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-auction-response.json b/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-auction-response.json index 3fe396f7cfe..ae3a07cbbe3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-auction-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-auction-response.json @@ -34,7 +34,8 @@ "cacheId": "474175c2-815f-4bde-90ad-935d2f6e1aa0" } } - } + }, + "origbidcpm": 0.8 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-cache-request.json b/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-cache-request.json index fa0be1eef1e..4aa4ed8aad0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-cache-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/storedresponse/test-cache-request.json @@ -9,8 +9,11 @@ "adm": "adm1", "crid": "crid1", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 0.8 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-auction-synacormedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-auction-synacormedia-response.json index d289c467330..95236342dcd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-auction-synacormedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-auction-synacormedia-response.json @@ -36,7 +36,8 @@ "cacheId": "c1662cf6-f00a-4066-b71a-46d97abccc35" } } - } + }, + "origbidcpm": 7.77 } }, { @@ -82,7 +83,8 @@ "cacheId": "62019cff-d657-42fc-8366-16c34e1fd28c" } } - } + }, + "origbidcpm": 9.99 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-cache-synacormedia-request.json b/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-cache-synacormedia-request.json index abf2fab21df..bb6e149acf3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-cache-synacormedia-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/synacormedia/test-cache-synacormedia-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 7.77 + } } }, { @@ -28,7 +31,10 @@ "cid": "cid002", "crid": "crid002", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.99 + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-auction-tappx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-auction-tappx-response.json index b8c423172e3..9398deec110 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-auction-tappx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-auction-tappx-response.json @@ -42,7 +42,8 @@ "cacheId": "9c0c4f2f-686f-4673-a00a-d8cae7e7a05d" } } - } + }, + "origbidcpm": 0.5 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-cache-tappx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-cache-tappx-request.json index 02dbad7226c..7ee253bc6dc 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-cache-tappx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tappx/test-cache-tappx-request.json @@ -17,7 +17,10 @@ "test.com" ], "h": 250, - "w": 300 + "w": 300, + "ext": { + "origbidcpm": 0.5 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-response.json b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-response.json index b68080d38b2..d6e713bc47f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-response.json @@ -40,6 +40,7 @@ } } }, + "origbidcpm": 0.01, "bidder": { "format": "VIDEO" } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-cache-telaria-request.json b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-cache-telaria-request.json index 798057bbd05..1cdc865597d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-cache-telaria-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-cache-telaria-request.json @@ -11,7 +11,8 @@ "exp": 120, "crid": "test_video_crid", "ext": { - "format": "VIDEO" + "format": "VIDEO", + "origbidcpm": 0.01 } }, "expiry": 120 diff --git a/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-auction-triplelift-response.json b/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-auction-triplelift-response.json index 70132708685..ad50cd1db40 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-auction-triplelift-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-auction-triplelift-response.json @@ -41,6 +41,8 @@ } } }, + "origbidcpm": 0.5, + "origbidcur": "USD", "bidder": { "triplelift_pb": { "format": 2 diff --git a/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-cache-triplelift-request.json b/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-cache-triplelift-request.json index 23689d131c7..6d60392deae 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-cache-triplelift-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/triplelift/test-cache-triplelift-request.json @@ -19,9 +19,11 @@ "ext": { "triplelift_pb": { "format": 2 - } + }, + "origbidcpm": 0.5, + "origbidcur": "USD" } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-request.json b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-request.json index bc3effc291b..36e5792674c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-request.json @@ -39,7 +39,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-response.json b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-response.json index c41297924c0..9a14c1dd955 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-auction-triplelift-native-response.json @@ -40,7 +40,9 @@ "cacheId": "029e95ca-1a14-4e45-9669-8ad8d667de50" } } - } + }, + "origbidcpm": 0.5, + "origbidcur": "USD" } } ], @@ -50,111 +52,6 @@ ], "cur": "USD", "ext": { - "debug": { - "httpcalls": { - "cache": [ - { - "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"triplelift.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"w\":300,\"h\":250}}]}", - "responsebody": "{\"responses\":[{\"uuid\":\"029e95ca-1a14-4e45-9669-8ad8d667de50\"}]}", - "status": 200 - } - ], - "triplelift_native": [ - { - "uri": "{{ triplelift_native.exchange_uri }}", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"test-imp-id\",\"native\":{\"request\":\"{\\\"ver\\\":\\\"1.1\\\",\\\"context\\\":1,\\\"contextsubtype\\\":11,\\\"plcmttype\\\":4,\\\"plcmtcnt\\\":1,\\\"assets\\\":[{\\\"id\\\":0,\\\"required\\\":1,\\\"title\\\":{\\\"len\\\":500}}]}\"},\"tagid\":\"foo\",\"ext\":{\"bidder\":{\"inventoryCode\":\"foo\"}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"test\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"T\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"test-request-id\",\"seatbid\":[{\"seat\":\"958\",\"bid\":[{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-id\",\"price\":0.5,\"adid\":\"29681110\",\"adm\":\"some-test-ad\",\"adomain\":[\"triplelift.com\"],\"iurl\":\"http://nym1-ib.adnxs.com/cr?id=29681110\",\"cid\":\"958\",\"crid\":\"29681110\",\"h\":250,\"w\":300}]}],\"bidid\":\"5778926625248726496\",\"cur\":\"USD\"}", - "status": 200 - } - ] - }, - "resolvedrequest": { - "id": "tid", - "imp": [ - { - "id": "test-imp-id", - "native": { - "request": "{\"ver\":\"1.1\",\"context\":1,\"contextsubtype\":11,\"plcmttype\":4,\"plcmtcnt\":1,\"assets\":[{\"id\":0,\"required\":1,\"title\":{\"len\":500}}]}" - }, - "ext": { - "prebid": { - "bidder": { - "triplelift_native": { - "inventoryCode": "foo" - } - } - } - } - } - ], - "site": { - "domain": "example.com", - "page": "http://www.example.com", - "publisher": { - "id": "test" - }, - "ext": { - "amp": 0 - } - }, - "device": { - "ua": "userAgent", - "dnt": 2, - "ip": "193.168.244.1", - "pxratio": 4.2, - "language": "en", - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], - "source": { - "fd": 1, - "tid": "tid" - }, - "regs": { - "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } - } - } - } - }, "responsetimemillis": { "triplelift_native": "{{ triplelift_native.response_time_ms }}", "cache": "{{ cache.response_time_ms }}" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-cache-triplelift-native-request.json b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-cache-triplelift-native-request.json index d0168e8c2b9..a626a4aed9d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-cache-triplelift-native-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-cache-triplelift-native-request.json @@ -15,7 +15,11 @@ "cid": "958", "crid": "29681110", "h": 250, - "w": 300 + "w": 300, + "ext": { + "origbidcpm": 0.5, + "origbidcur": "USD" + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-triplelift-native-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-triplelift-native-bid-request.json index d4a22534d32..755dbbc27ea 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-triplelift-native-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/tripleliftnative/test-triplelift-native-bid-request.json @@ -54,7 +54,6 @@ }, "ext": { "prebid": { - "debug": 1, "targeting": { "pricegranularity": { "precision": 2, @@ -80,4 +79,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-auction-ttx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-auction-ttx-response.json index 25a26488bc6..433ebf8628b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-auction-ttx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-auction-ttx-response.json @@ -34,7 +34,8 @@ "cacheId": "ab634778-1ad8-4851-8f8d-b8588885ec78" } } - } + }, + "origbidcpm": 1.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-cache-ttx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-cache-ttx-request.json index 57edfce53fa..8f3cf1133f3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-cache-ttx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ttx/test-cache-ttx-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-auction-ucfunnel-response.json b/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-auction-ucfunnel-response.json index b05053ea656..f673e84fbd1 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-auction-ucfunnel-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-auction-ucfunnel-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-cache-ucfunnel-request.json b/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-cache-ucfunnel-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-cache-ucfunnel-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/ucfunnel/test-cache-ucfunnel-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-auction-unruly-response.json b/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-auction-unruly-response.json index 42fef9c4241..ad5f6f01e23 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-auction-unruly-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-auction-unruly-response.json @@ -41,7 +41,8 @@ "cacheId": "54a3b0a5-e145-43cf-a1cc-1beaa8b29018" } } - } + }, + "origbidcpm": 1.25 } }, { @@ -82,7 +83,8 @@ "cacheId": "41c08fce-546f-4a57-a657-1158fd62af3d" } } - } + }, + "origbidcpm": 2.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-cache-unruly-request.json b/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-cache-unruly-request.json index 3bb021b79d7..3326b44919a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-cache-unruly-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/unruly/test-cache-unruly-request.json @@ -9,7 +9,10 @@ "adm": "adm001", "crid": "crid001", "w": 800, - "h": 600 + "h": 600, + "ext": { + "origbidcpm": 1.25 + } } }, { @@ -21,7 +24,10 @@ "adm": "adm002", "crid": "crid002", "w": 640, - "h": 480 + "h": 480, + "ext": { + "origbidcpm": 2.25 + } } }, { @@ -35,4 +41,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-auction-valueimpression-response.json b/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-auction-valueimpression-response.json index 7344aec2c7e..f912c13d8eb 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-auction-valueimpression-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-auction-valueimpression-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } }, { @@ -79,7 +80,8 @@ "cacheId": "44a52b06-b29f-4819-a05f-db36b9e7b8fc" } } - } + }, + "origbidcpm": 5.55 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-cache-valueimpression-request.json b/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-cache-valueimpression-request.json index 883ffec2c36..53a307b9388 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-cache-valueimpression-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/valueimpression/test-cache-valueimpression-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } }, { @@ -25,7 +28,10 @@ "cid": "cid002", "crid": "crid002", "w": 1024, - "h": 576 + "h": 576, + "ext": { + "origbidcpm": 5.55 + } } }, { @@ -34,4 +40,4 @@ "expiry": 120 } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-auction-verizonmedia-response.json b/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-auction-verizonmedia-response.json index 920e42dc4e9..3e3e216ae5c 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-auction-verizonmedia-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-auction-verizonmedia-response.json @@ -34,7 +34,8 @@ "cacheId": "3bdd45bf-b80e-4943-8445-32692ae5ff51" } } - } + }, + "origbidcpm": 1.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-cache-verizonmedia-request.json b/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-cache-verizonmedia-request.json index 14a96320420..8f3cf1133f3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-cache-verizonmedia-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/verizonmedia/test-cache-verizonmedia-request.json @@ -9,8 +9,11 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/visx/test-auction-visx-response.json b/src/test/resources/org/prebid/server/it/openrtb2/visx/test-auction-visx-response.json index 4cca135f21c..0599f31ccb2 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/visx/test-auction-visx-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/visx/test-auction-visx-response.json @@ -37,7 +37,9 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 0.5, + "origbidcur": "USD" } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/visx/test-cache-visx-request.json b/src/test/resources/org/prebid/server/it/openrtb2/visx/test-cache-visx-request.json index 8ee5c82733f..8bbe6b2384a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/visx/test-cache-visx-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/visx/test-cache-visx-request.json @@ -12,8 +12,12 @@ ], "crid": "11_222222", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 0.5, + "origbidcur": "USD" + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-auction-vrtcal-response.json b/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-auction-vrtcal-response.json index 36b4155213f..ee2fd363e65 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-auction-vrtcal-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-auction-vrtcal-response.json @@ -36,7 +36,8 @@ "cacheId": "6e2bfba0-8ff2-4ed8-8a2c-ce1a7ca4f599" } } - } + }, + "origbidcpm": 1.25 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-cache-vrtcal-request.json b/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-cache-vrtcal-request.json index 14a96320420..8f3cf1133f3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-cache-vrtcal-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/vrtcal/test-cache-vrtcal-request.json @@ -9,8 +9,11 @@ "adm": "adm001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 1.25 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-auction-yeahmobi-response.json b/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-auction-yeahmobi-response.json index db4dded8d0a..ac4f9440ffd 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-auction-yeahmobi-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-auction-yeahmobi-response.json @@ -34,7 +34,8 @@ "url": "{{ cache.resource_url }}f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 0.01 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-cache-yeahmobi-request.json b/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-cache-yeahmobi-request.json index c6692479e4a..cdadbec00c4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-cache-yeahmobi-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yeahmobi/test-cache-yeahmobi-request.json @@ -10,9 +10,10 @@ "cid": "test_cid", "crid": "test_banner_crid", "ext": { - "format": "BANNER" + "format": "BANNER", + "origbidcpm": 0.01 } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yieldlab/test-auction-yieldlab-response.json b/src/test/resources/org/prebid/server/it/openrtb2/yieldlab/test-auction-yieldlab-response.json index 1efa3c1f589..33548e063da 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yieldlab/test-auction-yieldlab-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yieldlab/test-auction-yieldlab-response.json @@ -51,32 +51,80 @@ "ext": { "debug": { "httpcalls": { - "yieldlab": [ - { - "uri": "{{ yieldlab.exchange_uri }}/12345?content=json&pvid=true&ts=200000&t=key1%3Dvalue1%26key2%3Dvalue2&ids=YL-UID&yl_rtb_ifa=ifaId&yl_rtb_devicetype=4&yl_rtb_connectiontype=6&lat=51.49949&lon=-0.128953&gdpr=0&consent=consentValue", - "responsebody": "[{\"id\":12345,\"price\":201,\"advertiser\":\"yieldlab\",\"adsize\":\"400x300\",\"pid\":1234,\"did\":5678,\"pvid\":\"40cb3251-1e1e-4cfd-8edc-7d32dc1a21e5\"}]", - "status": 200 - } - ], "cache": [ { - "uri": "{{ cache.endpoint }}", "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"12345\",\"impid\":\"impId001\",\"price\":2.29,\"adm\":\"\",\"crid\":\"12345123435\",\"dealid\":\"1234\",\"w\":400,\"h\":300,\"ext\":{\"origbidcpm\":2.01,\"origbidcur\":\"EUR\"}}}]}", "responsebody": "{\"responses\":[{\"uuid\":\"ca2a4dd3-f974-4eff-be5c-986bf4e083ce\"}]}", - "status": 200 + "status": 200, + "uri": "{{ cache.endpoint }}" + } + ], + "yieldlab": [ + { + "responsebody": "[{\"id\":12345,\"price\":201,\"advertiser\":\"yieldlab\",\"adsize\":\"400x300\",\"pid\":1234,\"did\":5678,\"pvid\":\"40cb3251-1e1e-4cfd-8edc-7d32dc1a21e5\"}]", + "status": 200, + "uri": "{{ yieldlab.exchange_uri }}/12345?content=json&pvid=true&ts=200000&t=key1%3Dvalue1%26key2%3Dvalue2&ids=YL-UID&yl_rtb_ifa=ifaId&yl_rtb_devicetype=4&yl_rtb_connectiontype=6&lat=51.49949&lon=-0.128953&gdpr=0&consent=consentValue" } ] }, "resolvedrequest": { + "at": 1, + "cur": [ + "USD" + ], + "device": { + "connectiontype": 6, + "devicetype": 4, + "dnt": 2, + "geo": { + "lat": 51.49949, + "lon": -0.128953 + }, + "h": 1098, + "ifa": "ifaId", + "ip": "193.168.244.1", + "language": "en", + "pxratio": 4.2, + "ua": "userAgent", + "w": 814 + }, + "ext": { + "prebid": { + "auctiontimestamp": 1000, + "channel": { + "name": "web" + }, + "cache": { + "bids": { + }, + "vastxml": { + "ttlseconds": 120 + } + }, + "debug": 1, + "targeting": { + "includebidderkeys": true, + "includewinners": true, + "pricegranularity": { + "precision": 2, + "ranges": [ + { + "increment": 0.1, + "max": 20 + } + ] + } + } + } + }, "id": "tid", "imp": [ { - "id": "impId001", "banner": { "format": [ { - "w": 300, - "h": 250 + "h": 250, + "w": 300 } ] }, @@ -84,91 +132,44 @@ "prebid": { "bidder": { "yieldlab": { + "adSize": "400x300", "adslotId": "12345", + "extId": "abc", "supplyId": "123456789", - "adSize": "400x300", "targeting": { "key1": "value1", "key2": "value2" - }, - "extId": "abc" + } } } } - } + }, + "id": "impId001" } ], + "regs": { + "ext": { + "gdpr": 0 + } + }, "site": { + "ext": { + "amp": 0 + }, "id": "siteId", "page": "http://localhost:9090/gdpr.html", "publisher": { "id": "publisherId" - }, - "ext": { - "amp": 0 } }, - "device": { - "ua": "userAgent", - "geo": { - "lat": 51.49949, - "lon": -0.128953 - }, - "dnt": 2, - "ip": "193.168.244.1", - "devicetype": 4, - "h": 1098, - "w": 814, - "pxratio": 4.2, - "language": "en", - "connectiontype": 6, - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], "source": { "fd": 1, "tid": "tid" }, - "regs": { + "tmax": 5000, + "user": { "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } + "consent": "consentValue" } } } @@ -177,9 +178,9 @@ "yieldlab": "{{ yieldlab.response_time_ms }}", "cache": "{{ cache.response_time_ms }}" }, - "tmaxrequest": 5000, "prebid": { "auctiontimestamp": 1000 - } + }, + "tmaxrequest": 5000 } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-auction-yieldmo-response.json b/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-auction-yieldmo-response.json index 36386f57789..bf4d467e11d 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-auction-yieldmo-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-auction-yieldmo-response.json @@ -36,7 +36,8 @@ "cacheId": "a5d3a873-d06e-4f2f-8556-120e05d62b28" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-cache-yieldmo-request.json b/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-cache-yieldmo-request.json index 60845624d51..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-cache-yieldmo-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yieldmo/test-cache-yieldmo-request.json @@ -11,8 +11,11 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-auction-yieldone-response.json b/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-auction-yieldone-response.json index 0eebe0f049e..2288a229e67 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-auction-yieldone-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-auction-yieldone-response.json @@ -36,7 +36,8 @@ "cacheId": "f0ab9105-cb21-4e59-b433-70f5ad6671cb" } } - } + }, + "origbidcpm": 3.33 } } ], diff --git a/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-cache-yieldone-request.json b/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-cache-yieldone-request.json index 23ddbec96e5..424a76e0ac4 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-cache-yieldone-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/yieldone/test-cache-yieldone-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 3.33 + } } } ] diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-request.json b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-request.json index cf0d5e2ef9c..fba4b6cf08f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-request.json @@ -66,7 +66,6 @@ }, "ext": { "prebid": { - "debug": 1, "currency": { "rates": { "EUR": { @@ -107,4 +106,4 @@ "gdpr": 0 } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-response.json b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-response.json index 7b667fc46b9..4e03d8c7c10 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-auction-zeroclickfraud-response.json @@ -46,7 +46,8 @@ "cacheId": "62019cff-d657-42fc-8366-16c34e1fd28c" } } - } + }, + "origbidcpm": 9.99 } }, { @@ -82,7 +83,8 @@ "cacheId": "c1662cf6-f00a-4066-b71a-46d97abccc35" } } - } + }, + "origbidcpm": 7.77 } } ], @@ -92,154 +94,6 @@ ], "cur": "USD", "ext": { - "debug": { - "httpcalls": { - "cache": [ - { - "uri": "{{ cache.endpoint }}", - "requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adm\":\"adm001\",\"adid\":\"adid001\",\"cid\":\"cid001\",\"crid\":\"crid001\",\"w\":300,\"h\":250}},{\"type\":\"json\",\"value\":{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"nurl\":\"https://example.com/nurl\",\"adm\":\"prebid.org wrapper\",\"adomain\":[\"psacentral.org\"],\"cid\":\"cid002\",\"crid\":\"crid002\",\"w\":300,\"h\":250}},{\"type\":\"xml\",\"value\":\"prebid.org wrapper\",\"expiry\":120}]}", - "responsebody": "{\"responses\":[{\"uuid\":\"c1662cf6-f00a-4066-b71a-46d97abccc35\"},{\"uuid\":\"dbaa191c-5a56-4655-85eb-da079f94e09f\"},{\"uuid\":\"62019cff-d657-42fc-8366-16c34e1fd28c\"}]}", - "status": 200 - } - ], - "zeroclickfraud": [ - { - "uri": "{{ zeroclickfraud.exchange_uri }}?sid=2", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId002\",\"video\":{\"mimes\":[\"video/mp4\"],\"w\":300,\"h\":250,\"pos\":1},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":2}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"ZF-UID\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"currency\":{\"rates\":{\"EUR\":{\"USD\":1.2406},\"USD\":{\"EUR\":0.811}}},\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"crid\":\"crid002\",\"cid\":\"cid002\",\"adomain\":[\"psacentral.org\"],\"nurl\":\"https://example.com/nurl\",\"h\":250,\"w\":300}],\"seat\":\"zeroclickfraud\"}]}", - "status": 200 - }, - { - "uri": "{{ zeroclickfraud.exchange_uri }}?sid=1", - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId001\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}]},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":1}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"ZF-UID\",\"ext\":{\"consent\":\"consentValue\"}},\"at\":1,\"tmax\":5000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"debug\":1,\"currency\":{\"rates\":{\"EUR\":{\"USD\":1.2406},\"USD\":{\"EUR\":0.811}}},\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}},\"auctiontimestamp\":1000,\"channel\":{\"name\":\"web\"}}}}", - "responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adid\":\"adid001\",\"crid\":\"crid001\",\"cid\":\"cid001\",\"adm\":\"adm001\",\"h\":250,\"w\":300}],\"seat\":\"zeroclickfraud\"}]}", - "status": 200 - } - ] - }, - "resolvedrequest": { - "id": "tid", - "imp": [ - { - "id": "impId001", - "banner": { - "format": [ - { - "w": 300, - "h": 250 - } - ] - }, - "ext": { - "prebid": { - "bidder": { - "zeroclickfraud": { - "host": "localhost:8090", - "sourceId": 1 - } - } - } - } - }, - { - "id": "impId002", - "video": { - "mimes": [ - "video/mp4" - ], - "w": 300, - "h": 250, - "pos": 1 - }, - "ext": { - "prebid": { - "bidder": { - "zeroclickfraud": { - "host": "localhost:8090", - "sourceId": 2 - } - } - } - } - } - ], - "site": { - "domain": "example.com", - "page": "http://www.example.com", - "publisher": { - "id": "publisherId" - }, - "ext": { - "amp": 0 - } - }, - "device": { - "ua": "userAgent", - "dnt": 2, - "ip": "193.168.244.1", - "pxratio": 4.2, - "language": "en", - "ifa": "ifaId" - }, - "user": { - "ext": { - "consent": "consentValue" - } - }, - "at": 1, - "tmax": 5000, - "cur": [ - "USD" - ], - "source": { - "fd": 1, - "tid": "tid" - }, - "regs": { - "ext": { - "gdpr": 0 - } - }, - "ext": { - "prebid": { - "debug": 1, - "currency": { - "rates": { - "EUR": { - "USD": 1.2406 - }, - "USD": { - "EUR": 0.811 - } - } - }, - "targeting": { - "pricegranularity": { - "precision": 2, - "ranges": [ - { - "max": 20, - "increment": 0.1 - } - ] - }, - "includewinners": true, - "includebidderkeys": true - }, - "cache": { - "bids": {}, - "vastxml": { - "ttlseconds": 120 - } - }, - "auctiontimestamp": 1000, - "channel": { - "name": "web" - } - } - } - } - }, "responsetimemillis": { "zeroclickfraud": "{{ zeroclickfraud.response_time_ms }}", "cache": "{{ cache.response_time_ms }}" diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-cache-zeroclickfraud-request.json b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-cache-zeroclickfraud-request.json index abf2fab21df..bb6e149acf3 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-cache-zeroclickfraud-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-cache-zeroclickfraud-request.json @@ -11,7 +11,10 @@ "cid": "cid001", "crid": "crid001", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 7.77 + } } }, { @@ -28,7 +31,10 @@ "cid": "cid002", "crid": "crid002", "w": 300, - "h": 250 + "h": 250, + "ext": { + "origbidcpm": 9.99 + } } }, { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-1.json b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-1.json index d578b675833..6a284127b5a 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-1.json @@ -59,7 +59,6 @@ }, "ext": { "prebid": { - "debug": 1, "currency": { "rates": { "EUR": { @@ -95,4 +94,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-2.json b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-2.json index 871c2f75cd1..1511eb1a5b0 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-2.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/zeroclickfraud/test-zeroclickfraud-bid-request-2.json @@ -59,7 +59,6 @@ }, "ext": { "prebid": { - "debug": 1, "currency": { "rates": { "EUR": { @@ -95,4 +94,4 @@ } } } -} \ No newline at end of file +}