Move logic

Author: CTMBNara

src/main/java/org/prebid/server/auction/requestfactory/GetInterfaceRequestFactory.java

@@ -1,5 +1,8 @@
 package org.prebid.server.auction.requestfactory;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.iab.openrtb.request.App;
 import com.iab.openrtb.request.Audio;
 import com.iab.openrtb.request.Banner;
@@ -17,6 +20,8 @@
 import io.vertx.core.Future;
 import io.vertx.ext.web.RoutingContext;
 import lombok.Value;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.prebid.server.auction.DebugResolver;
 import org.prebid.server.auction.GeoLocationServiceWrapper;
@@ -27,7 +32,6 @@
 import org.prebid.server.auction.externalortb.StoredRequestProcessor;
 import org.prebid.server.auction.gpp.AuctionGppService;
 import org.prebid.server.auction.model.AuctionContext;
-import org.prebid.server.auction.model.AuctionStoredResult;
 import org.prebid.server.auction.model.ConsentType;
 import org.prebid.server.auction.model.IpAddress;
 import org.prebid.server.auction.privacy.contextfactory.AuctionPrivacyContextFactory;
@@ -41,7 +45,6 @@
 import org.prebid.server.model.HttpRequestContext;
 import org.prebid.server.proto.openrtb.ext.request.ConsentedProvidersSettings;
 import org.prebid.server.proto.openrtb.ext.request.ExtDevice;
-import org.prebid.server.proto.openrtb.ext.request.ExtImpPrebid;
 import org.prebid.server.proto.openrtb.ext.request.ExtRegs;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
 import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
@@ -125,37 +128,35 @@ public Future<AuctionContext> fromRequest(RoutingContext routingContext, long st
                         initialBidRequest(httpRequest),
                         startTime))
 
