diff --git a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java index 2622aae49cf..d6dd53b75d7 100644 --- a/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java +++ b/src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java @@ -112,13 +112,13 @@ private static Publisher modifyPublisher(Publisher publisher, Integer networkId) public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return extractBids(httpCall.getRequest().getPayload(), bidResponse); + return extractBids(bidResponse); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private Result> extractBids(BidRequest bidRequest, BidResponse bidResponse) { + private Result> extractBids(BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Result.empty(); } @@ -128,19 +128,18 @@ private Result> extractBids(BidRequest bidRequest, BidResponse b .map(SeatBid::getBid) .filter(Objects::nonNull) .flatMap(Collection::stream) - .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur())) + .map(bid -> BidderBid.of(bid, getBidTypeFromMarkupType(bid.getMtype()), bidResponse.getCur())) .toList(); return Result.of(bidderBids, errors); } - private static BidType getBidType(String impId, List imps) { - for (Imp imp : imps) { - if (imp.getId().equals(impId)) { - return imp.getVideo() != null - ? BidType.video - : (imp.getXNative() != null ? BidType.xNative : BidType.banner); - } - } - return BidType.banner; + private static BidType getBidTypeFromMarkupType(Integer markupType) { + return switch (markupType) { + case 1 -> BidType.banner; + case 2 -> BidType.video; + case 3 -> BidType.audio; + case 4 -> BidType.xNative; + case null, default -> BidType.banner; + }; } } diff --git a/src/main/resources/bidder-config/smartadserver.yaml b/src/main/resources/bidder-config/smartadserver.yaml index a4ff6fff510..f1233b2e754 100644 --- a/src/main/resources/bidder-config/smartadserver.yaml +++ b/src/main/resources/bidder-config/smartadserver.yaml @@ -1,16 +1,22 @@ adapters: smartadserver: endpoint: https://ssb-global.smartadserver.com + endpoint-compression: gzip + aliases: + equativ: + enabled: false meta-info: maintainer-email: supply-partner-integration@equativ.com app-media-types: - banner - video - native + - audio site-media-types: - banner - video - native + - audio supported-vendors: vendor-id: 45 usersync: diff --git a/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java b/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java index 35b7470f758..d31213136fb 100644 --- a/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/smartadserver/SmartadserverBidderTest.java @@ -4,7 +4,6 @@ import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; -import com.iab.openrtb.request.Native; import com.iab.openrtb.request.Publisher; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.Video; @@ -27,8 +26,10 @@ import java.util.function.Function; import static java.util.Collections.singletonList; +import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.prebid.server.proto.openrtb.ext.response.BidType.audio; import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; import static org.prebid.server.proto.openrtb.ext.response.BidType.video; import static org.prebid.server.proto.openrtb.ext.response.BidType.xNative; @@ -66,7 +67,7 @@ public void makeHttpRequestsShouldReturnErrorIfImpExtCouldNotBeParsed() { public void makeHttpRequestsShouldCreateCorrectURL() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(singletonList(givenImp(Function.identity()))) + .imp(singletonList(givenImp(identity()))) .build(); // when @@ -83,7 +84,7 @@ public void makeHttpRequestsShouldCreateCorrectURL() { public void makeHttpRequestsShouldUpdateSiteObjectIfPresent() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(singletonList(givenImp(Function.identity()))) + .imp(singletonList(givenImp(identity()))) .site(Site.builder() .domain("www.foo.com") .publisher(Publisher.builder().domain("foo.com").build()) @@ -110,7 +111,7 @@ public void makeHttpRequestsShouldUpdateSiteObjectIfPresent() { public void makeHttpRequestsShouldCreateRequestForEveryValidImp() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(Arrays.asList(givenImp(Function.identity()), + .imp(Arrays.asList(givenImp(identity()), givenImp(impBuilder -> impBuilder.id("456")) )) .build(); @@ -196,14 +197,12 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws Jso } @Test - public void makeBidsShouldReturnBannerBidIfBannerIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnBannerBidIfMarkupTypeIsBanner() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").banner(Banner.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(1)))); // when final Result> result = target.makeBids(httpCall, null); @@ -211,18 +210,33 @@ public void makeBidsShouldReturnBannerBidIfBannerIsPresent() throws JsonProcessi // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), banner, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(1).build(), banner, "EUR")); } @Test - public void makeBidsShouldReturnBannerBidByDefault() throws JsonProcessingException { + public void makeBidsShouldReturnAudioBidIfMarkupTypeIsAudio() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").banner(Banner.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(Function.identity()))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(3)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().mtype(3).build(), audio, "EUR")); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMarkupTypeIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder().build(), + mapper.writeValueAsString( + givenBidResponse(identity()))); // when final Result> result = target.makeBids(httpCall, null); @@ -234,14 +248,29 @@ public void makeBidsShouldReturnBannerBidByDefault() throws JsonProcessingExcept } @Test - public void makeBidsShouldReturnVideoBidIfVideoIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnBannerBidIfMarkupTypeOutOfBounds() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder().build(), + mapper.writeValueAsString( + givenBidResponse(bidBuilder -> bidBuilder.mtype(5)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsOnly(BidderBid.of(Bid.builder().mtype(5).build(), banner, "EUR")); + } + + @Test + public void makeBidsShouldReturnVideoBidIfMarkupTypeIsVideo() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").video(Video.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(2)))); // when final Result> result = target.makeBids(httpCall, null); @@ -249,18 +278,16 @@ public void makeBidsShouldReturnVideoBidIfVideoIsPresent() throws JsonProcessing // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), video, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(2).build(), video, "EUR")); } @Test - public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessingException { + public void makeBidsShouldReturnNativeBidIfMarkupTypeIsNative() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").xNative(Native.builder().build()).build())) - .build(), + BidRequest.builder().build(), mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponse(bidBuilder -> bidBuilder.mtype(4)))); // when final Result> result = target.makeBids(httpCall, null); @@ -268,7 +295,7 @@ public void makeBidsShouldReturnNativeBidIfNativeIsPresent() throws JsonProcessi // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) - .containsOnly(BidderBid.of(Bid.builder().impid("123").build(), xNative, "EUR")); + .containsOnly(BidderBid.of(Bid.builder().mtype(4).build(), xNative, "EUR")); } private static Imp givenImp(Function impCustomizer) { diff --git a/src/test/java/org/prebid/server/it/EquativTest.java b/src/test/java/org/prebid/server/it/EquativTest.java new file mode 100644 index 00000000000..e3464330edd --- /dev/null +++ b/src/test/java/org/prebid/server/it/EquativTest.java @@ -0,0 +1,36 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.prebid.server.model.Endpoint; + +import java.io.IOException; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Collections.singletonList; + +public class EquativTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromEquativ() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/smartadserver-exchange/api/bid")) + .withRequestBody( + equalToJson(jsonFrom("openrtb2/equativ/test-equativ-bid-request.json"))) + .willReturn(aResponse() + .withBody(jsonFrom("openrtb2/equativ/test-equativ-bid-response.json")))); + + // when + final Response response = responseFor( + "openrtb2/equativ/test-auction-equativ-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/equativ/test-auction-equativ-response.json", response, + singletonList("equativ")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json new file mode 100644 index 00000000000..acd98861296 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-request.json @@ -0,0 +1,30 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "prebid": { + "bidder": { + "equativ": { + "siteId": 1, + "pageId": 2, + "formatId": 3, + "networkId": 73 + } + } + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json new file mode 100644 index 00000000000..04029bdb400 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-auction-equativ-response.json @@ -0,0 +1,46 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 0.5, + "adm": "some-test-ad", + "adid": "adid", + "adomain": [ + "advertsite.com" + ], + "cid": "cid", + "crid": "crid", + "w": 1024, + "h": 576, + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "equativ" + } + }, + "origbidcpm": 0.5 + }, + "mtype": 1 + } + ], + "seat": "equativ", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "equativ": "{{ equativ.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-request.json new file mode 100644 index 00000000000..05fec0b445d --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-request.json @@ -0,0 +1,60 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "secure": 1, + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "siteId": 1, + "pageId": 2, + "formatId": 3, + "networkId": 73 + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "id": "73", + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-response.json new file mode 100644 index 00000000000..09d1cc62eb9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/equativ/test-equativ-bid-response.json @@ -0,0 +1,24 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 0.500000, + "adid": "adid", + "adm": "some-test-ad", + "adomain": [ + "advertsite.com" + ], + "cid": "cid", + "crid": "crid", + "h": 576, + "w": 1024, + "mtype": 1 + } + ] + } + ] +} 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 4bb230de7f8..bd97f80820d 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 @@ -25,7 +25,8 @@ } }, "origbidcpm": 0.5 - } + }, + "mtype": 1 } ], "seat": "smartadserver", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json index cee26a03931..09d1cc62eb9 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/smartadserver/test-smartadserver-bid-response.json @@ -15,7 +15,8 @@ "cid": "cid", "crid": "crid", "h": 576, - "w": 1024 + "w": 1024, + "mtype": 1 } ] } diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties index 747b9a2fc6a..c1b164d35a3 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -465,6 +465,7 @@ adapters.smaato.enabled=true adapters.smaato.endpoint=http://localhost:8090/smaato-exchange adapters.smartadserver.enabled=true adapters.smartadserver.endpoint=http://localhost:8090/smartadserver-exchange +adapters.smartadserver.aliases.equativ.enabled=true adapters.smartrtb.enabled=true adapters.smartrtb.endpoint=http://localhost:8090/smartrtb-exchange/ adapters.smartx.enabled=true