From a1d02e036754f7a39b379f590f3aac85e5c4150e Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 7 Feb 2025 16:43:48 +0100 Subject: [PATCH] Adnuntius: Copy advertiserDomains to ORTB bid response adomain #3736 --- .../server/bidder/adnuntius/AdnuntiusBidder.java | 11 +---------- .../bidder/adnuntius/model/response/AdnuntiusAd.java | 4 ++++ .../server/bidder/adnuntius/AdnuntiusBidderTest.java | 12 +++--------- .../adnuntius/test-adnuntius-bid-response.json | 6 +++--- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidder.java b/src/main/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidder.java index 2139a835e41..52ec2b3992a 100644 --- a/src/main/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidder.java +++ b/src/main/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidder.java @@ -394,7 +394,7 @@ private Bid createBid(AdnuntiusAd ad, BidRequest bidRequest, String adm, String .crid(ad.getCreativeId()) .price(resolvePrice(ad, bidType)) .adm(adm) - .adomain(extractDomain(ad.getDestinationUrls())) + .adomain(ad.getAdvertiserDomains()) .ext(bidExt == null ? null : mapper.mapper().valueToTree(bidExt)) .build(); } @@ -444,13 +444,4 @@ private static BigDecimal resolvePrice(AdnuntiusAd ad, String bidType) { return amount != null ? amount.multiply(PRICE_MULTIPLIER) : BigDecimal.ZERO; } - - private static List extractDomain(Map destinationUrls) { - return destinationUrls == null ? Collections.emptyList() : destinationUrls.values().stream() - .filter(Objects::nonNull) - .map(url -> url.split("/")) - .filter(splintedUrl -> splintedUrl.length >= 2) - .map(splintedUrl -> StringUtils.replace(splintedUrl[2], "www.", "")) - .toList(); - } } diff --git a/src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAd.java b/src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAd.java index 88367e172d6..20c4b047653 100644 --- a/src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAd.java +++ b/src/main/java/org/prebid/server/bidder/adnuntius/model/response/AdnuntiusAd.java @@ -4,6 +4,7 @@ import lombok.Builder; import lombok.Value; +import java.util.List; import java.util.Map; @Builder @@ -41,5 +42,8 @@ public class AdnuntiusAd { @JsonProperty("destinationUrls") Map destinationUrls; + @JsonProperty("advertiserDomains") + List advertiserDomains; + AdnuntiusAdvertiser advertiser; } diff --git a/src/test/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidderTest.java b/src/test/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidderTest.java index 6eb8e7b44e2..afcc617ebfa 100644 --- a/src/test/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/adnuntius/AdnuntiusBidderTest.java @@ -751,9 +751,7 @@ public void makeBidsShouldReturnTwoBidFromDealsAndAdsWhenAdsAndDealsIsSpecified( .lineItemId("lineItemId") .dealId("dealId") .advertiser(AdnuntiusAdvertiser.of(null, "name")) - .destinationUrls(Map.of( - "key1", "https://www.domain1.com/uri", - "key2", "http://www.domain2.dt/uri")))), + .advertiserDomains(List.of("domain1.com", "domain2.dt")))), List.of(givenAd(ad -> ad .bid(AdnuntiusBid.of(BigDecimal.ONE, "USD")) .adId("adId") @@ -762,9 +760,7 @@ public void makeBidsShouldReturnTwoBidFromDealsAndAdsWhenAdsAndDealsIsSpecified( .dealId("dealId") .html("dealHtml") .advertiser(AdnuntiusAdvertiser.of("legalName", "name")) - .destinationUrls(Map.of( - "key1", "https://www.domain1.com/uri", - "key2", "http://www.domain2.dt/uri")))))); + .advertiserDomains(List.of("domain1.com", "domain2.dt")))))); final BidRequest bidRequest = givenBidRequest(givenImp( ExtImpAdnuntius.builder().auId("auId").build(), identity())); @@ -900,9 +896,7 @@ public void makeBidsShouldReturnCorrectSeatBids() throws JsonProcessingException .creativeId("creativeId") .lineItemId("lineItemId") .dealId("dealId") - .destinationUrls(Map.of( - "key1", "https://www.domain1.com/uri", - "key2", "http://www.domain2.dt/uri"))))); + .advertiserDomains(List.of("domain1.com", "domain2.dt"))))); final BidRequest bidRequest = givenBidRequest( givenImp(ExtImpAdnuntius.builder().auId("auId").build(), identity())); diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-adnuntius-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-adnuntius-bid-response.json index 1264f02d1f8..4020376e20f 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-adnuntius-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/adnuntius/test-adnuntius-bid-response.json @@ -16,9 +16,9 @@ "creativeId": "some_creative_id", "lineItemId": "some_line_item_id", "dealId": "some_deal_id", - "destinationUrls": { - "some_url": "https://www.domain.dm/uri" - } + "advertiserDomains": [ + "domain.dm" + ] } ] }