Add extra parameter to ExtImp of TelariaBidder (prebid#831)

AndriyPavlyuk · web-flow · commit f6436589ae9e · 2020-09-22T18:21:44.000+03:00
diff --git a/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java b/src/main/java/org/prebid/server/bidder/telaria/TelariaBidder.java
@@ -24,10 +24,12 @@
 import org.prebid.server.bidder.model.Result;
 import org.prebid.server.bidder.model.BidderError;
 import org.prebid.server.bidder.model.BidderBid;
+import org.prebid.server.bidder.telaria.model.TelariaRequestExt;
 import org.prebid.server.exception.PreBidException;
 import org.prebid.server.json.DecodeException;
 import org.prebid.server.json.JacksonMapper;
 import org.prebid.server.proto.openrtb.ext.ExtPrebid;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
 import org.prebid.server.proto.openrtb.ext.request.telaria.ExtImpOutTelaria;
 import org.prebid.server.proto.openrtb.ext.request.telaria.ExtImpTelaria;
 import org.prebid.server.proto.openrtb.ext.response.BidType;
@@ -73,16 +75,21 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
         final String publisherId = getPublisherId(bidRequest);
         String seatCode = null;
         final BidRequest.BidRequestBuilder requestBuilder = bidRequest.toBuilder();
+        ExtImpTelaria extImp = null;
         for (Imp imp : bidRequest.getImp()) {
             try {
-                final ExtImpTelaria extImp = parseImpExt(imp);
+                extImp = parseImpExt(imp);
                 seatCode = extImp.getSeatCode();
                 validImps.add(updateImp(imp, extImp, publisherId));
             } catch (PreBidException e) {
                 return Result.emptyWithError(BidderError.badInput(e.getMessage()));
             }
         }
 
+        if (extImp != null && extImp.getExtra() != null) {
+            requestBuilder.ext(mapper.fillExtension(ExtRequest.empty(), TelariaRequestExt.of(extImp.getExtra())));
+        }
+
         if (bidRequest.getSite() != null) {
             requestBuilder.site(modifySite(seatCode, bidRequest.getSite()));
         } else if (bidRequest.getApp() != null) {
diff --git a/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java b/src/main/java/org/prebid/server/bidder/telaria/model/TelariaRequestExt.java
@@ -0,0 +1,12 @@
+package org.prebid.server.bidder.telaria.model;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.AllArgsConstructor;
+import lombok.Value;
+
+@AllArgsConstructor(staticName = "of")
+@Value
+public class TelariaRequestExt {
+
+    ObjectNode extra;
+}
diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/telaria/ExtImpTelaria.java
@@ -1,6 +1,7 @@
 package org.prebid.server.proto.openrtb.ext.request.telaria;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.AllArgsConstructor;
 import lombok.Value;
 
@@ -13,4 +14,6 @@ public class ExtImpTelaria {
 
     @JsonProperty("seatCode")
     String seatCode;
+
+    ObjectNode extra;
 }
diff --git a/src/test/java/org/prebid/server/bidder/telaria/TelariaBidderTest.java b/src/test/java/org/prebid/server/bidder/telaria/TelariaBidderTest.java
@@ -23,7 +23,9 @@
 import org.prebid.server.bidder.model.HttpResponse;
 import org.prebid.server.bidder.model.Result;
 import org.prebid.server.bidder.smartrtb.SmartrtbBidder;
+import org.prebid.server.bidder.telaria.model.TelariaRequestExt;
 import org.prebid.server.proto.openrtb.ext.ExtPrebid;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
 import org.prebid.server.proto.openrtb.ext.request.telaria.ExtImpTelaria;
 
 import java.util.List;
@@ -121,7 +123,7 @@ public void makeHttpReturnErrorIfSeatCodeIsEmpty() {
         final BidRequest bidRequest = givenBidRequest(
                 impBuilder -> impBuilder
                         .ext(mapper.valueToTree(ExtPrebid.of(null,
-                                ExtImpTelaria.of("adCode", null)))));
+                                ExtImpTelaria.of("adCode", null, mapper.createObjectNode())))));
 
         // when
         final Result<List<HttpRequest<BidRequest>>> result = telariaBidder.makeHttpRequests(bidRequest);
@@ -130,6 +132,53 @@ public void makeHttpReturnErrorIfSeatCodeIsEmpty() {
         assertThat(result.getErrors()).hasSize(1).containsOnly(BidderError.badInput("Telaria: Seat Code required"));
     }
 
