Equativ: SmartAdserver alias with update to use mtype

src/main/java/org/prebid/server/bidder/smartadserver/SmartadserverBidder.java

@@ -112,13 +112,13 @@ private static Publisher modifyPublisher(Publisher publisher, Integer networkId)
     public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> 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<List<BidderBid>> extractBids(BidRequest bidRequest, BidResponse bidResponse) {
+    private Result<List<BidderBid>> extractBids(BidResponse bidResponse) {
         if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
             return Result.empty();
         }
@@ -128,19 +128,18 @@ private Result<List<BidderBid>> 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<Imp> 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;
+        };
     }
 }

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:

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,33 +197,46 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws Jso
     }
 
     @Test
-    public void makeBidsShouldReturnBannerBidIfBannerIsPresent() throws JsonProcessingException {
+    public void makeBidsShouldReturnBannerBidIfMarkupTypeIsBanner() throws JsonProcessingException {
         // given
         final BidderCall<BidRequest> 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<List<BidderBid>> result = target.makeBids(httpCall, null);
 
         // 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<BidRequest> 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<List<BidderBid>> 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<BidRequest> httpCall = givenHttpCall(
+                BidRequest.builder().build(),
+                mapper.writeValueAsString(
+                        givenBidResponse(identity())));
 
         // when
         final Result<List<BidderBid>> result = target.makeBids(httpCall, null);
@@ -234,41 +248,54 @@ public void makeBidsShouldReturnBannerBidByDefault() throws JsonProcessingExcept
     }
 
     @Test
-    public void makeBidsShouldReturnVideoBidIfVideoIsPresent() throws JsonProcessingException {
+    public void makeBidsShouldReturnBannerBidIfMarkupTypeOutOfBounds() throws JsonProcessingException {
+        // given
+        final BidderCall<BidRequest> httpCall = givenHttpCall(
+                BidRequest.builder().build(),
+                mapper.writeValueAsString(
+                        givenBidResponse(bidBuilder -> bidBuilder.mtype(5))));
+
+        // when
+        final Result<List<BidderBid>> 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<BidRequest> 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<List<BidderBid>> result = target.makeBids(httpCall, null);
 
         // 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<BidRequest> 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<List<BidderBid>> result = target.makeBids(httpCall, null);
 
         // 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<Imp.ImpBuilder, Imp.ImpBuilder> impCustomizer) {

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"));
+    }
+}

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
+    }
+  }
+}

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
+  }
+}