Update First Party Data workflow and introduce Bidder Config

src/main/java/org/prebid/server/auction/AmpRequestFactory.java

@@ -29,9 +29,11 @@
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidCache;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidCacheBids;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidCacheVastxml;
+import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidData;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestTargeting;
 import org.prebid.server.proto.openrtb.ext.request.ExtSite;
 import org.prebid.server.proto.openrtb.ext.request.ExtUser;
+import org.prebid.server.proto.request.Targeting;
 import org.prebid.server.util.HttpUtil;
 
 import java.util.ArrayList;
@@ -43,6 +45,7 @@
 public class AmpRequestFactory {
 
     private static final String TAG_ID_REQUEST_PARAM = "tag_id";
+    private static final String TARGETING_REQUEST_PARAM = "targeting";
     private static final String DEBUG_REQUEST_PARAM = "debug";
     private static final String OW_REQUEST_PARAM = "ow";
     private static final String OH_REQUEST_PARAM = "oh";
@@ -81,7 +84,6 @@ public Future<AuctionContext> fromRequest(RoutingContext routingContext, long st
         if (StringUtils.isBlank(tagId)) {
             return Future.failedFuture(new InvalidRequestException("AMP requests require an AMP tag_id", true));
         }
-
         return createBidRequest(routingContext, tagId)
                 .compose(bidRequest ->
                         auctionRequestFactory.toAuctionContext(routingContext, bidRequest, startTime, timeoutResolver));
@@ -208,11 +210,15 @@ private static Integer debugFromQueryStringParam(RoutingContext context) {
      * Extracts parameters from http request and overrides corresponding attributes in {@link BidRequest}.
      */
     private BidRequest overrideParameters(BidRequest bidRequest, HttpServerRequest request) {
-        final Site updatedSite = overrideSite(bidRequest.getSite(), request);
+        final String requestTargeting = request.getParam(TARGETING_REQUEST_PARAM);
+        final Targeting targeting = parseTargeting(requestTargeting);
+
+        final Site updatedSite = overrideSite(bidRequest.getSite(), targeting, request);
         final Imp updatedImp = overrideImp(bidRequest.getImp().get(0), request);
         final Long updatedTimeout = overrideTimeout(bidRequest.getTmax(), request);
-        final User updatedUser = overrideUser(bidRequest.getUser(), request);
+        final User updatedUser = overrideUser(bidRequest.getUser(), targeting, request);
         final Regs updatedRegs = overrideRegs(bidRequest.getRegs(), request);
+        final ObjectNode updatedExt = overrideExt(bidRequest.getExt(), targeting);
 
         final BidRequest result;
         if (updatedSite != null || updatedImp != null || updatedTimeout != null || updatedUser != null
@@ -223,20 +229,33 @@ private BidRequest overrideParameters(BidRequest bidRequest, HttpServerRequest r
                     .tmax(updatedTimeout != null ? updatedTimeout : bidRequest.getTmax())
                     .user(updatedUser != null ? updatedUser : bidRequest.getUser())
                     .regs(updatedRegs != null ? updatedRegs : bidRequest.getRegs())
+                    .ext(updatedExt != null ? updatedExt : bidRequest.getExt())
                     .build();
         } else {
             result = bidRequest;
         }
         return result;
     }
 
-    private Site overrideSite(Site site, HttpServerRequest request) {
+    private Targeting parseTargeting(String jsonTargeting) {
+        try {
+            final String decodedJsonTargeting = HttpUtil.decodeUrl(jsonTargeting);
+            return decodedJsonTargeting == null
+                    ? Targeting.empty()
+                    : mapper.mapper().readValue(decodedJsonTargeting, Targeting.class);
+        } catch (JsonProcessingException | IllegalArgumentException e) {
+            throw new InvalidRequestException(String.format("Error decoding targeting from url: %s", e.getMessage()));
+        }
+    }
+
+    private Site overrideSite(Site site, Targeting targeting, HttpServerRequest request) {
         final String canonicalUrl = canonicalUrl(request);
         final String accountId = request.getParam(ACCOUNT_REQUEST_PARAM);
 
         final boolean hasSite = site != null;
         final ObjectNode siteExt = hasSite ? site.getExt() : null;
-        final boolean shouldSetExtAmp = siteExt == null || siteExt.get("amp") == null;
+        final ObjectNode targetingSite = targeting.getSite();
+        final boolean shouldSetExtAmp = targetingSite != null || siteExt == null || siteExt.get("amp") == null;
 
         if (StringUtils.isNotBlank(canonicalUrl) || StringUtils.isNotBlank(accountId) || shouldSetExtAmp) {
             final Site.SiteBuilder siteBuilder = hasSite ? site.toBuilder() : Site.builder();
@@ -251,8 +270,12 @@ private Site overrideSite(Site site, HttpServerRequest request) {
                 siteBuilder.publisher(publisherBuilder.id(accountId).build());
             }
             if (shouldSetExtAmp) {
-                final ObjectNode data = siteExt != null ? (ObjectNode) siteExt.get("data") : null;
-                siteBuilder.ext(mapper.mapper().valueToTree(ExtSite.of(1, data)));
+                if (targetingSite != null) {
+                    siteBuilder.ext(mapper.mapper().valueToTree(ExtSite.of(1, targetingSite)));
+                } else {
+                    final ObjectNode data = siteExt != null ? (ObjectNode) siteExt.get("data") : null;
+                    siteBuilder.ext(mapper.mapper().valueToTree(ExtSite.of(1, data)));
+                }
             }
             return siteBuilder.build();
         }
@@ -381,9 +404,10 @@ private static Long overrideTimeout(Long tmax, HttpServerRequest request) {
         return timeout > 0 && !Objects.equals(timeout, tmax) ? timeout : null;
     }
 
-    private User overrideUser(User user, HttpServerRequest request) {
+    private User overrideUser(User user, Targeting targeting, HttpServerRequest request) {
         final String gdprConsent = request.getParam(GDPR_CONSENT_PARAM);
-        if (StringUtils.isBlank(gdprConsent)) {
+        final ObjectNode targetingUser = targeting.getUser();
+        if (StringUtils.isBlank(gdprConsent) && targetingUser == null) {
             return null;
         }
 
@@ -394,12 +418,18 @@ private User overrideUser(User user, HttpServerRequest request) {
                 ? extractExtUser(extUserNode).toBuilder()
                 : ExtUser.builder();
 
-        final ExtUser updatedExtUser = extUserBuilder.consent(gdprConsent).build();
+        if (StringUtils.isNotBlank(gdprConsent)) {
+            extUserBuilder.consent(gdprConsent);
+        }
+
+        if (targetingUser != null) {
+            extUserBuilder.data(targetingUser);
+        }
 
         final User.UserBuilder userBuilder = hasUser ? user.toBuilder() : User.builder();
 
         return userBuilder
-                .ext(mapper.mapper().valueToTree(updatedExtUser))
+                .ext(mapper.mapper().valueToTree(extUserBuilder.build()))
                 .build();
     }
 
@@ -430,6 +460,22 @@ private Regs overrideRegs(Regs regs, HttpServerRequest request) {
         return Regs.of(coppa, mapper.mapper().valueToTree(ExtRegs.of(gdpr, usPrivacyParam)));
     }
 
+    private ObjectNode overrideExt(ObjectNode ext, Targeting targeting) {
+        final List<String> bidders = targeting.getBidders();
+        if (bidders == null) {
+            return null;
+        }
+        final ExtBidRequest extBidRequest = extBidRequest(ext);
+        final ExtRequestPrebid prebid = extBidRequest.getPrebid();
+        final ExtRequestPrebidData data = ExtRequestPrebidData.of(bidders);
+
+        final ExtRequestPrebid updatedPrebid = prebid == null
+                ? ExtRequestPrebid.builder().data(data).build()
+                : prebid.toBuilder().data(data).build();
+
+        return mapper.mapper().valueToTree(ExtBidRequest.of(updatedPrebid));
+    }
+
     /**
      * Extracts {@link ExtRegs} from bidrequest.regs.ext {@link ObjectNode}.
      */