+                .recover(ortb2RequestFactory::restoreResultFromRejection);
+    }
+
+    public Future<AuctionContext> enrichAuctionContext(AuctionContext initialContext) {
+        if (initialContext.isRequestRejected()) {
+            return Future.succeededFuture(initialContext);
+        }
+
+        return Future.succeededFuture(addTmpPublisher(initialContext))
+
                 .compose(auctionContext -> ortb2RequestFactory.fetchAccount(auctionContext)
                         .map(auctionContext::with))
 
                 .map(auctionContext -> auctionContext.with(removeTmpPublisher(auctionContext.getBidRequest())))
 
                 .map(auctionContext -> auctionContext.with(debugResolver.debugContextFrom(auctionContext)))
 
-                .compose(auctionContext -> storedRequestProcessor.processAuctionRequest(
-                                auctionContext.getAccount().getId(), auctionContext.getBidRequest())
-                        .map(AuctionStoredResult::bidRequest)
-                        .map(auctionContext::with))
-
-                .compose(auctionContext -> profilesProcessor.process(auctionContext, auctionContext.getBidRequest())
+                .compose(auctionContext -> storedRequestProcessor.processAmpRequest(
+                                auctionContext.getAccount().getId(),
+                                storedRequestId(auctionContext.getBidRequest()),
+                                auctionContext.getBidRequest())
                         .map(auctionContext::with))
 
-                .map(auctionContext -> auctionContext.with(completeBidRequest(
-                        auctionContext.getBidRequest(),
-                        auctionContext.getHttpRequest(),
-                        auctionContext.getAccount())))
+                .map(auctionContext -> auctionContext.with(completeBidRequest(auctionContext)))
 
                 .map(auctionContext -> auctionContext.with(requestTypeMetric(auctionContext.getBidRequest())))
 
-                .recover(ortb2RequestFactory::restoreResultFromRejection);
-    }
-
-    public Future<AuctionContext> enrichAuctionContext(AuctionContext initialContext) {
-        if (initialContext.isRequestRejected()) {
-            return Future.succeededFuture(initialContext);
-        }
-
-        return Future.succeededFuture(initialContext)
+                .compose(auctionContext -> profilesProcessor.process(auctionContext, auctionContext.getBidRequest())
+                        .map(auctionContext::with))
 
                 .compose(auctionContext -> geoLocationServiceWrapper.lookup(auctionContext)
                         .map(auctionContext::with))
@@ -193,8 +194,6 @@ private BidRequest initialBidRequest(HttpRequestContext httpRequest) {
         final Consent consent = params.consent();
 
         return BidRequest.builder()
-                .imp(Collections.singletonList(initialImp(params)))
-                .site(tmpSite(params)) // Temporarily add to fetch account
                 .device(initialDevice(params))
                 .user(initialUser(params, consent))
                 .tmax(params.tmax())
@@ -205,21 +204,6 @@ private BidRequest initialBidRequest(HttpRequestContext httpRequest) {
                 .build();
     }
 
-    private Imp initialImp(GetInterfaceParams params) {
-        return Imp.builder()
-                .tagid(params.tagId())
-                .ext(mapper.mapper().valueToTree(ExtImpPrebid.builder()
-                        .profiles(params.impProfiles())
-                        .build()))
-                .build();
-    }
-
-    private static Site tmpSite(GetInterfaceParams params) {
-        return Site.builder()
-                .publisher(Publisher.builder().id(params.accountId()).build())
-                .build();
-    }
-
     private static Device initialDevice(GetInterfaceParams params) {
         final IpAddress ipAddress = params.ip();
         return Device.builder()
@@ -259,37 +243,80 @@ private static ExtRequest initialExtRequest(GetInterfaceParams params) {
                 .debug(params.debug())
                 .storedrequest(ExtStoredRequest.of(params.storedRequestId()))
                 .profiles(params.requestProfiles())
-                .storedAuctionResponse(ExtStoredAuctionResponse.of(
-                        params.storedAuctionResponseId(), null, null))
+                .storedAuctionResponse(ExtStoredAuctionResponse.of(params.storedAuctionResponseId(), null, null))
                 .outputFormat(params.outputFormat())
                 .outputModule(params.outputModule())
                 .build());
     }
 
+    private AuctionContext addTmpPublisher(AuctionContext auctionContext) {
+        final GetInterfaceParams params = new GetInterfaceParams(auctionContext.getHttpRequest());
+        final BidRequest bidRequestWithTmpPublisher = auctionContext.getBidRequest().toBuilder()
+                .site(Site.builder()
+                        .publisher(Publisher.builder().id(params.accountId()).build())
+                        .build())
+                .build();
+
+        return auctionContext.with(bidRequestWithTmpPublisher);
+    }
+
     private static BidRequest removeTmpPublisher(BidRequest bidRequest) {
         return bidRequest.toBuilder().site(null).build();
     }
 
-    private BidRequest completeBidRequest(BidRequest bidRequest,
-                                          HttpRequestContext httpRequest,
-                                          Account account) {
+    private static String storedRequestId(BidRequest bidRequest) {
+        return bidRequest.getExt().getPrebid().getStoredrequest().getId();
+    }
 
-        final GetInterfaceParams params = new GetInterfaceParams(httpRequest);
+    private BidRequest completeBidRequest(AuctionContext auctionContext) {
+        final Account account = auctionContext.getAccount();
+        final GetInterfaceParams params = new GetInterfaceParams(auctionContext.getHttpRequest());
 
-        final Imp imp = bidRequest.getImp().getFirst();
+        final BidRequest bidRequest = auctionContext.getBidRequest();
+        final Imp imp = Optional.ofNullable(bidRequest.getImp())
+                .filter(CollectionUtils::isNotEmpty)
+                .map(List::getFirst)
+                .orElse(null);
 
         return bidRequest.toBuilder()
-                .imp(Collections.singletonList(imp.toBuilder()
-                        .banner(completeBanner(imp.getBanner(), params))
-                        .video(completeVideo(imp.getVideo(), params))
-                        .audio(completeAudio(imp.getAudio(), params))
-                        .build()))
+                .imp(Collections.singletonList(completeImp(imp, params)))
                 .site(completeSite(bidRequest.getSite(), params, account))
                 .app(completeApp(bidRequest.getApp(), params, account))
                 .dooh(completeDooh(bidRequest.getDooh(), params, account))
                 .build();
     }
 
+    private Imp completeImp(Imp imp, GetInterfaceParams params) {
+        if (imp == null) {
+            return null;
+        }
+
+        return imp.toBuilder()
+                .banner(completeBanner(imp.getBanner(), params))
+                .video(completeVideo(imp.getVideo(), params))
+                .audio(completeAudio(imp.getAudio(), params))
+                .tagid(ObjectUtils.defaultIfNull(params.tagId(), imp.getTagid()))
+                .ext(completeImpExt(imp.getExt(), params))
+                .build();
+    }
+
+    private ObjectNode completeImpExt(ObjectNode ext, GetInterfaceParams params) {
+        final List<String> impProfiles = params.impProfiles();
+        if (CollectionUtils.isEmpty(impProfiles)) {
+            return ext;
+        }
+
+        final ObjectNode modifiedExt = ext != null ? ext : mapper.mapper().createObjectNode();
+        final ObjectNode extPrebid = Optional.ofNullable(modifiedExt.get("prebid"))
+                .filter(JsonNode::isObject)
+                .map(ObjectNode.class::cast)
+                .orElseGet(() -> modifiedExt.putObject("prebid"));
+        final ArrayNode profiles = extPrebid.putArray("profiles");
+        impProfiles.forEach(profiles::add);
+
+        return modifiedExt;
+    }
+
     private static Banner completeBanner(Banner banner, GetInterfaceParams params) {
         if (banner == null) {
             return null;
@@ -482,7 +509,8 @@ private class GetInterfaceParams {
 
         public String storedRequestId() {
             return Optional.ofNullable(getString("srid"))
-                    .orElseGet(() -> getString("tag_id"));
+                    .or(() -> Optional.ofNullable(getString("tag_id")))
+                    .orElseThrow(() -> new InvalidRequestException("Request require the stored request id."));
         }
 
         public String accountId() {
@@ -846,7 +874,7 @@ public Integer liveStream() {
         public IpAddress ip() {
             return Optional.ofNullable(getString("ip"))
                     .map(ipAddressHelper::toIpAddress)
-                    .orElse(null);
+                    .orElse(IpAddress.of(null, null));
         }
 
         public String ua() {