RTBHouse: removed imp[].pmp object and publisherId parameter copied to site.publisher.id

Author: pjaworski-rtbh

src/main/java/org/prebid/server/bidder/rtbhouse/RtbhouseBidder.java

@@ -5,6 +5,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
+import com.iab.openrtb.request.Site;
+import com.iab.openrtb.request.Publisher;
+import com.iab.openrtb.request.Publisher.PublisherBuilder;
 import com.iab.openrtb.response.Bid;
 import com.iab.openrtb.response.BidResponse;
 import com.iab.openrtb.response.SeatBid;
@@ -60,13 +63,18 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
 
         final List<Imp> modifiedImps = new ArrayList<>();
         final List<BidderError> errors = new ArrayList<>();
+        String publisherId = null;
 
         for (Imp imp : bidRequest.getImp()) {
             try {
                 final ExtImpRtbhouse impExt = parseImpExt(imp);
                 final Price bidFloorPrice = resolveBidFloor(imp, impExt, bidRequest);
 
                 modifiedImps.add(modifyImp(imp, bidFloorPrice));
+                // Get publisherId from first valid impExt
+                if (publisherId == null && impExt.getPublisherId() != null) {
+                    publisherId = impExt.getPublisherId();
+                }
             } catch (PreBidException e) {
                 errors.add(BidderError.badInput(e.getMessage()));
             }
@@ -76,11 +84,13 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
             return Result.withErrors(errors);
         }
 
-        final BidRequest outgoingRequest = bidRequest.toBuilder()
+        BidRequest outgoingRequest = bidRequest.toBuilder()
                 .cur(Collections.singletonList(BIDDER_CURRENCY))
                 .imp(modifiedImps)
                 .build();
 
+        outgoingRequest = updateSitePublisherId(outgoingRequest, publisherId);
+
         return Result.withValue(BidderUtil.defaultRequest(outgoingRequest, endpointUrl, mapper));
     }
 
@@ -175,10 +185,10 @@ private ExtImpRtbhouse parseImpExt(Imp imp) {
     }
 
     private static Imp modifyImp(Imp imp, Price bidFloorPrice) {
-
         return imp.toBuilder()
                 .bidfloorcur(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getCurrency))
                 .bidfloor(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getValue))
+                .pmp(null)
                 .build();
     }
 
@@ -223,4 +233,25 @@ private static Bid resolveMacros(Bid bid) {
                 .build();
     }
 
+    static BidRequest updateSitePublisherId(BidRequest bidRequest, String publisherId) {
+        if (bidRequest == null || publisherId == null) {
+            return bidRequest;
+        }
+
+        final Site site = bidRequest.getSite();
+        Publisher publisher = (site != null) ? site.getPublisher() : null;
+
+        final PublisherBuilder publisherBuilder = (publisher != null)
+                ? publisher.toBuilder()
+                : Publisher.builder();
+
+        publisherBuilder.id(publisherId);
+        publisher = publisherBuilder.build();
+
+        final Site updatedSite = (site != null)
+                ? site.toBuilder().publisher(publisher).build()
+                : Site.builder().publisher(publisher).build();
+
+        return bidRequest.toBuilder().site(updatedSite).build();
+    }
 }