+    @Test
+    public void makeHttpRequestsShouldNotChangeExtIfExtExtraIsMissing() {
+        // given
+        final BidRequest bidRequest = givenBidRequest(
+                impBuilder -> impBuilder
+                        .ext(mapper.valueToTree(ExtPrebid.of(null,
+                                ExtImpTelaria.of("adCode", "seatCode", mapper.createObjectNode())))));
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = telariaBidder.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).hasSize(1)
+                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(BidRequest::getExt)
+                .extracting(ExtRequest::getPrebid)
+                .containsNull();
+    }
+
+    @Test
+    public void makeHttpRequestsShouldChangeRequestExtIfExtImpExtraIsNotEmpty() {
+        // given
+        final BidRequest bidRequest = BidRequest.builder()
+                .imp(singletonList(
+                        Imp.builder()
+                                .video(Video.builder().build())
+                                .ext(mapper.valueToTree(ExtPrebid.of(null,
+                                        ExtImpTelaria.of("adCode", "seatCode",
+                                                mapper.createObjectNode().put("custom", "1234")))))
+                                .build()))
+                .site(Site.builder().build())
+                .app(App.builder().build())
+                .build();
+
+        // when
+        final Result<List<HttpRequest<BidRequest>>> result = telariaBidder.makeHttpRequests(bidRequest);
+
+        // then
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).hasSize(1)
+                .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class))
+                .extracting(BidRequest::getExt)
+                .containsOnly(jacksonMapper.fillExtension(
+                        ExtRequest.empty(), TelariaRequestExt.of(mapper.createObjectNode().put("custom", "1234"))));
+    }
+
     @Test
     public void makeHttpRequestsShouldNotSetAppPublisherIdIfSiteIsNotNull() {
         // given
@@ -288,7 +337,7 @@ private static Imp givenImp(Function<Imp.ImpBuilder, Imp.ImpBuilder> impCustomiz
                 .id("123")
                 .video(Video.builder().build())
                 .ext(mapper.valueToTree(ExtPrebid.of(null,
-                        ExtImpTelaria.of("adCode", "seatCode")))))
+                        ExtImpTelaria.of("adCode", "seatCode", null)))))
                 .build();
     }
 
diff --git a/src/test/java/org/prebid/server/it/TelariaTest.java b/src/test/java/org/prebid/server/it/TelariaTest.java
@@ -35,7 +35,7 @@ public void openrtb2AuctionShouldRespondWithBidsFromTelaria() throws IOException
                 .withHeader("x-openrtb-version", equalTo("2.5"))
                 .withHeader("Accept-Encoding", equalTo("gzip"))
                 .withHeader("Accept-Language", equalTo("en"))
-                .withHeader("Content-Length", equalTo("933"))
+                .withHeader("Content-Length", equalTo("677"))
                 .withHeader("DNT", equalTo("2"))
                 .withHeader("Host", equalTo("localhost:8090"))
                 .withRequestBody(
diff --git a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-request.json b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-auction-telaria-request.json
@@ -20,7 +20,10 @@
       "ext": {
         "telaria": {
           "adCode": "my-adcode",
-          "seatCode": "my-seatcode"
+          "seatCode": "my-seatcode",
+          "extra": {
+            "custom": "1234"
+          }
         }
       }
     }
diff --git a/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-telaria-bid-request-1.json b/src/test/resources/org/prebid/server/it/openrtb2/telaria/test-telaria-bid-request-1.json
@@ -67,37 +67,8 @@
     }
   },
   "ext": {
-    "prebid": {
-      "currency": {
-        "rates": {
-          "EUR": {
-            "USD": 1.2406
-          },
-          "USD": {
-            "EUR": 0.811
-          }
-        }
-      },
-      "targeting": {
-        "includebidderkeys": true,
-        "includewinners": true,
-        "pricegranularity": {
-          "precision": 2,
-          "ranges": [
-            {
-              "max": 20,
-              "increment": 0.1
-            }
-          ]
-        }
-      },
-      "cache": {
-        "bids": {},
-        "vastxml": {
-          "ttlseconds": 120
-        }
-      },
-      "auctiontimestamp": 1000
+    "extra": {
+      "custom": "1234"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@`
`20`	`20`	`"ext": {`
`21`	`21`	`"telaria": {`
`22`	`22`	`"adCode": "my-adcode",`
`23`		`- "seatCode": "my-seatcode"`
	`23`	`+ "seatCode": "my-seatcode",`
	`24`	`+ "extra": {`
	`25`	`+ "custom": "1234"`
	`26`	`+ }`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`}`