Align domain check and add support for app

Author: t-sormonte

src/main/java/org/prebid/server/bidder/sparteo/SparteoBidder.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.iab.openrtb.request.App;
 import com.iab.openrtb.request.BidRequest;
 import com.iab.openrtb.request.Imp;
 import com.iab.openrtb.request.Publisher;
@@ -40,6 +41,8 @@ public class SparteoBidder implements Bidder<BidRequest> {
 
     private static final String NETWORK_ID_MACRO = "{{NetworkId}}";
     private static final String DOMAIN_MACRO = "{{Domain}}";
+    private static final String BUNDLE_QUERY_MACRO = "{{BundleQuery}}";
+
     private static final TypeReference<ExtPrebid<?, ExtImpSparteo>> TYPE_REFERENCE =
             new TypeReference<>() { };
 
@@ -55,19 +58,18 @@ public SparteoBidder(String endpointUrl, JacksonMapper mapper) {
     public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request) {
         final List<BidderError> errors = new ArrayList<>();
         final List<Imp> modifiedImps = new ArrayList<>();
-        String siteNetworkId = null;
+        String networkId = null;
 
         for (Imp imp : request.getImp()) {
-            if (siteNetworkId == null) {
+            if (networkId == null) {
                 try {
-                    siteNetworkId = parseExtImp(imp).getNetworkId();
+                    networkId = parseExtImp(imp).getNetworkId();
                 } catch (PreBidException e) {
                     errors.add(BidderError.badInput(
                             "ignoring imp id=%s, error processing ext: %s".formatted(
                                     imp.getId(), e.getMessage())));
                 }
             }
-
             final ObjectNode modifiedExt = modifyImpExt(imp);
             modifiedImps.add(imp.toBuilder().ext(modifiedExt).build());
         }
@@ -76,12 +78,22 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
             return Result.withErrors(errors);
         }
 
-        final BidRequest outgoingRequest = request.toBuilder()
-                .imp(modifiedImps)
-                .site(modifySite(request.getSite(), siteNetworkId, mapper))
-                .build();
+        final BidRequest.BidRequestBuilder builder = request.toBuilder().imp(modifiedImps);
+
+        final Site site = request.getSite();
+        final App app = request.getApp();
+
+        if (networkId != null) {
+            if (site != null) {
+                builder.site(modifySite(site, networkId, mapper));
+            } else if (app != null) {
+                builder.app(modifyApp(app, networkId, mapper));
+            }
+        }
+
+        final BidRequest outgoingRequest = builder.build();
 
-        final String finalEndpointUrl = replaceMacros(request.getSite(), siteNetworkId);
+        final String finalEndpointUrl = replaceMacros(site, app, networkId);
         final HttpRequest<BidRequest> call = BidderUtil.defaultRequest(outgoingRequest, finalEndpointUrl, mapper);
 
         return Result.of(Collections.singletonList(call), errors);
@@ -99,19 +111,22 @@ private ObjectNode modifyImpExt(Imp imp) {
         final ObjectNode modifiedImpExt = imp.getExt().deepCopy();
         final ObjectNode sparteoNode = modifiedImpExt.putObject("sparteo");
         final JsonNode bidderJsonNode = modifiedImpExt.remove("bidder");
+        // if bidder is null, 'params' will become null (allowed); endpoint logic relies on networkId collected above
         sparteoNode.set("params", bidderJsonNode);
-
         return modifiedImpExt;
     }
 
-    private Site modifySite(Site site, String siteNetworkId, JacksonMapper mapper) {
-        if (site == null || site.getPublisher() == null || siteNetworkId == null) {
+    // -- Defensive upsert into site.publisher.ext.params.networkId
+    private Site modifySite(Site site, String networkId, JacksonMapper mapper) {
+        if (site == null || networkId == null) {
             return site;
         }
 
-        final Publisher originalPublisher = site.getPublisher();
-        final ExtPublisher originalExt = originalPublisher.getExt();
+        final Publisher originalPublisher = site.getPublisher() != null
+                ? site.getPublisher()
+                : Publisher.builder().build();
 
+        final ExtPublisher originalExt = originalPublisher.getExt();
         final ExtPublisher modifiedExt = originalExt != null
                 ? ExtPublisher.of(originalExt.getPrebid())
                 : ExtPublisher.empty();
@@ -120,47 +135,94 @@ private Site modifySite(Site site, String siteNetworkId, JacksonMapper mapper) {
             mapper.fillExtension(modifiedExt, originalExt);
         }
 
-        final JsonNode paramsProperty = modifiedExt.getProperty("params");
-        final ObjectNode paramsNode;
+        final ObjectNode paramsNode = ensureParamsNode(modifiedExt);
+        paramsNode.put("networkId", networkId);
 
-        if (paramsProperty != null && paramsProperty.isObject()) {
-            paramsNode = (ObjectNode) paramsProperty;
-        } else {
-            paramsNode = mapper.mapper().createObjectNode();
-            modifiedExt.addProperty("params", paramsNode);
+        final Publisher modifiedPublisher = originalPublisher.toBuilder()
+                .ext(modifiedExt)
+                .build();
+
+        return site.toBuilder().publisher(modifiedPublisher).build();
+    }
+
+    // -- Defensive upsert into app.publisher.ext.params.networkId
+    private App modifyApp(App app, String networkId, JacksonMapper mapper) {
+        if (app == null || networkId == null) {
+            return app;
+        }
+
+        final Publisher originalPublisher = app.getPublisher() != null
+                ? app.getPublisher()
+                : Publisher.builder().build();
+
+        final ExtPublisher originalExt = originalPublisher.getExt();
+        final ExtPublisher modifiedExt = originalExt != null
+                ? ExtPublisher.of(originalExt.getPrebid())
+                : ExtPublisher.empty();
+
+        if (originalExt != null) {
+            mapper.fillExtension(modifiedExt, originalExt);
         }
 
-        paramsNode.put("networkId", siteNetworkId);
+        final ObjectNode paramsNode = ensureParamsNode(modifiedExt);
+        paramsNode.put("networkId", networkId);
 
         final Publisher modifiedPublisher = originalPublisher.toBuilder()
                 .ext(modifiedExt)
                 .build();
 
-        return site.toBuilder()
-                .publisher(modifiedPublisher)
-                .build();
+        return app.toBuilder().publisher(modifiedPublisher).build();
     }
 
-    private String replaceMacros(Site site, String siteNetworkId) {
-        final String domain = Optional.ofNullable(site)
-                .map(s -> Optional.ofNullable(s.getPublisher()).map(Publisher::getDomain).orElse(s.getDomain()))
-                .orElse(null);
+    private ObjectNode ensureParamsNode(ExtPublisher extPublisher) {
+        final JsonNode paramsProperty = extPublisher.getProperty("params");
+        if (paramsProperty != null && paramsProperty.isObject()) {
+            return (ObjectNode) paramsProperty;
+        }
+        final ObjectNode paramsNode = mapper.mapper().createObjectNode();
+        extPublisher.addProperty("params", paramsNode);
+        return paramsNode;
+    }
 
-        return resolveEndpoint(domain, siteNetworkId);
+    private String replaceMacros(Site site, App app, String networkId) {
+        final String domain = resolveDomain(site, app);
+        final String bundle = Optional.ofNullable(app).map(App::getBundle).orElse(null);
+        return resolveEndpoint(domain, networkId, bundle);
     }
 
-    private String resolveEndpoint(String domain, String networkId) {
-        if (networkId == null) {
-            return endpointUrl;
+    private String resolveDomain(Site site, App app) {
+        if (site != null) {
+            final String siteDomain = site.getDomain();
+            if (siteDomain != null && !siteDomain.isEmpty()) {
+                return siteDomain;
+            }
+            final Publisher pub = site.getPublisher();
+            if (pub != null && pub.getDomain() != null && !pub.getDomain().isEmpty()) {
+                return pub.getDomain();
+            }
         }
+        if (app != null && app.getDomain() != null && !app.getDomain().isEmpty()) {
+            return app.getDomain();
+        }
+        return null;
+    }
 
-        final String uri = endpointUrl.replace(NETWORK_ID_MACRO, HttpUtil.encodeUrl(networkId));
+    private String resolveEndpoint(String domain, String networkId, String bundle) {
+        String uri = endpointUrl;
 
-        if (domain == null) {
-            return uri;
+        if (networkId != null && !networkId.isEmpty()) {
+            uri = uri.replace(NETWORK_ID_MACRO, HttpUtil.encodeUrl(networkId));
         }
+        if (domain != null && !domain.isEmpty()) {
+            uri = uri.replace(DOMAIN_MACRO, HttpUtil.encodeUrl(domain));
+        }
+
+        final String bundleQuery = (bundle != null && !bundle.isEmpty())
+                ? "&bundle=" + HttpUtil.encodeUrl(bundle)
+                : "";
+        uri = uri.replace(BUNDLE_QUERY_MACRO, bundleQuery);
 
-        return uri.replace(DOMAIN_MACRO, HttpUtil.encodeUrl(domain));
+        return uri;
     }
 
     @Override

src/main/resources/bidder-config/sparteo.yaml

@@ -1,6 +1,6 @@
 adapters:
   sparteo:
-    endpoint: https://bid.sparteo.com/s2s-auction?network_id={{NetworkId}}&domain={{Domain}}
+    endpoint: https://bid.sparteo.com/s2s-auction?network_id={{NetworkId}}&domain={{Domain}}{{BundleQuery}}
     meta-info: 
       maintainer-email: prebid@sparteo.com
       app-media-types: