From 9c6764f28db1e349befaf1829451aa426e6d3fd0 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 19 Oct 2021 18:11:36 +0300 Subject: [PATCH 01/30] Rename ext field properly --- .../bidder/impactify/ImpactifyBidder.java | 142 ++++++++++++++++++ .../request/impactify/ExtImpImpactify.java | 19 +++ .../config/bidder/ImpactifyConfiguration.java | 43 ++++++ .../resources/bidder-config/impactify.yaml | 16 ++ 4 files changed, 220 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java create mode 100644 src/main/resources/bidder-config/impactify.yaml diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java new file mode 100644 index 00000000000..8493794700a --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -0,0 +1,142 @@ +package org.prebid.server.bidder.impactify; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.vertx.core.MultiMap; +import io.vertx.core.http.HttpMethod; +import org.prebid.server.bidder.Bidder; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.HttpCall; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.Result; +import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.exception.PreBidException; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import org.prebid.server.util.BidderUtil; +import org.prebid.server.util.HttpUtil; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class ImpactifyBidder implements Bidder { + + private static final TypeReference> IMPACTIFY_EXT_TYPE_REFERENCE = + new TypeReference>() { + }; + private static final String X_OPENRTB_VERSION = "2.5"; + private static final String DEFAULT_CURRENCY = "USD"; + + private final String endpointUrl; + private final JacksonMapper mapper; + private final CurrencyConversionService currencyConversionService; + + public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConversionService conversionService) { + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + this.currencyConversionService = Objects.requireNonNull(conversionService); + } + + private static BigDecimal resolveBidFloorPrice(Imp imp) { + final BigDecimal bidFloor = imp.getBidfloor(); + return BidderUtil.isValidPrice(bidFloor) ? bidFloor : null; + } + + private static MultiMap constructHeaders(BidRequest bidRequest) { + final var device = bidRequest.getDevice(); + final var deviceUa = device != null ? device.getUa() : null; + final var deviceIp = device != null ? device.getIp() : null; + final var deviceIpv6 = device != null ? device.getIpv6() : null; + final var site = bidRequest.getSite(); + final var sitePage = site != null ? site.getPage() : null; + final var user = bidRequest.getUser(); + final var userUid = user != null ? user.getBuyeruid() : null; + final var headers = HttpUtil.headers(); + + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIp)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIp); + } + if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); + } + } + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + + return headers; + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List imps = request.getImp(); + final List updatedImps = new ArrayList<>(); + final BidRequest updatedBidRequest; + + for (Imp imp : imps) { + if (imp.getBidfloor().compareTo(BigDecimal.ZERO) > 0 + && !imp.getBidfloorcur().isEmpty() + && !imp.getBidfloorcur().equalsIgnoreCase(DEFAULT_CURRENCY)) { + updatedImps.add(imp.toBuilder().bidfloor(resolveBidFloor(imp, request)).build()); + } + } + + updatedBidRequest = request.toBuilder() + .cur(List.of(DEFAULT_CURRENCY)) + .imp(updatedImps) + .build(); + + return Result.withValue(HttpRequest.builder() + .method(HttpMethod.POST) + .uri(resolveEndpoint()) + .headers(constructHeaders(updatedBidRequest)) + .body(mapper.encode(updatedBidRequest)) + .payload(updatedBidRequest) + .build()); + } + + private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { + final BigDecimal validBidFloorPrice = resolveBidFloorPrice(imp); + if (validBidFloorPrice == null) { + return null; + } + + return convertBidFloorCurrency(validBidFloorPrice, bidRequest, imp); + } + + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, + BidRequest bidRequest, + Imp imp) { + try { + return currencyConversionService.convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), DEFAULT_CURRENCY); + } catch (PreBidException e) { + throw new PreBidException(String.format( + "Unable to convert provided bid floor currency from %s to %s for imp `%s` with a reason: %s", + imp.getBidfloorcur(), DEFAULT_CURRENCY, imp.getId(), e.getMessage())); + } + } + + private String resolveEndpoint() { + return endpointUrl; + } + + @Override + public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { + return null; + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java new file mode 100644 index 00000000000..972614a8b45 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java @@ -0,0 +1,19 @@ +package org.prebid.server.proto.openrtb.ext.request.impactify; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Value; + +@Value +@AllArgsConstructor(staticName = "of") +public class ExtImpImpactify { + + @JsonProperty("appId") + String appId; + + @JsonProperty("format") + String format; + + @JsonProperty("style") + String style; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java new file mode 100644 index 00000000000..6daed5621b3 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java @@ -0,0 +1,43 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.impactify.ImpactifyBidder; +import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; +import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; +import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; +import org.prebid.server.spring.env.YamlPropertySourceFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +import javax.validation.constraints.NotBlank; + +@Configuration +@PropertySource(value = "classpath:/bidder-config/impactify.yaml", factory = YamlPropertySourceFactory.class) +public class ImpactifyConfiguration { + + private static final String BIDDER_NAME = "impactify"; + + @Bean("impactifyConfigurationProperties") + @ConfigurationProperties("adapters.impactify") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps impactifyBidderDeps(BidderConfigurationProperties impactifyConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(impactifyConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new ImpactifyBidder(config.getEndpoint(), mapper, currencyConversionService)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml new file mode 100644 index 00000000000..063c9a137be --- /dev/null +++ b/src/main/resources/bidder-config/impactify.yaml @@ -0,0 +1,16 @@ +adapters: + impactify: + endpoint: https://sonic.impactify.media/bidder + meta-info: + maintainer-email: contact@impactify.io + site-media-types: + - banner + - video + supported-vendors: + vendor-id: 606 + usersync: + url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect_url={{.RedirectURL}} + redirect-url: /setuid?bidder=impactify&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid={IMPACTIFY_UID} + cookie-family-name: impactify + type: iframe + support-cors: false From 7eabee75d2aeec78d75e6e14024042b71794477c Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Wed, 20 Oct 2021 14:55:11 +0300 Subject: [PATCH 02/30] Rename ext field properly --- .../bidder/impactify/ImpactifyBidder.java | 82 +++++++++++-------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 8493794700a..41da06105e5 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -1,6 +1,7 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import io.netty.handler.codec.http.HttpHeaderValues; @@ -8,6 +9,7 @@ import io.vertx.core.http.HttpMethod; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderError; import org.prebid.server.bidder.model.HttpCall; import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.Result; @@ -30,7 +32,7 @@ public class ImpactifyBidder implements Bidder { new TypeReference>() { }; private static final String X_OPENRTB_VERSION = "2.5"; - private static final String DEFAULT_CURRENCY = "USD"; + private static final String BIDDER_CURRENCY = "USD"; private final String endpointUrl; private final JacksonMapper mapper; @@ -42,6 +44,48 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List imps = request.getImp(); + final List updatedImps = new ArrayList<>(); + final BidRequest updatedBidRequest; + + for (Imp imp : imps) { + if (imp.getBidfloor().compareTo(BigDecimal.ZERO) > 0 + && !imp.getBidfloorcur().isEmpty() + && !imp.getBidfloorcur().equalsIgnoreCase(BIDDER_CURRENCY)) { + final ExtImpImpactify extImpImpactify; + try { + extImpImpactify = mapper.mapper().convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + return Result.withError(BidderError.badInput("Ext.bidder not provided")); + } + + updatedImps.add(imp.toBuilder() + .bidfloor(resolveBidFloor(imp, request)) + .ext(mapper.mapper().convertValue(extImpImpactify, ObjectNode.class)) + .build()); + } + } + if (updatedImps.size() == 0) { + return Result + .withError(BidderError.badInput("No valid impressions in the bid request")); + } + + updatedBidRequest = request.toBuilder() + .cur(List.of(BIDDER_CURRENCY)) + .imp(updatedImps) + .build(); + + return Result.withValue(HttpRequest.builder() + .method(HttpMethod.POST) + .uri(resolveEndpoint()) + .headers(constructHeaders(updatedBidRequest)) + .body(mapper.encode(updatedBidRequest)) + .payload(updatedBidRequest) + .build()); + } + private static BigDecimal resolveBidFloorPrice(Imp imp) { final BigDecimal bidFloor = imp.getBidfloor(); return BidderUtil.isValidPrice(bidFloor) ? bidFloor : null; @@ -82,34 +126,6 @@ private static MultiMap constructHeaders(BidRequest bidRequest) { return headers; } - @Override - public Result>> makeHttpRequests(BidRequest request) { - final List imps = request.getImp(); - final List updatedImps = new ArrayList<>(); - final BidRequest updatedBidRequest; - - for (Imp imp : imps) { - if (imp.getBidfloor().compareTo(BigDecimal.ZERO) > 0 - && !imp.getBidfloorcur().isEmpty() - && !imp.getBidfloorcur().equalsIgnoreCase(DEFAULT_CURRENCY)) { - updatedImps.add(imp.toBuilder().bidfloor(resolveBidFloor(imp, request)).build()); - } - } - - updatedBidRequest = request.toBuilder() - .cur(List.of(DEFAULT_CURRENCY)) - .imp(updatedImps) - .build(); - - return Result.withValue(HttpRequest.builder() - .method(HttpMethod.POST) - .uri(resolveEndpoint()) - .headers(constructHeaders(updatedBidRequest)) - .body(mapper.encode(updatedBidRequest)) - .payload(updatedBidRequest) - .build()); - } - private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { final BigDecimal validBidFloorPrice = resolveBidFloorPrice(imp); if (validBidFloorPrice == null) { @@ -119,15 +135,13 @@ private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { return convertBidFloorCurrency(validBidFloorPrice, bidRequest, imp); } - private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, - BidRequest bidRequest, - Imp imp) { + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, Imp imp) { try { - return currencyConversionService.convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), DEFAULT_CURRENCY); + return currencyConversionService.convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), BIDDER_CURRENCY); } catch (PreBidException e) { throw new PreBidException(String.format( "Unable to convert provided bid floor currency from %s to %s for imp `%s` with a reason: %s", - imp.getBidfloorcur(), DEFAULT_CURRENCY, imp.getId(), e.getMessage())); + imp.getBidfloorcur(), BIDDER_CURRENCY, imp.getId(), e.getMessage())); } } From caa9c4b8c1e8b7dcc0c452e1ce77790d5cb8822f Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Wed, 20 Oct 2021 20:12:17 +0300 Subject: [PATCH 03/30] Cleanup code, bid implementation --- .../bidder/impactify/ImpactifyBidder.java | 93 +++++++++++-------- 1 file changed, 54 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 41da06105e5..122c3266a19 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -3,7 +3,11 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.request.User; +import com.iab.openrtb.response.BidResponse; import io.netty.handler.codec.http.HttpHeaderValues; import io.vertx.core.MultiMap; import io.vertx.core.http.HttpMethod; @@ -15,6 +19,7 @@ import org.prebid.server.bidder.model.Result; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.exception.PreBidException; +import org.prebid.server.json.DecodeException; import org.prebid.server.json.JacksonMapper; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; @@ -44,6 +49,41 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } + private static MultiMap constructHeaders(BidRequest bidRequest) { + final Device device = bidRequest.getDevice(); + final String deviceUa = device != null ? device.getUa() : null; + final String deviceIp = device != null ? device.getIp() : null; + final String deviceIpv6 = device != null ? device.getIpv6() : null; + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + final MultiMap headers = HttpUtil.headers(); + + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIp)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIp); + } + if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); + } + } + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + + return headers; + } + @Override public Result>> makeHttpRequests(BidRequest request) { final List imps = request.getImp(); @@ -56,24 +96,28 @@ public Result>> makeHttpRequests(BidRequest request && !imp.getBidfloorcur().equalsIgnoreCase(BIDDER_CURRENCY)) { final ExtImpImpactify extImpImpactify; try { - extImpImpactify = mapper.mapper().convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE).getBidder(); + extImpImpactify = mapper.mapper() + .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) + .getBidder(); } catch (IllegalArgumentException e) { - return Result.withError(BidderError.badInput("Ext.bidder not provided")); + return Result.withError( + BidderError.badInput("Unable to decode the impression ext for id: " + imp.getId())); } updatedImps.add(imp.toBuilder() + .bidfloorcur(BIDDER_CURRENCY) .bidfloor(resolveBidFloor(imp, request)) .ext(mapper.mapper().convertValue(extImpImpactify, ObjectNode.class)) .build()); } } + if (updatedImps.size() == 0) { return Result .withError(BidderError.badInput("No valid impressions in the bid request")); } updatedBidRequest = request.toBuilder() - .cur(List.of(BIDDER_CURRENCY)) .imp(updatedImps) .build(); @@ -91,41 +135,6 @@ private static BigDecimal resolveBidFloorPrice(Imp imp) { return BidderUtil.isValidPrice(bidFloor) ? bidFloor : null; } - private static MultiMap constructHeaders(BidRequest bidRequest) { - final var device = bidRequest.getDevice(); - final var deviceUa = device != null ? device.getUa() : null; - final var deviceIp = device != null ? device.getIp() : null; - final var deviceIpv6 = device != null ? device.getIpv6() : null; - final var site = bidRequest.getSite(); - final var sitePage = site != null ? site.getPage() : null; - final var user = bidRequest.getUser(); - final var userUid = user != null ? user.getBuyeruid() : null; - final var headers = HttpUtil.headers(); - - headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); - headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); - headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); - if (Objects.nonNull(device)) { - if (Objects.nonNull(deviceUa)) { - headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); - } - if (Objects.nonNull(deviceIp)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIp); - } - if (Objects.nonNull(deviceIpv6)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); - } - } - if (Objects.nonNull(site)) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - - return headers; - } - private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { final BigDecimal validBidFloorPrice = resolveBidFloorPrice(imp); if (validBidFloorPrice == null) { @@ -150,7 +159,13 @@ private String resolveEndpoint() { } @Override - public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { + public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + } catch (DecodeException e) { + + } + return null; } } From b91ca713eaa943c90d5b1053f0f5bc6a31eec76a Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 21 Oct 2021 15:11:32 +0300 Subject: [PATCH 04/30] Add makeBids logic --- .../bidder/impactify/ImpactifyBidder.java | 52 ++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 122c3266a19..6cf798f2d02 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -7,10 +7,13 @@ import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.User; +import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; import io.netty.handler.codec.http.HttpHeaderValues; import io.vertx.core.MultiMap; import io.vertx.core.http.HttpMethod; +import org.apache.commons.collections4.CollectionUtils; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderError; @@ -23,13 +26,17 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; public class ImpactifyBidder implements Bidder { @@ -158,14 +165,57 @@ private String resolveEndpoint() { return endpointUrl; } + private static BidderBid resolveBidderBid(Bid bid, String currency, List imps, List errors) { + final BidType bidType; + try { + bidType = getBidType(bid.getImpid(), imps); + } catch (PreBidException e) { + errors.add(BidderError.badServerResponse(e.getMessage())); + return null; + } + return BidderBid.of(bid, bidType, currency); + } + + private static BidType getBidType(String impId, List imps) { + for (Imp imp : imps) { + if (imp.getId().equals(impId)) { + if (imp.getBanner() != null) { + return BidType.banner; + } + if (imp.getVideo() != null) { + return BidType.video; + } + throw new PreBidException(String.format("Unknown impression type for ID: \"%s\"", impId)); + } + } + throw new PreBidException(String.format("Failed to find impression for ID: \"%s\"", impId)); + } + @Override public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { try { + final List errors = new ArrayList<>(); final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + return Result.of(extractBids(bidRequest, bidResponse, errors), errors); } catch (DecodeException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + private List extractBids(BidRequest bidRequest, BidResponse bidResponse, List errors) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); } + return bidsFromResponse(bidResponse, bidRequest, errors); + } - return null; + private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, List errors) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .flatMap(Collection::stream) + .map(bid -> resolveBidderBid(bid, bidResponse.getCur(), bidRequest.getImp(), errors)) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } } From 0870c61262c5e6f5cf4fa789321751f8f64a88ca Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Fri, 22 Oct 2021 11:40:57 +0300 Subject: [PATCH 05/30] Add makeBids logic --- .../server/bidder/impactify/ImpactifyBidder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 6cf798f2d02..17cf60a713d 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; -import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.User; @@ -57,10 +56,10 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers } private static MultiMap constructHeaders(BidRequest bidRequest) { - final Device device = bidRequest.getDevice(); - final String deviceUa = device != null ? device.getUa() : null; - final String deviceIp = device != null ? device.getIp() : null; - final String deviceIpv6 = device != null ? device.getIpv6() : null; + final var device = bidRequest.getDevice(); + final var deviceUa = device != null ? device.getUa() : null; + final var deviceIp = device != null ? device.getIp() : null; + final var deviceIpv6 = device != null ? device.getIpv6() : null; final Site site = bidRequest.getSite(); final String sitePage = site != null ? site.getPage() : null; final User user = bidRequest.getUser(); @@ -153,7 +152,8 @@ private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, Imp imp) { try { - return currencyConversionService.convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), BIDDER_CURRENCY); + return currencyConversionService + .convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), BIDDER_CURRENCY); } catch (PreBidException e) { throw new PreBidException(String.format( "Unable to convert provided bid floor currency from %s to %s for imp `%s` with a reason: %s", From b69c2bc2b713e9d5ceca716d4aea0d6c94dc595f Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 25 Oct 2021 13:26:09 +0300 Subject: [PATCH 06/30] Add some tests to Impactify --- .../bidder/impactify/ImpactifyBidder.java | 113 +++++++++--------- .../resources/bidder-config/impactify.yaml | 2 +- .../bidder/impactify/ImpactifyBidderTest.java | 66 ++++++++++ 3 files changed, 124 insertions(+), 57 deletions(-) create mode 100644 src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 17cf60a713d..9019e619437 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.User; @@ -55,41 +56,6 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } - private static MultiMap constructHeaders(BidRequest bidRequest) { - final var device = bidRequest.getDevice(); - final var deviceUa = device != null ? device.getUa() : null; - final var deviceIp = device != null ? device.getIp() : null; - final var deviceIpv6 = device != null ? device.getIpv6() : null; - final Site site = bidRequest.getSite(); - final String sitePage = site != null ? site.getPage() : null; - final User user = bidRequest.getUser(); - final String userUid = user != null ? user.getBuyeruid() : null; - final MultiMap headers = HttpUtil.headers(); - - headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); - headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); - headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); - if (Objects.nonNull(device)) { - if (Objects.nonNull(deviceUa)) { - headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); - } - if (Objects.nonNull(deviceIp)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIp); - } - if (Objects.nonNull(deviceIpv6)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); - } - } - if (Objects.nonNull(site)) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - - return headers; - } - @Override public Result>> makeHttpRequests(BidRequest request) { final List imps = request.getImp(); @@ -165,30 +131,39 @@ private String resolveEndpoint() { return endpointUrl; } - private static BidderBid resolveBidderBid(Bid bid, String currency, List imps, List errors) { - final BidType bidType; - try { - bidType = getBidType(bid.getImpid(), imps); - } catch (PreBidException e) { - errors.add(BidderError.badServerResponse(e.getMessage())); - return null; - } - return BidderBid.of(bid, bidType, currency); - } + private static MultiMap constructHeaders(BidRequest bidRequest) { + final Device device = bidRequest.getDevice(); + final String deviceUa = device != null ? device.getUa() : null; + final String deviceIpv4 = device != null ? device.getIp() : null; + final String deviceIpv6 = device != null ? device.getIpv6() : null; + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + final MultiMap headers = HttpUtil.headers(); - private static BidType getBidType(String impId, List imps) { - for (Imp imp : imps) { - if (imp.getId().equals(impId)) { - if (imp.getBanner() != null) { - return BidType.banner; - } - if (imp.getVideo() != null) { - return BidType.video; - } - throw new PreBidException(String.format("Unknown impression type for ID: \"%s\"", impId)); + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIpv4)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); + } + if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); } } - throw new PreBidException(String.format("Failed to find impression for ID: \"%s\"", impId)); + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + + return headers; } @Override @@ -218,4 +193,30 @@ private List bidsFromResponse(BidResponse bidResponse, BidRequest bid .filter(Objects::nonNull) .collect(Collectors.toList()); } + + private static BidderBid resolveBidderBid(Bid bid, String currency, List imps, List errors) { + final BidType bidType; + try { + bidType = getBidType(bid.getImpid(), imps); + } catch (PreBidException e) { + errors.add(BidderError.badServerResponse(e.getMessage())); + return null; + } + return BidderBid.of(bid, bidType, currency); + } + + private static BidType getBidType(String impId, List imps) { + for (Imp imp : imps) { + if (imp.getId().equals(impId)) { + if (imp.getBanner() != null) { + return BidType.banner; + } + if (imp.getVideo() != null) { + return BidType.video; + } + throw new PreBidException(String.format("Unknown impression type for ID: \"%s\"", impId)); + } + } + throw new PreBidException(String.format("Failed to find impression for ID: \"%s\"", impId)); + } } diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml index 063c9a137be..e74cfa60bd8 100644 --- a/src/main/resources/bidder-config/impactify.yaml +++ b/src/main/resources/bidder-config/impactify.yaml @@ -2,7 +2,7 @@ adapters: impactify: endpoint: https://sonic.impactify.media/bidder meta-info: - maintainer-email: contact@impactify.io + maintainer-email: support@impactify.io site-media-types: - banner - video diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java new file mode 100644 index 00000000000..cfc72a893d1 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -0,0 +1,66 @@ +package org.prebid.server.bidder.impactify; + +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.prebid.server.VertxTest; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.Result; +import org.prebid.server.currency.CurrencyConversionService; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +public class ImpactifyBidderTest extends VertxTest { + + private static final String TEST_ENDPOINT = "https://test.endpoint.com"; + private static final String INCORRECT_TEST_ENDPOINT = "incorrect.endpoint"; + + @Rule + public final MockitoRule mockitoRule = MockitoJUnit.rule(); + + private ImpactifyBidder impactifyBidder; + + @Mock + private CurrencyConversionService currencyConversionService; + + private static Imp givenImpressionWithData() { + return Imp.builder() + . + .build(); + } + + @Before + public void setUp() { + impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); + } + + @Test + public void createBidderWithWrongEndpointShouldThrowException() { + assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, + jacksonMapper, currencyConversionService)); + } + + @Test + public void one() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(Imp.builder().build())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors().size()).isEqualTo(0); + assertThat(result.getValue().size()).isNotEqualTo(0); + assertThat(result.getValue().get(0)).isNotNull(); + } +} From a614f692156fdb2602cd6e1651a49baed5ac83a6 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 25 Oct 2021 14:50:02 +0300 Subject: [PATCH 07/30] Add test where imp contains correct curr values --- .../bidder/impactify/ImpactifyBidderTest.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index cfc72a893d1..446628f3fcc 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -1,7 +1,9 @@ package org.prebid.server.bidder.impactify; +import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Video; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -12,11 +14,15 @@ import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.Result; import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import java.math.BigDecimal; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.tuple; public class ImpactifyBidderTest extends VertxTest { @@ -31,12 +37,6 @@ public class ImpactifyBidderTest extends VertxTest { @Mock private CurrencyConversionService currencyConversionService; - private static Imp givenImpressionWithData() { - return Imp.builder() - . - .build(); - } - @Before public void setUp() { impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); @@ -48,19 +48,33 @@ public void createBidderWithWrongEndpointShouldThrowException() { jacksonMapper, currencyConversionService)); } + private static Imp givenImpressionWithData() { + return Imp.builder() + .bidfloorcur("US") + .bidfloor(BigDecimal.ONE) + .banner(Banner.builder().build()) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + @Test public void one() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(Imp.builder().build())) + .imp(List.of(givenImpressionWithData())) .build(); //when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); //then - assertThat(result.getErrors().size()).isEqualTo(0); - assertThat(result.getValue().size()).isNotEqualTo(0); - assertThat(result.getValue().get(0)).isNotNull(); + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.ONE, "US")); } } From 9f105233b01097cd5fa94232b967a87a5aae97ce Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 25 Oct 2021 15:36:07 +0300 Subject: [PATCH 08/30] Fix logic on currency conversion and add valid test case for it --- .../bidder/impactify/ImpactifyBidder.java | 31 ++++++++++--------- .../bidder/impactify/ImpactifyBidderTest.java | 10 +++--- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 9019e619437..2e3a26148ea 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -63,25 +63,28 @@ public Result>> makeHttpRequests(BidRequest request final BidRequest updatedBidRequest; for (Imp imp : imps) { + BigDecimal bidFloor = imp.getBidfloor(); if (imp.getBidfloor().compareTo(BigDecimal.ZERO) > 0 && !imp.getBidfloorcur().isEmpty() && !imp.getBidfloorcur().equalsIgnoreCase(BIDDER_CURRENCY)) { - final ExtImpImpactify extImpImpactify; - try { - extImpImpactify = mapper.mapper() - .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) - .getBidder(); - } catch (IllegalArgumentException e) { - return Result.withError( - BidderError.badInput("Unable to decode the impression ext for id: " + imp.getId())); - } + bidFloor = resolveBidFloor(imp, request); + } - updatedImps.add(imp.toBuilder() - .bidfloorcur(BIDDER_CURRENCY) - .bidfloor(resolveBidFloor(imp, request)) - .ext(mapper.mapper().convertValue(extImpImpactify, ObjectNode.class)) - .build()); + final ExtImpImpactify extImpImpactify; + try { + extImpImpactify = mapper.mapper() + .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) + .getBidder(); + } catch (IllegalArgumentException e) { + return Result.withError( + BidderError.badInput("Unable to decode the impression ext for id: " + imp.getId())); } + + updatedImps.add(imp.toBuilder() + .bidfloorcur(BIDDER_CURRENCY) + .bidfloor(bidFloor) + .ext(mapper.mapper().convertValue(extImpImpactify, ObjectNode.class)) + .build()); } if (updatedImps.size() == 0) { diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 446628f3fcc..a2446ea253b 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -48,9 +48,9 @@ public void createBidderWithWrongEndpointShouldThrowException() { jacksonMapper, currencyConversionService)); } - private static Imp givenImpressionWithData() { + private static Imp givenImpressionWithValidData() { return Imp.builder() - .bidfloorcur("US") + .bidfloorcur("USD") .bidfloor(BigDecimal.ONE) .banner(Banner.builder().build()) .video(Video.builder().build()) @@ -60,10 +60,10 @@ private static Imp givenImpressionWithData() { } @Test - public void one() { + public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCur() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithData())) + .imp(List.of(givenImpressionWithValidData())) .build(); //when @@ -75,6 +75,6 @@ public void one() { .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getBidfloor, Imp::getBidfloorcur) - .containsExactly(tuple(BigDecimal.ONE, "US")); + .containsExactly(tuple(BigDecimal.ONE, "USD")); } } From 300e7db5e9bc8ebdad81967671c70a24baa2ce76 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 25 Oct 2021 18:56:39 +0300 Subject: [PATCH 09/30] Add test for currency conversion --- .../bidder/impactify/ImpactifyBidderTest.java | 96 ++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index a2446ea253b..990ace5dc3b 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -1,9 +1,13 @@ package org.prebid.server.bidder.impactify; +import com.fasterxml.jackson.core.JsonProcessingException; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Video; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -11,18 +15,27 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.prebid.server.VertxTest; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.HttpCall; import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.HttpResponse; import org.prebid.server.bidder.model.Result; import org.prebid.server.currency.CurrencyConversionService; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import org.prebid.server.proto.openrtb.ext.response.BidType; import java.math.BigDecimal; import java.util.List; +import java.util.function.Function; +import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.tuple; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; public class ImpactifyBidderTest extends VertxTest { @@ -50,6 +63,7 @@ public void createBidderWithWrongEndpointShouldThrowException() { private static Imp givenImpressionWithValidData() { return Imp.builder() + .id("123") .bidfloorcur("USD") .bidfloor(BigDecimal.ONE) .banner(Banner.builder().build()) @@ -59,8 +73,37 @@ private static Imp givenImpressionWithValidData() { .build(); } + + private static Imp givenImpressionWithNonBidderCurrency() { + return Imp.builder() + .id("123") + .bidfloorcur("EUR") + .bidfloor(BigDecimal.ONE) + .banner(Banner.builder().build()) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static HttpCall givenHttpCall(BidRequest bidRequest, String body) { + return HttpCall.success( + HttpRequest.builder().payload(bidRequest).build(), + HttpResponse.of(200, null, body), + null); + } + + private static BidResponse givenBidResponse(Function bidCustomizer) { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .build())) + .build(); + } + @Test - public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCur() { + public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { // given final BidRequest bidRequest = BidRequest.builder() .imp(List.of(givenImpressionWithValidData())) @@ -77,4 +120,55 @@ public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloor .extracting(Imp::getBidfloor, Imp::getBidfloorcur) .containsExactly(tuple(BigDecimal.ONE, "USD")); } + + @Test + public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willReturn(BigDecimal.TEN); + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNonBidderCurrency())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.TEN, "USD")); + } + + @Test + public void makeBidsShouldReturnValidBidResponse() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(BidderBid::getBid) + .containsOnly(Bid.builder() + .impid("123") + .build()); + + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.banner); + + + } } From 0bd8f641966e9b012ce0c1449e864ff83db102b3 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 12:16:14 +0300 Subject: [PATCH 10/30] Add TODO for myself --- .../org/prebid/server/bidder/impactify/ImpactifyBidderTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 990ace5dc3b..ecb11640382 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -55,6 +55,8 @@ public void setUp() { impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); } + //TODO: ADD ZERO PRICE TO CHECK IF PRICE IS VALID + //TODO: @Test public void createBidderWithWrongEndpointShouldThrowException() { assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, From 598efb16bb05273310924dddfdbb2f582db8d5a4 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 12:44:13 +0300 Subject: [PATCH 11/30] WIP --- .../bidder/impactify/ImpactifyBidder.java | 3 ++ .../bidder/impactify/ImpactifyBidderTest.java | 31 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 2e3a26148ea..fe892355661 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -68,6 +68,9 @@ public Result>> makeHttpRequests(BidRequest request && !imp.getBidfloorcur().isEmpty() && !imp.getBidfloorcur().equalsIgnoreCase(BIDDER_CURRENCY)) { bidFloor = resolveBidFloor(imp, request); + } else { + return Result.withError( + BidderError.badInput("Unable to convert currency for the impression ext for id: " + imp.getId())); } final ExtImpImpactify extImpImpactify; diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index ecb11640382..bdb4bde8e96 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -16,6 +16,7 @@ import org.mockito.junit.MockitoRule; import org.prebid.server.VertxTest; import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderError; import org.prebid.server.bidder.model.HttpCall; import org.prebid.server.bidder.model.HttpRequest; import org.prebid.server.bidder.model.HttpResponse; @@ -56,7 +57,6 @@ public void setUp() { } //TODO: ADD ZERO PRICE TO CHECK IF PRICE IS VALID - //TODO: @Test public void createBidderWithWrongEndpointShouldThrowException() { assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, @@ -75,6 +75,18 @@ private static Imp givenImpressionWithValidData() { .build(); } + private static Imp givenImpressionWithZeroPrice() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ZERO) + .banner(Banner.builder().build()) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + private static Imp givenImpressionWithNonBidderCurrency() { return Imp.builder() @@ -123,6 +135,23 @@ public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloor .containsExactly(tuple(BigDecimal.ONE, "USD")); } + @Test + public void makeHttpRequestsWithOneImpressionWithZeroPriceAddsNoValidImpressionsError() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithZeroPrice())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .isEqualTo("Unable to decode the impression ext for id: 123"); + + } + @Test public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { // given From 7ee897699ca05d10a2692c732a95524c4e3a935b Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 17:29:30 +0300 Subject: [PATCH 12/30] Add IT tests, change some logic --- .../bidder/impactify/ImpactifyBidder.java | 169 +++++------ .../resources/bidder-config/impactify.yaml | 2 +- .../static/bidder-params/impactify.json | 26 ++ .../bidder/impactify/ImpactifyBidderTest.java | 286 ++++++++++++++++-- .../org/prebid/server/it/ImpactifyTest.java | 33 ++ .../server/it/test-application.properties | 2 + 6 files changed, 404 insertions(+), 114 deletions(-) create mode 100644 src/main/resources/static/bidder-params/impactify.json create mode 100644 src/test/java/org/prebid/server/it/ImpactifyTest.java diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index fe892355661..dea523aad69 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -1,7 +1,6 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; @@ -14,6 +13,7 @@ import io.vertx.core.MultiMap; import io.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.Bidder; import org.prebid.server.bidder.model.BidderBid; import org.prebid.server.bidder.model.BidderError; @@ -27,7 +27,6 @@ import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; import org.prebid.server.proto.openrtb.ext.response.BidType; -import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; @@ -56,6 +55,66 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } + private static boolean isBidFloorValid(BigDecimal bidFloor, String bidFloorCur) { + return Objects.nonNull(bidFloor) + && StringUtils.isNotEmpty(bidFloorCur) + && BigDecimal.ZERO.compareTo(bidFloor) <= 0 + && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); + } + + private static MultiMap constructHeaders(BidRequest bidRequest) { + final Device device = bidRequest.getDevice(); + final String deviceUa = device != null ? device.getUa() : null; + final String deviceIpv4 = device != null ? device.getIp() : null; + final String deviceIpv6 = device != null ? device.getIpv6() : null; + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + final MultiMap headers = HttpUtil.headers(); + + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIpv4)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); + } else if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); + } + } + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); + } + + return headers; + } + + private static BidType getBidType(String impId, List imps) { + for (Imp imp : imps) { + if (imp.getId().equals(impId)) { + if (imp.getBanner() != null) { + return BidType.banner; + } + if (imp.getVideo() != null) { + return BidType.video; + } + throw new PreBidException(String.format("Unknown impression type for ID: \'%s\'", impId)); + } + } + throw new PreBidException(String.format("Failed to find impression for ID: \'%s\'", impId)); + } + + private String resolveEndpoint() { + return endpointUrl; + } + @Override public Result>> makeHttpRequests(BidRequest request) { final List imps = request.getImp(); @@ -64,13 +123,12 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : imps) { BigDecimal bidFloor = imp.getBidfloor(); - if (imp.getBidfloor().compareTo(BigDecimal.ZERO) > 0 - && !imp.getBidfloorcur().isEmpty() - && !imp.getBidfloorcur().equalsIgnoreCase(BIDDER_CURRENCY)) { - bidFloor = resolveBidFloor(imp, request); - } else { - return Result.withError( - BidderError.badInput("Unable to convert currency for the impression ext for id: " + imp.getId())); + if (isBidFloorValid(bidFloor, imp.getBidfloorcur())) { + try { + bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); + } catch (PreBidException e) { + return Result.withError(BidderError.badInput(e.getMessage())); + } } final ExtImpImpactify extImpImpactify; @@ -86,17 +144,13 @@ public Result>> makeHttpRequests(BidRequest request updatedImps.add(imp.toBuilder() .bidfloorcur(BIDDER_CURRENCY) .bidfloor(bidFloor) - .ext(mapper.mapper().convertValue(extImpImpactify, ObjectNode.class)) + .ext(mapper.mapper().valueToTree(ExtPrebid.of(null, extImpImpactify))) .build()); } - if (updatedImps.size() == 0) { - return Result - .withError(BidderError.badInput("No valid impressions in the bid request")); - } - updatedBidRequest = request.toBuilder() .imp(updatedImps) + .cur(List.of("USD")) .build(); return Result.withValue(HttpRequest.builder() @@ -108,70 +162,6 @@ public Result>> makeHttpRequests(BidRequest request .build()); } - private static BigDecimal resolveBidFloorPrice(Imp imp) { - final BigDecimal bidFloor = imp.getBidfloor(); - return BidderUtil.isValidPrice(bidFloor) ? bidFloor : null; - } - - private BigDecimal resolveBidFloor(Imp imp, BidRequest bidRequest) { - final BigDecimal validBidFloorPrice = resolveBidFloorPrice(imp); - if (validBidFloorPrice == null) { - return null; - } - - return convertBidFloorCurrency(validBidFloorPrice, bidRequest, imp); - } - - private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, Imp imp) { - try { - return currencyConversionService - .convertCurrency(bidFloor, bidRequest, imp.getBidfloorcur(), BIDDER_CURRENCY); - } catch (PreBidException e) { - throw new PreBidException(String.format( - "Unable to convert provided bid floor currency from %s to %s for imp `%s` with a reason: %s", - imp.getBidfloorcur(), BIDDER_CURRENCY, imp.getId(), e.getMessage())); - } - } - - private String resolveEndpoint() { - return endpointUrl; - } - - private static MultiMap constructHeaders(BidRequest bidRequest) { - final Device device = bidRequest.getDevice(); - final String deviceUa = device != null ? device.getUa() : null; - final String deviceIpv4 = device != null ? device.getIp() : null; - final String deviceIpv6 = device != null ? device.getIpv6() : null; - final Site site = bidRequest.getSite(); - final String sitePage = site != null ? site.getPage() : null; - final User user = bidRequest.getUser(); - final String userUid = user != null ? user.getBuyeruid() : null; - final MultiMap headers = HttpUtil.headers(); - - headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); - headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); - headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); - if (Objects.nonNull(device)) { - if (Objects.nonNull(deviceUa)) { - headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); - } - if (Objects.nonNull(deviceIpv4)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); - } - if (Objects.nonNull(deviceIpv6)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); - } - } - if (Objects.nonNull(site)) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - - return headers; - } - @Override public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { try { @@ -211,18 +201,15 @@ private static BidderBid resolveBidderBid(Bid bid, String currency, List im return BidderBid.of(bid, bidType, currency); } - private static BidType getBidType(String impId, List imps) { - for (Imp imp : imps) { - if (imp.getId().equals(impId)) { - if (imp.getBanner() != null) { - return BidType.banner; - } - if (imp.getVideo() != null) { - return BidType.video; - } - throw new PreBidException(String.format("Unknown impression type for ID: \"%s\"", impId)); - } + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, + String impId, String bidFloorCur) { + try { + return currencyConversionService + .convertCurrency(bidFloor, bidRequest, bidFloorCur, BIDDER_CURRENCY); + } catch (PreBidException e) { + throw new PreBidException(String.format( + "Unable to convert provided bid floor currency from %s to %s for imp `%s`", + bidFloorCur, BIDDER_CURRENCY, impId)); } - throw new PreBidException(String.format("Failed to find impression for ID: \"%s\"", impId)); } } diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml index e74cfa60bd8..78f61203060 100644 --- a/src/main/resources/bidder-config/impactify.yaml +++ b/src/main/resources/bidder-config/impactify.yaml @@ -9,7 +9,7 @@ adapters: supported-vendors: vendor-id: 606 usersync: - url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect_url={{.RedirectURL}} + url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect_url={{.RedirectURL}} redirect-url: /setuid?bidder=impactify&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid={IMPACTIFY_UID} cookie-family-name: impactify type: iframe diff --git a/src/main/resources/static/bidder-params/impactify.json b/src/main/resources/static/bidder-params/impactify.json new file mode 100644 index 00000000000..79966bff471 --- /dev/null +++ b/src/main/resources/static/bidder-params/impactify.json @@ -0,0 +1,26 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Impactify Adapter Params", + "description": "A schema which validates params accepted by the Impactify adapter", + "type": "object", + "properties": { + "appId": { + "type": "string", + "description": "The appId of your website" + }, + "format": { + "type": "string", + "description": "The format of the ad" + }, + "style": { + "type": "string", + "description": "The style of the ad" + } + }, + "required": [ + "appId", + "format", + "style" + ] +} + diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index bdb4bde8e96..0ea53de03e7 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -1,13 +1,19 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.JsonProcessingException; +import com.iab.openrtb.request.Audio; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.request.User; import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.vertx.core.MultiMap; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -22,14 +28,17 @@ import org.prebid.server.bidder.model.HttpResponse; import org.prebid.server.bidder.model.Result; import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.exception.PreBidException; import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; import java.util.List; -import java.util.function.Function; +import java.util.Map; +import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -56,37 +65,76 @@ public void setUp() { impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); } - //TODO: ADD ZERO PRICE TO CHECK IF PRICE IS VALID @Test public void createBidderWithWrongEndpointShouldThrowException() { assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, jacksonMapper, currencyConversionService)); } - private static Imp givenImpressionWithValidData() { + private static Imp givenImpressionWithValidBannerData() { return Imp.builder() .id("123") .bidfloorcur("USD") .bidfloor(BigDecimal.ONE) .banner(Banner.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static Imp givenImpressionWithValidVideoData() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE) .video(Video.builder().build()) .ext(mapper.valueToTree(ExtPrebid.of( ExtImpImpactify.of("appId", "format", "style"), null))) .build(); } - private static Imp givenImpressionWithZeroPrice() { + private static Imp givenImpressionWithNoValidBidType() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE) + .audio(Audio.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static Imp givenImpressionWithInvalidExt() { return Imp.builder() .id("123") .bidfloorcur("USD") .bidfloor(BigDecimal.ZERO) .banner(Banner.builder().build()) .video(Video.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of( - ExtImpImpactify.of("appId", "format", "style"), null))) + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) .build(); } + @Test + public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willReturn(BigDecimal.TEN); + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNonBidderCurrency())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.TEN, "USD")); + } private static Imp givenImpressionWithNonBidderCurrency() { return Imp.builder() @@ -107,20 +155,35 @@ private static HttpCall givenHttpCall(BidRequest bidRequest, String null); } - private static BidResponse givenBidResponse(Function bidCustomizer) { + private static BidResponse givenBidResponseWithBidWithValidImpId() { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(Bid.builder().impid("123").build())) + .build())) + .build(); + } + + private static BidResponse givenBidResponseWithBidWithInvalidImpId() { return BidResponse.builder() .cur("USD") .seatbid(singletonList(SeatBid.builder() - .bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .bid(singletonList(Bid.builder().impid("321").build())) .build())) .build(); } + private static BidResponse givenBidResponseWithEmptySeatBid() { + return BidResponse.builder() + .seatbid(emptyList()) + .build(); + } + @Test public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidData())) + .imp(List.of(givenImpressionWithValidBannerData())) .build(); //when @@ -136,10 +199,10 @@ public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloor } @Test - public void makeHttpRequestsWithOneImpressionWithZeroPriceAddsNoValidImpressionsError() { + public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { // given final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithZeroPrice())) + .imp(List.of(givenImpressionWithInvalidExt())) .build(); //when @@ -148,15 +211,30 @@ public void makeHttpRequestsWithOneImpressionWithZeroPriceAddsNoValidImpressions //then assertThat(result.getErrors()).hasSize(1) .extracting(BidderError::getMessage) - .isEqualTo("Unable to decode the impression ext for id: 123"); + .containsExactly("Unable to decode the impression ext for id: 123"); + } + + @Test + public void makeHttpRequestsWithNoImpressionsWillReturnWithError() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(emptyList()) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .containsExactly("No valid impressions in the bid request"); } @Test - public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { + public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion() { // given given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) - .willReturn(BigDecimal.TEN); + .willThrow(PreBidException.class); final BidRequest bidRequest = BidRequest.builder() .imp(List.of(givenImpressionWithNonBidderCurrency())) .build(); @@ -164,26 +242,89 @@ public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloor //when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .containsExactly("Unable to convert provided bid floor currency from EUR to USD for imp `123`"); + + } + + @Test + public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6() { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .device(Device.builder() + .ip("ip") + .ipv6("ipv6") + .ua("ua") + .build()) + .site(Site.builder() + .page("https://proper.web.site") + .build()) + .user(User.builder() + .buyeruid("buyer_user_uid") + .build()) + .build(); + + //when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + //then assertThat(result.getErrors()).hasSize(0); - assertThat(result.getValue()).hasSize(1) - .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getBidfloor, Imp::getBidfloorcur) - .containsExactly(tuple(BigDecimal.TEN, "USD")); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple(HttpUtil.USER_AGENT_HEADER.toString(), "ua"), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ip"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5"), + tuple(HttpUtil.REFERER_HEADER.toString(), "https://proper.web.site"), + tuple(HttpUtil.COOKIE_HEADER.toString(), "uids=buyer_user_uid") + ); } @Test - public void makeBidsShouldReturnValidBidResponse() throws JsonProcessingException { + public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIp() { //given final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidData())) + .imp(List.of(givenImpressionWithValidBannerData())) + .device(Device.builder() + .ipv6("ipv6") + .build()) + .build(); + + //when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipv6"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5") + ); + } + + @Test + public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) .build(); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString( - givenBidResponse(bidBuilder -> bidBuilder.impid("123")))); + givenBidResponseWithBidWithValidImpId())); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -199,7 +340,108 @@ public void makeBidsShouldReturnValidBidResponse() throws JsonProcessingExceptio assertThat(result.getValue()) .extracting(BidderBid::getType) .containsExactly(BidType.banner); + } + @Test + public void makeBidsWithInvalidBodyShouldResultInError() { + //given + final HttpCall httpCall = givenHttpCall(null, "invalid"); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, null); + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors().get(0).getMessage()).startsWith("Failed to decode: Unrecognized token"); + } + + @Test + public void makeBidsReturnEmptyListsResultWhenEmptySeatBidInBidResponse() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithEmptySeatBid())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidVideoData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithValidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(BidderBid::getBid) + .containsOnly(Bid.builder() + .impid("123") + .build()); + + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.video); + } + + @Test + public void makeBidsShouldReturnErrorWithNoValidBidType() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNoValidBidType())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithValidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors()) + .extracting(BidderError::getMessage).containsExactly("Unknown impression type for ID: '123'"); + } + + @Test + public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestImpId() + throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithInvalidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors()) + .extracting(BidderError::getMessage).containsExactly("Failed to find impression for ID: '321'"); } } diff --git a/src/test/java/org/prebid/server/it/ImpactifyTest.java b/src/test/java/org/prebid/server/it/ImpactifyTest.java new file mode 100644 index 00000000000..efd72e3c6d3 --- /dev/null +++ b/src/test/java/org/prebid/server/it/ImpactifyTest.java @@ -0,0 +1,33 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.prebid.server.model.Endpoint; +import org.springframework.test.context.junit4.SpringRunner; + +import java.io.IOException; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Collections.singletonList; + +@RunWith(SpringRunner.class) +public class ImpactifyTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromImpactify() throws IOException, JSONException { + //given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/impactify-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/impactify/test-impactify-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/impactify/test-impactify-bid-response.json")))); + //when + final Response response = responseFor("openrtb2/impactify/test-auction-impactify-request.json", + Endpoint.openrtb2_auction); + //then + assertJsonEquals("openrtb2/impactify/test-auction-impactify-response.json", response, singletonList("impactify")); + } +} diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties index c76742e4643..87408be77a4 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -117,6 +117,8 @@ adapters.grid.enabled=true adapters.grid.endpoint=http://localhost:8090/grid-exchange adapters.gumgum.enabled=true adapters.gumgum.endpoint=http://localhost:8090/gumgum-exchange +adapters.impactify.enabled=true +adapters.impactify.endpoint=http://localhost:8090/impactify-exchange adapters.improvedigital.enabled=true adapters.improvedigital.endpoint=http://localhost:8090/improvedigital-exchange adapters.iqzone.enabled=true From fa517b56e931373354850d9ae797732a98a8b11d Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 18:46:07 +0300 Subject: [PATCH 13/30] Add json files for it tests --- .../test-auction-impactify-request.json | 25 +++++++++++ .../test-auction-impactify-response.json | 35 +++++++++++++++ .../impactify/test-impactify-bid-request.json | 44 +++++++++++++++++++ .../test-impactify-bid-response.json | 18 ++++++++ 4 files changed, 122 insertions(+) create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json new file mode 100644 index 00000000000..8bc411a5a49 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json @@ -0,0 +1,25 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 320, + "h": 250 + }, + "ext": { + "impactify": { + "appId": "appId", + "format": "format", + "style": "style" + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json new file mode 100644 index 00000000000..4bfd0bcee03 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json @@ -0,0 +1,35 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 0.01, + "adid": "2068416", + "cid": "8048", + "crid": "24080", + "ext": { + "prebid": { + "type": "banner" + }, + "origbidcpm": 0.01 + } + } + ], + "seat": "impactify", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "impactify": "{{ impactify.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json new file mode 100644 index 00000000000..d43c2f70fc3 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json @@ -0,0 +1,44 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 320, + "h": 250 + }, + "bidfloorcur" : "USD", + "ext": { + "bidder": { + "appId": "appId", + "format": "format", + "style": "style" + } + } + } + ], + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": 5000, + "cur": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json new file mode 100644 index 00000000000..2dd18dff6c6 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json @@ -0,0 +1,18 @@ +{ + "id": "tid", + "seatbid": [ + { + "bid": [ + { + "crid": "24080", + "adid": "2068416", + "price": 0.01, + "id": "bid_id", + "impid": "imp_id", + "cid": "8048" + } + ], + "type": "banner" + } + ] +} From 9b55d519de96facf37dca52c946f32324fcf3680 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 18:46:24 +0300 Subject: [PATCH 14/30] Add json files for it tests --- .../it/openrtb2/impactify/test-impactify-bid-request.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json index d43c2f70fc3..da29639a910 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json @@ -7,7 +7,7 @@ "w": 320, "h": 250 }, - "bidfloorcur" : "USD", + "bidfloorcur": "USD", "ext": { "bidder": { "appId": "appId", From d5335d29dfe4bcc9486c6d20d4370ece98b9c2cf Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 18:52:02 +0300 Subject: [PATCH 15/30] Remove test after refactoring --- .../bidder/impactify/ImpactifyBidderTest.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 0ea53de03e7..4af679383ac 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -214,22 +214,6 @@ public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { .containsExactly("Unable to decode the impression ext for id: 123"); } - @Test - public void makeHttpRequestsWithNoImpressionsWillReturnWithError() { - // given - final BidRequest bidRequest = BidRequest.builder() - .imp(emptyList()) - .build(); - - //when - Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - - //then - assertThat(result.getErrors()).hasSize(1) - .extracting(BidderError::getMessage) - .containsExactly("No valid impressions in the bid request"); - } - @Test public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion() { // given From 546adbae72e92c3e7e39382045e00ce514c4504f Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 19 Oct 2021 18:11:36 +0300 Subject: [PATCH 16/30] New bidder: Impactify - Implementation - Unit tests - Integration tests --- .../bidder/impactify/ImpactifyBidder.java | 215 +++++++++ .../request/impactify/ExtImpImpactify.java | 19 + .../config/bidder/ImpactifyConfiguration.java | 43 ++ .../resources/bidder-config/impactify.yaml | 16 + .../static/bidder-params/impactify.json | 26 ++ .../bidder/impactify/ImpactifyBidderTest.java | 431 ++++++++++++++++++ .../org/prebid/server/it/ImpactifyTest.java | 33 ++ .../test-auction-impactify-request.json | 25 + .../test-auction-impactify-response.json | 35 ++ .../impactify/test-impactify-bid-request.json | 44 ++ .../test-impactify-bid-response.json | 18 + .../server/it/test-application.properties | 2 + 12 files changed, 907 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java create mode 100644 src/main/resources/bidder-config/impactify.yaml create mode 100644 src/main/resources/static/bidder-params/impactify.json create mode 100644 src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java create mode 100644 src/test/java/org/prebid/server/it/ImpactifyTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java new file mode 100644 index 00000000000..dea523aad69 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -0,0 +1,215 @@ +package org.prebid.server.bidder.impactify; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.request.User; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.vertx.core.MultiMap; +import io.vertx.core.http.HttpMethod; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.prebid.server.bidder.Bidder; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderError; +import org.prebid.server.bidder.model.HttpCall; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.Result; +import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.exception.PreBidException; +import org.prebid.server.json.DecodeException; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.HttpUtil; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class ImpactifyBidder implements Bidder { + + private static final TypeReference> IMPACTIFY_EXT_TYPE_REFERENCE = + new TypeReference>() { + }; + private static final String X_OPENRTB_VERSION = "2.5"; + private static final String BIDDER_CURRENCY = "USD"; + + private final String endpointUrl; + private final JacksonMapper mapper; + private final CurrencyConversionService currencyConversionService; + + public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConversionService conversionService) { + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + this.currencyConversionService = Objects.requireNonNull(conversionService); + } + + private static boolean isBidFloorValid(BigDecimal bidFloor, String bidFloorCur) { + return Objects.nonNull(bidFloor) + && StringUtils.isNotEmpty(bidFloorCur) + && BigDecimal.ZERO.compareTo(bidFloor) <= 0 + && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); + } + + private static MultiMap constructHeaders(BidRequest bidRequest) { + final Device device = bidRequest.getDevice(); + final String deviceUa = device != null ? device.getUa() : null; + final String deviceIpv4 = device != null ? device.getIp() : null; + final String deviceIpv6 = device != null ? device.getIpv6() : null; + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + final MultiMap headers = HttpUtil.headers(); + + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIpv4)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); + } else if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); + } + } + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); + } + + return headers; + } + + private static BidType getBidType(String impId, List imps) { + for (Imp imp : imps) { + if (imp.getId().equals(impId)) { + if (imp.getBanner() != null) { + return BidType.banner; + } + if (imp.getVideo() != null) { + return BidType.video; + } + throw new PreBidException(String.format("Unknown impression type for ID: \'%s\'", impId)); + } + } + throw new PreBidException(String.format("Failed to find impression for ID: \'%s\'", impId)); + } + + private String resolveEndpoint() { + return endpointUrl; + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + final List imps = request.getImp(); + final List updatedImps = new ArrayList<>(); + final BidRequest updatedBidRequest; + + for (Imp imp : imps) { + BigDecimal bidFloor = imp.getBidfloor(); + if (isBidFloorValid(bidFloor, imp.getBidfloorcur())) { + try { + bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); + } catch (PreBidException e) { + return Result.withError(BidderError.badInput(e.getMessage())); + } + } + + final ExtImpImpactify extImpImpactify; + try { + extImpImpactify = mapper.mapper() + .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) + .getBidder(); + } catch (IllegalArgumentException e) { + return Result.withError( + BidderError.badInput("Unable to decode the impression ext for id: " + imp.getId())); + } + + updatedImps.add(imp.toBuilder() + .bidfloorcur(BIDDER_CURRENCY) + .bidfloor(bidFloor) + .ext(mapper.mapper().valueToTree(ExtPrebid.of(null, extImpImpactify))) + .build()); + } + + updatedBidRequest = request.toBuilder() + .imp(updatedImps) + .cur(List.of("USD")) + .build(); + + return Result.withValue(HttpRequest.builder() + .method(HttpMethod.POST) + .uri(resolveEndpoint()) + .headers(constructHeaders(updatedBidRequest)) + .body(mapper.encode(updatedBidRequest)) + .payload(updatedBidRequest) + .build()); + } + + @Override + public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { + try { + final List errors = new ArrayList<>(); + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + return Result.of(extractBids(bidRequest, bidResponse, errors), errors); + } catch (DecodeException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private List extractBids(BidRequest bidRequest, BidResponse bidResponse, List errors) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse, bidRequest, errors); + } + + private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, List errors) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .flatMap(Collection::stream) + .map(bid -> resolveBidderBid(bid, bidResponse.getCur(), bidRequest.getImp(), errors)) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + private static BidderBid resolveBidderBid(Bid bid, String currency, List imps, List errors) { + final BidType bidType; + try { + bidType = getBidType(bid.getImpid(), imps); + } catch (PreBidException e) { + errors.add(BidderError.badServerResponse(e.getMessage())); + return null; + } + return BidderBid.of(bid, bidType, currency); + } + + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, + String impId, String bidFloorCur) { + try { + return currencyConversionService + .convertCurrency(bidFloor, bidRequest, bidFloorCur, BIDDER_CURRENCY); + } catch (PreBidException e) { + throw new PreBidException(String.format( + "Unable to convert provided bid floor currency from %s to %s for imp `%s`", + bidFloorCur, BIDDER_CURRENCY, impId)); + } + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java new file mode 100644 index 00000000000..972614a8b45 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java @@ -0,0 +1,19 @@ +package org.prebid.server.proto.openrtb.ext.request.impactify; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Value; + +@Value +@AllArgsConstructor(staticName = "of") +public class ExtImpImpactify { + + @JsonProperty("appId") + String appId; + + @JsonProperty("format") + String format; + + @JsonProperty("style") + String style; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java new file mode 100644 index 00000000000..6daed5621b3 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java @@ -0,0 +1,43 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.impactify.ImpactifyBidder; +import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.json.JacksonMapper; +import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; +import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; +import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; +import org.prebid.server.spring.env.YamlPropertySourceFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +import javax.validation.constraints.NotBlank; + +@Configuration +@PropertySource(value = "classpath:/bidder-config/impactify.yaml", factory = YamlPropertySourceFactory.class) +public class ImpactifyConfiguration { + + private static final String BIDDER_NAME = "impactify"; + + @Bean("impactifyConfigurationProperties") + @ConfigurationProperties("adapters.impactify") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps impactifyBidderDeps(BidderConfigurationProperties impactifyConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(impactifyConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new ImpactifyBidder(config.getEndpoint(), mapper, currencyConversionService)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml new file mode 100644 index 00000000000..78f61203060 --- /dev/null +++ b/src/main/resources/bidder-config/impactify.yaml @@ -0,0 +1,16 @@ +adapters: + impactify: + endpoint: https://sonic.impactify.media/bidder + meta-info: + maintainer-email: support@impactify.io + site-media-types: + - banner + - video + supported-vendors: + vendor-id: 606 + usersync: + url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect_url={{.RedirectURL}} + redirect-url: /setuid?bidder=impactify&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid={IMPACTIFY_UID} + cookie-family-name: impactify + type: iframe + support-cors: false diff --git a/src/main/resources/static/bidder-params/impactify.json b/src/main/resources/static/bidder-params/impactify.json new file mode 100644 index 00000000000..79966bff471 --- /dev/null +++ b/src/main/resources/static/bidder-params/impactify.json @@ -0,0 +1,26 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Impactify Adapter Params", + "description": "A schema which validates params accepted by the Impactify adapter", + "type": "object", + "properties": { + "appId": { + "type": "string", + "description": "The appId of your website" + }, + "format": { + "type": "string", + "description": "The format of the ad" + }, + "style": { + "type": "string", + "description": "The style of the ad" + } + }, + "required": [ + "appId", + "format", + "style" + ] +} + diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java new file mode 100644 index 00000000000..4af679383ac --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -0,0 +1,431 @@ +package org.prebid.server.bidder.impactify; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.iab.openrtb.request.Audio; +import com.iab.openrtb.request.Banner; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Device; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.request.User; +import com.iab.openrtb.request.Video; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import io.netty.handler.codec.http.HttpHeaderValues; +import io.vertx.core.MultiMap; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; +import org.prebid.server.VertxTest; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderError; +import org.prebid.server.bidder.model.HttpCall; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.HttpResponse; +import org.prebid.server.bidder.model.Result; +import org.prebid.server.currency.CurrencyConversionService; +import org.prebid.server.exception.PreBidException; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.HttpUtil; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.tuple; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; + +public class ImpactifyBidderTest extends VertxTest { + + private static final String TEST_ENDPOINT = "https://test.endpoint.com"; + private static final String INCORRECT_TEST_ENDPOINT = "incorrect.endpoint"; + + @Rule + public final MockitoRule mockitoRule = MockitoJUnit.rule(); + + private ImpactifyBidder impactifyBidder; + + @Mock + private CurrencyConversionService currencyConversionService; + + @Before + public void setUp() { + impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); + } + + @Test + public void createBidderWithWrongEndpointShouldThrowException() { + assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, + jacksonMapper, currencyConversionService)); + } + + private static Imp givenImpressionWithValidBannerData() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE) + .banner(Banner.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static Imp givenImpressionWithValidVideoData() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static Imp givenImpressionWithNoValidBidType() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE) + .audio(Audio.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static Imp givenImpressionWithInvalidExt() { + return Imp.builder() + .id("123") + .bidfloorcur("USD") + .bidfloor(BigDecimal.ZERO) + .banner(Banner.builder().build()) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build(); + } + + @Test + public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willReturn(BigDecimal.TEN); + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNonBidderCurrency())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.TEN, "USD")); + } + + private static Imp givenImpressionWithNonBidderCurrency() { + return Imp.builder() + .id("123") + .bidfloorcur("EUR") + .bidfloor(BigDecimal.ONE) + .banner(Banner.builder().build()) + .video(Video.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of( + ExtImpImpactify.of("appId", "format", "style"), null))) + .build(); + } + + private static HttpCall givenHttpCall(BidRequest bidRequest, String body) { + return HttpCall.success( + HttpRequest.builder().payload(bidRequest).build(), + HttpResponse.of(200, null, body), + null); + } + + private static BidResponse givenBidResponseWithBidWithValidImpId() { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(Bid.builder().impid("123").build())) + .build())) + .build(); + } + + private static BidResponse givenBidResponseWithBidWithInvalidImpId() { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(Bid.builder().impid("321").build())) + .build())) + .build(); + } + + private static BidResponse givenBidResponseWithEmptySeatBid() { + return BidResponse.builder() + .seatbid(emptyList()) + .build(); + } + + @Test + public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.ONE, "USD")); + } + + @Test + public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithInvalidExt())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .containsExactly("Unable to decode the impression ext for id: 123"); + } + + @Test + public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willThrow(PreBidException.class); + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNonBidderCurrency())) + .build(); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .containsExactly("Unable to convert provided bid floor currency from EUR to USD for imp `123`"); + + } + + @Test + public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6() { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .device(Device.builder() + .ip("ip") + .ipv6("ipv6") + .ua("ua") + .build()) + .site(Site.builder() + .page("https://proper.web.site") + .build()) + .user(User.builder() + .buyeruid("buyer_user_uid") + .build()) + .build(); + + //when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple(HttpUtil.USER_AGENT_HEADER.toString(), "ua"), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ip"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5"), + tuple(HttpUtil.REFERER_HEADER.toString(), "https://proper.web.site"), + tuple(HttpUtil.COOKIE_HEADER.toString(), "uids=buyer_user_uid") + ); + } + + @Test + public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIp() { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .device(Device.builder() + .ipv6("ipv6") + .build()) + .build(); + + //when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipv6"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5") + ); + } + + @Test + public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithValidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(BidderBid::getBid) + .containsOnly(Bid.builder() + .impid("123") + .build()); + + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.banner); + } + + @Test + public void makeBidsWithInvalidBodyShouldResultInError() { + //given + final HttpCall httpCall = givenHttpCall(null, "invalid"); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, null); + + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors().get(0).getMessage()).startsWith("Failed to decode: Unrecognized token"); + } + + @Test + public void makeBidsReturnEmptyListsResultWhenEmptySeatBidInBidResponse() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithEmptySeatBid())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidVideoData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithValidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()) + .extracting(BidderBid::getBid) + .containsOnly(Bid.builder() + .impid("123") + .build()); + + assertThat(result.getValue()) + .extracting(BidderBid::getType) + .containsExactly(BidType.video); + } + + @Test + public void makeBidsShouldReturnErrorWithNoValidBidType() throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithNoValidBidType())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithValidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors()) + .extracting(BidderError::getMessage).containsExactly("Unknown impression type for ID: '123'"); + } + + @Test + public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestImpId() + throws JsonProcessingException { + //given + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(givenImpressionWithValidBannerData())) + .build(); + + final HttpCall httpCall = givenHttpCall( + bidRequest, + mapper.writeValueAsString( + givenBidResponseWithBidWithInvalidImpId())); + + //when + final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors()) + .extracting(BidderError::getMessage).containsExactly("Failed to find impression for ID: '321'"); + } +} diff --git a/src/test/java/org/prebid/server/it/ImpactifyTest.java b/src/test/java/org/prebid/server/it/ImpactifyTest.java new file mode 100644 index 00000000000..efd72e3c6d3 --- /dev/null +++ b/src/test/java/org/prebid/server/it/ImpactifyTest.java @@ -0,0 +1,33 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.prebid.server.model.Endpoint; +import org.springframework.test.context.junit4.SpringRunner; + +import java.io.IOException; + +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static java.util.Collections.singletonList; + +@RunWith(SpringRunner.class) +public class ImpactifyTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromImpactify() throws IOException, JSONException { + //given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/impactify-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/impactify/test-impactify-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/impactify/test-impactify-bid-response.json")))); + //when + final Response response = responseFor("openrtb2/impactify/test-auction-impactify-request.json", + Endpoint.openrtb2_auction); + //then + assertJsonEquals("openrtb2/impactify/test-auction-impactify-response.json", response, singletonList("impactify")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json new file mode 100644 index 00000000000..8bc411a5a49 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json @@ -0,0 +1,25 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 320, + "h": 250 + }, + "ext": { + "impactify": { + "appId": "appId", + "format": "format", + "style": "style" + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json new file mode 100644 index 00000000000..4bfd0bcee03 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-response.json @@ -0,0 +1,35 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 0.01, + "adid": "2068416", + "cid": "8048", + "crid": "24080", + "ext": { + "prebid": { + "type": "banner" + }, + "origbidcpm": 0.01 + } + } + ], + "seat": "impactify", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "impactify": "{{ impactify.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json new file mode 100644 index 00000000000..da29639a910 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json @@ -0,0 +1,44 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 320, + "h": 250 + }, + "bidfloorcur": "USD", + "ext": { + "bidder": { + "appId": "appId", + "format": "format", + "style": "style" + } + } + } + ], + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": 5000, + "cur": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json new file mode 100644 index 00000000000..2dd18dff6c6 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-response.json @@ -0,0 +1,18 @@ +{ + "id": "tid", + "seatbid": [ + { + "bid": [ + { + "crid": "24080", + "adid": "2068416", + "price": 0.01, + "id": "bid_id", + "impid": "imp_id", + "cid": "8048" + } + ], + "type": "banner" + } + ] +} diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties index c76742e4643..87408be77a4 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -117,6 +117,8 @@ adapters.grid.enabled=true adapters.grid.endpoint=http://localhost:8090/grid-exchange adapters.gumgum.enabled=true adapters.gumgum.endpoint=http://localhost:8090/gumgum-exchange +adapters.impactify.enabled=true +adapters.impactify.endpoint=http://localhost:8090/impactify-exchange adapters.improvedigital.enabled=true adapters.improvedigital.endpoint=http://localhost:8090/improvedigital-exchange adapters.iqzone.enabled=true From 4a5ddc9adfcb7b1c6aa8dff54bb48dcbfeff826a Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 26 Oct 2021 19:08:33 +0300 Subject: [PATCH 17/30] Fix line break in it test: ImpactifyTest --- src/test/java/org/prebid/server/it/ImpactifyTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/prebid/server/it/ImpactifyTest.java b/src/test/java/org/prebid/server/it/ImpactifyTest.java index efd72e3c6d3..e51797b9bd2 100644 --- a/src/test/java/org/prebid/server/it/ImpactifyTest.java +++ b/src/test/java/org/prebid/server/it/ImpactifyTest.java @@ -28,6 +28,7 @@ public void openrtb2AuctionShouldRespondWithBidsFromImpactify() throws IOExcepti final Response response = responseFor("openrtb2/impactify/test-auction-impactify-request.json", Endpoint.openrtb2_auction); //then - assertJsonEquals("openrtb2/impactify/test-auction-impactify-response.json", response, singletonList("impactify")); + assertJsonEquals("openrtb2/impactify/test-auction-impactify-response.json", + response, singletonList("impactify")); } } From 5684652f8ae095e2266cab01044806eb1195753c Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 4 Nov 2021 12:26:50 +0200 Subject: [PATCH 18/30] Rearrange code for methods to be in correct order --- .../bidder/impactify/ImpactifyBidder.java | 138 +++++++++--------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index dea523aad69..8c941d7c52d 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -55,65 +55,6 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } - private static boolean isBidFloorValid(BigDecimal bidFloor, String bidFloorCur) { - return Objects.nonNull(bidFloor) - && StringUtils.isNotEmpty(bidFloorCur) - && BigDecimal.ZERO.compareTo(bidFloor) <= 0 - && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); - } - - private static MultiMap constructHeaders(BidRequest bidRequest) { - final Device device = bidRequest.getDevice(); - final String deviceUa = device != null ? device.getUa() : null; - final String deviceIpv4 = device != null ? device.getIp() : null; - final String deviceIpv6 = device != null ? device.getIpv6() : null; - final Site site = bidRequest.getSite(); - final String sitePage = site != null ? site.getPage() : null; - final User user = bidRequest.getUser(); - final String userUid = user != null ? user.getBuyeruid() : null; - final MultiMap headers = HttpUtil.headers(); - - headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); - headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); - headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); - if (Objects.nonNull(device)) { - if (Objects.nonNull(deviceUa)) { - headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); - } - if (Objects.nonNull(deviceIpv4)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); - } else if (Objects.nonNull(deviceIpv6)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); - } - } - if (Objects.nonNull(site)) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); - } - if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { - headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); - } - - return headers; - } - - private static BidType getBidType(String impId, List imps) { - for (Imp imp : imps) { - if (imp.getId().equals(impId)) { - if (imp.getBanner() != null) { - return BidType.banner; - } - if (imp.getVideo() != null) { - return BidType.video; - } - throw new PreBidException(String.format("Unknown impression type for ID: \'%s\'", impId)); - } - } - throw new PreBidException(String.format("Failed to find impression for ID: \'%s\'", impId)); - } - - private String resolveEndpoint() { - return endpointUrl; - } @Override public Result>> makeHttpRequests(BidRequest request) { @@ -162,6 +103,63 @@ public Result>> makeHttpRequests(BidRequest request .build()); } + private static boolean isBidFloorValid(BigDecimal bidFloor, String bidFloorCur) { + return Objects.nonNull(bidFloor) + && StringUtils.isNotEmpty(bidFloorCur) + && BigDecimal.ZERO.compareTo(bidFloor) <= 0 + && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); + } + + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, + String impId, String bidFloorCur) { + try { + return currencyConversionService + .convertCurrency(bidFloor, bidRequest, bidFloorCur, BIDDER_CURRENCY); + } catch (PreBidException e) { + throw new PreBidException(String.format( + "Unable to convert provided bid floor currency from %s to %s for imp `%s`", + bidFloorCur, BIDDER_CURRENCY, impId)); + } + } + + private String resolveEndpoint() { + return endpointUrl; + } + + private static MultiMap constructHeaders(BidRequest bidRequest) { + final Device device = bidRequest.getDevice(); + final String deviceUa = device != null ? device.getUa() : null; + final String deviceIpv4 = device != null ? device.getIp() : null; + final String deviceIpv6 = device != null ? device.getIpv6() : null; + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + final MultiMap headers = HttpUtil.headers(); + + headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); + headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + if (Objects.nonNull(device)) { + if (Objects.nonNull(deviceUa)) { + headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); + } + if (Objects.nonNull(deviceIpv4)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); + } else if (Objects.nonNull(deviceIpv6)) { + headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); + } + } + if (Objects.nonNull(site)) { + headers.set(HttpUtil.REFERER_HEADER, sitePage); + } + if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); + } + + return headers; + } + @Override public Result> makeBids(HttpCall httpCall, BidRequest bidRequest) { try { @@ -201,15 +199,19 @@ private static BidderBid resolveBidderBid(Bid bid, String currency, List im return BidderBid.of(bid, bidType, currency); } - private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, - String impId, String bidFloorCur) { - try { - return currencyConversionService - .convertCurrency(bidFloor, bidRequest, bidFloorCur, BIDDER_CURRENCY); - } catch (PreBidException e) { - throw new PreBidException(String.format( - "Unable to convert provided bid floor currency from %s to %s for imp `%s`", - bidFloorCur, BIDDER_CURRENCY, impId)); + + private static BidType getBidType(String impId, List imps) { + for (Imp imp : imps) { + if (imp.getId().equals(impId)) { + if (imp.getBanner() != null) { + return BidType.banner; + } + if (imp.getVideo() != null) { + return BidType.video; + } + throw new PreBidException(String.format("Unknown impression type for ID: '%s'", impId)); + } } + throw new PreBidException(String.format("Failed to find impression for ID: '%s'", impId)); } } From 8e8b681cb7ccd41b48cb95b675a823798c05dd33 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 4 Nov 2021 14:44:05 +0200 Subject: [PATCH 19/30] Remove blank lines --- .../org/prebid/server/bidder/impactify/ImpactifyBidder.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 8c941d7c52d..11e65fabacb 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -55,7 +55,6 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers this.currencyConversionService = Objects.requireNonNull(conversionService); } - @Override public Result>> makeHttpRequests(BidRequest request) { final List imps = request.getImp(); @@ -199,7 +198,6 @@ private static BidderBid resolveBidderBid(Bid bid, String currency, List im return BidderBid.of(bid, bidType, currency); } - private static BidType getBidType(String impId, List imps) { for (Imp imp : imps) { if (imp.getId().equals(impId)) { From 884f805852d941cbcc44d8a087851a01d3a2f8b9 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 4 Nov 2021 12:26:50 +0200 Subject: [PATCH 20/30] Refactor tests --- .../bidder/impactify/ImpactifyBidderTest.java | 282 +++++++----------- 1 file changed, 112 insertions(+), 170 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 4af679383ac..230d4fabae0 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -37,9 +37,12 @@ import java.math.BigDecimal; import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; -import static java.util.Collections.emptyList; +import static java.util.Arrays.asList; import static java.util.Collections.singletonList; +import static java.util.function.Function.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.tuple; @@ -71,120 +74,14 @@ public void createBidderWithWrongEndpointShouldThrowException() { jacksonMapper, currencyConversionService)); } - private static Imp givenImpressionWithValidBannerData() { - return Imp.builder() - .id("123") - .bidfloorcur("USD") - .bidfloor(BigDecimal.ONE) - .banner(Banner.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of( - ExtImpImpactify.of("appId", "format", "style"), null))) - .build(); - } - - private static Imp givenImpressionWithValidVideoData() { - return Imp.builder() - .id("123") - .bidfloorcur("USD") - .bidfloor(BigDecimal.ONE) - .video(Video.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of( - ExtImpImpactify.of("appId", "format", "style"), null))) - .build(); - } - - private static Imp givenImpressionWithNoValidBidType() { - return Imp.builder() - .id("123") - .bidfloorcur("USD") - .bidfloor(BigDecimal.ONE) - .audio(Audio.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of( - ExtImpImpactify.of("appId", "format", "style"), null))) - .build(); - } - - private static Imp givenImpressionWithInvalidExt() { - return Imp.builder() - .id("123") - .bidfloorcur("USD") - .bidfloor(BigDecimal.ZERO) - .banner(Banner.builder().build()) - .video(Video.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build(); - } - @Test - public void makeHttpRequestsShouldCheckIfImpressionHasCorrectBidFloorAndBidFloorCurChangeItOtherwise() { + public void makeHttpRequestsShouldConvertCurrencyIfNotDefault() { // given given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) .willReturn(BigDecimal.TEN); - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithNonBidderCurrency())) - .build(); - - //when - Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - - //then - assertThat(result.getErrors()).hasSize(0); - assertThat(result.getValue()).hasSize(1) - .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) - .flatExtracting(BidRequest::getImp) - .extracting(Imp::getBidfloor, Imp::getBidfloorcur) - .containsExactly(tuple(BigDecimal.TEN, "USD")); - } - private static Imp givenImpressionWithNonBidderCurrency() { - return Imp.builder() - .id("123") - .bidfloorcur("EUR") - .bidfloor(BigDecimal.ONE) - .banner(Banner.builder().build()) - .video(Video.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of( - ExtImpImpactify.of("appId", "format", "style"), null))) - .build(); - } - - private static HttpCall givenHttpCall(BidRequest bidRequest, String body) { - return HttpCall.success( - HttpRequest.builder().payload(bidRequest).build(), - HttpResponse.of(200, null, body), - null); - } - - private static BidResponse givenBidResponseWithBidWithValidImpId() { - return BidResponse.builder() - .cur("USD") - .seatbid(singletonList(SeatBid.builder() - .bid(singletonList(Bid.builder().impid("123").build())) - .build())) - .build(); - } - - private static BidResponse givenBidResponseWithBidWithInvalidImpId() { - return BidResponse.builder() - .cur("USD") - .seatbid(singletonList(SeatBid.builder() - .bid(singletonList(Bid.builder().impid("321").build())) - .build())) - .build(); - } - - private static BidResponse givenBidResponseWithEmptySeatBid() { - return BidResponse.builder() - .seatbid(emptyList()) - .build(); - } - - @Test - public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { - // given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidBannerData())) - .build(); + final BidRequest bidRequest = givenBidRequest( + impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("EUR")); //when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); @@ -195,23 +92,7 @@ public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloor .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) .extracting(Imp::getBidfloor, Imp::getBidfloorcur) - .containsExactly(tuple(BigDecimal.ONE, "USD")); - } - - @Test - public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { - // given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithInvalidExt())) - .build(); - - //when - Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - - //then - assertThat(result.getErrors()).hasSize(1) - .extracting(BidderError::getMessage) - .containsExactly("Unable to decode the impression ext for id: 123"); + .containsExactly(tuple(BigDecimal.TEN, "USD")); } @Test @@ -219,9 +100,9 @@ public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion( // given given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) .willThrow(PreBidException.class); - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithNonBidderCurrency())) - .build(); + + final BidRequest bidRequest = givenBidRequest( + impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("EUR")); //when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); @@ -236,20 +117,14 @@ public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion( @Test public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6() { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidBannerData())) - .device(Device.builder() - .ip("ip") - .ipv6("ipv6") - .ua("ua") - .build()) - .site(Site.builder() - .page("https://proper.web.site") - .build()) - .user(User.builder() - .buyeruid("buyer_user_uid") - .build()) - .build(); + final BidRequest bidRequest = givenBidRequest( + bidRequestCustomizer -> bidRequestCustomizer + .device(givenDevice(deviceCustomizer -> deviceCustomizer.ua("ua").ip("ip").ipv6("ipv6"))) + .site(Site.builder().page("https://proper.web.site").build()) + .user(User.builder().buyeruid("buyer_user_uid").build()), + singletonList(impCustomizer -> impCustomizer + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE))); //when final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); @@ -274,12 +149,12 @@ public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6 @Test public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIp() { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidBannerData())) - .device(Device.builder() - .ipv6("ipv6") - .build()) - .build(); + final BidRequest bidRequest = givenBidRequest( + bidRequestCustomizer -> bidRequestCustomizer + .device(givenDevice(deviceCustomizer -> deviceCustomizer.ipv6("ipv6"))), + singletonList(impCustomizer -> impCustomizer + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE))); //when final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); @@ -298,17 +173,48 @@ public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIp() ); } + @Test + public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { + // given + final BidRequest bidRequest = givenBidRequest( + impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("USD")); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(0); + assertThat(result.getValue()).hasSize(1) + .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.ONE, "USD")); + } + + @Test + public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { + // given + final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))); + + //when + Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + //then + assertThat(result.getErrors()).hasSize(1) + .extracting(BidderError::getMessage) + .containsExactly("Unable to decode the impression ext for id: 123"); + } + @Test public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessingException { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidBannerData())) - .build(); + final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer.banner(Banner.builder().build())); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString( - givenBidResponseWithBidWithValidImpId())); + givenBidResponse(identity()))); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -342,13 +248,11 @@ public void makeBidsWithInvalidBodyShouldResultInError() { @Test public void makeBidsReturnEmptyListsResultWhenEmptySeatBidInBidResponse() throws JsonProcessingException { //given - final BidRequest bidRequest = BidRequest.builder() - .build(); + final BidRequest bidRequest = BidRequest.builder().build(); final HttpCall httpCall = givenHttpCall( bidRequest, - mapper.writeValueAsString( - givenBidResponseWithEmptySeatBid())); + mapper.writeValueAsString(BidResponse.builder().build())); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -361,14 +265,12 @@ public void makeBidsReturnEmptyListsResultWhenEmptySeatBidInBidResponse() throws @Test public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessingException { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidVideoData())) - .build(); + final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer.video(Video.builder().build())); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString( - givenBidResponseWithBidWithValidImpId())); + givenBidResponse(identity()))); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -389,14 +291,13 @@ public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessin @Test public void makeBidsShouldReturnErrorWithNoValidBidType() throws JsonProcessingException { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithNoValidBidType())) - .build(); + final BidRequest bidRequest = givenBidRequest( + impCustomizer -> impCustomizer.banner(null).audio(Audio.builder().build())); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString( - givenBidResponseWithBidWithValidImpId())); + givenBidResponse(identity()))); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -411,14 +312,12 @@ public void makeBidsShouldReturnErrorWithNoValidBidType() throws JsonProcessingE public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestImpId() throws JsonProcessingException { //given - final BidRequest bidRequest = BidRequest.builder() - .imp(List.of(givenImpressionWithValidBannerData())) - .build(); + final BidRequest bidRequest = givenBidRequest(identity()); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString( - givenBidResponseWithBidWithInvalidImpId())); + givenBidResponse(bidBuilder -> bidBuilder.impid("321")))); //when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); @@ -428,4 +327,47 @@ public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestIm assertThat(result.getErrors()) .extracting(BidderError::getMessage).containsExactly("Failed to find impression for ID: '321'"); } + + private static BidRequest givenBidRequest( + Function bidRequestCustomizer, + List> impCustomizers) { + + return bidRequestCustomizer.apply(BidRequest.builder() + .imp(impCustomizers.stream() + .map(ImpactifyBidderTest::givenImp) + .collect(Collectors.toList()))) + .build(); + } + + @SafeVarargs + private static BidRequest givenBidRequest(Function... impCustomizers) { + return givenBidRequest(identity(), asList(impCustomizers)); + } + + private static Device givenDevice(Function deviceCustomizer) { + return deviceCustomizer.apply(Device.builder()).build(); + } + + private static Imp givenImp(Function impCustomizer) { + return impCustomizer.apply(Imp.builder() + .id("123") + .ext(mapper.valueToTree(ExtPrebid.of(null, + ExtImpImpactify.of("accountId", "format", "style"))))) + .build(); + } + + private static BidResponse givenBidResponse(Function bidCustomizer) { + return BidResponse.builder() + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(bidCustomizer.apply(Bid.builder().impid("123")).build())) + .build())) + .build(); + } + + private static HttpCall givenHttpCall(BidRequest bidRequest, String body) { + return HttpCall.success( + HttpRequest.builder().payload(bidRequest).build(), + HttpResponse.of(200, null, body), + null); + } } From 3c642539f80382a7a93575fbe73c611f53e85be9 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 9 Nov 2021 15:55:28 +0200 Subject: [PATCH 21/30] Fix code review comment issues --- .../bidder/impactify/ImpactifyBidder.java | 97 +++++++------- .../request/impactify/ExtImpImpactify.java | 2 - .../resources/bidder-config/impactify.yaml | 2 +- .../static/bidder-params/impactify.json | 10 +- .../bidder/impactify/ImpactifyBidderTest.java | 121 ++++++------------ 5 files changed, 87 insertions(+), 145 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 11e65fabacb..8cd9f8b630d 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -9,7 +9,6 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -import io.netty.handler.codec.http.HttpHeaderValues; import io.vertx.core.MultiMap; import io.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; @@ -57,52 +56,36 @@ public ImpactifyBidder(String endpointUrl, JacksonMapper mapper, CurrencyConvers @Override public Result>> makeHttpRequests(BidRequest request) { - final List imps = request.getImp(); final List updatedImps = new ArrayList<>(); - final BidRequest updatedBidRequest; - for (Imp imp : imps) { + for (Imp imp : request.getImp()) { BigDecimal bidFloor = imp.getBidfloor(); - if (isBidFloorValid(bidFloor, imp.getBidfloorcur())) { - try { + try { + if (shouldConvertBidFloor(bidFloor, imp.getBidfloorcur())) { bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); - } catch (PreBidException e) { - return Result.withError(BidderError.badInput(e.getMessage())); } + updatedImps.add(updateImpWithBidFloor(imp, bidFloor)); + } catch (PreBidException e) { + return Result.withError(BidderError.badInput(e.getMessage())); } - final ExtImpImpactify extImpImpactify; - try { - extImpImpactify = mapper.mapper() - .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) - .getBidder(); - } catch (IllegalArgumentException e) { - return Result.withError( - BidderError.badInput("Unable to decode the impression ext for id: " + imp.getId())); - } - - updatedImps.add(imp.toBuilder() - .bidfloorcur(BIDDER_CURRENCY) - .bidfloor(bidFloor) - .ext(mapper.mapper().valueToTree(ExtPrebid.of(null, extImpImpactify))) - .build()); } - updatedBidRequest = request.toBuilder() + final BidRequest updatedBidRequest = request.toBuilder() .imp(updatedImps) - .cur(List.of("USD")) + .cur(List.of(BIDDER_CURRENCY)) .build(); return Result.withValue(HttpRequest.builder() .method(HttpMethod.POST) - .uri(resolveEndpoint()) + .uri(endpointUrl) .headers(constructHeaders(updatedBidRequest)) .body(mapper.encode(updatedBidRequest)) .payload(updatedBidRequest) .build()); } - private static boolean isBidFloorValid(BigDecimal bidFloor, String bidFloorCur) { + private static boolean shouldConvertBidFloor(BigDecimal bidFloor, String bidFloorCur) { return Objects.nonNull(bidFloor) && StringUtils.isNotEmpty(bidFloorCur) && BigDecimal.ZERO.compareTo(bidFloor) <= 0 @@ -121,38 +104,43 @@ private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRe } } - private String resolveEndpoint() { - return endpointUrl; + private Imp updateImpWithBidFloor(Imp imp, BigDecimal bidFloor) { + return imp.toBuilder() + .bidfloorcur(BIDDER_CURRENCY) + .bidfloor(bidFloor) + .ext(mapper.mapper().valueToTree(ExtPrebid.of(null, parseExtImp(imp)))) + .build(); + } + + private ExtImpImpactify parseExtImp(Imp imp) { + try { + return mapper.mapper() + .convertValue(imp.getExt(), IMPACTIFY_EXT_TYPE_REFERENCE) + .getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException(String.format("Unable to decode the impression ext for id: %s", imp.getId())); + } } private static MultiMap constructHeaders(BidRequest bidRequest) { - final Device device = bidRequest.getDevice(); - final String deviceUa = device != null ? device.getUa() : null; - final String deviceIpv4 = device != null ? device.getIp() : null; - final String deviceIpv6 = device != null ? device.getIpv6() : null; - final Site site = bidRequest.getSite(); - final String sitePage = site != null ? site.getPage() : null; - final User user = bidRequest.getUser(); - final String userUid = user != null ? user.getBuyeruid() : null; final MultiMap headers = HttpUtil.headers(); headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); - headers.set(HttpUtil.CONTENT_TYPE_HEADER, HttpUtil.APPLICATION_JSON_CONTENT_TYPE); - headers.set(HttpUtil.ACCEPT_HEADER, HttpHeaderValues.APPLICATION_JSON); + + final Device device = bidRequest.getDevice(); if (Objects.nonNull(device)) { - if (Objects.nonNull(deviceUa)) { - headers.set(HttpUtil.USER_AGENT_HEADER, deviceUa); - } - if (Objects.nonNull(deviceIpv4)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv4); - } else if (Objects.nonNull(deviceIpv6)) { - headers.set(HttpUtil.X_FORWARDED_FOR_HEADER, deviceIpv6); - } - } - if (Objects.nonNull(site)) { - headers.set(HttpUtil.REFERER_HEADER, sitePage); + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa()); + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp()); + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6()); } - if (Objects.nonNull(user) && Objects.nonNull(userUid) && !userUid.isEmpty()) { + + final Site site = bidRequest.getSite(); + final String sitePage = site != null ? site.getPage() : null; + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.REFERER_HEADER, sitePage); + + final User user = bidRequest.getUser(); + final String userUid = user != null ? user.getBuyeruid() : null; + if (Objects.nonNull(user) && StringUtils.isNotEmpty(userUid)) { headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); } @@ -177,7 +165,8 @@ private List extractBids(BidRequest bidRequest, BidResponse bidRespon return bidsFromResponse(bidResponse, bidRequest, errors); } - private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, List errors) { + private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, + List errors) { return bidResponse.getSeatbid().stream() .filter(Objects::nonNull) .map(SeatBid::getBid) @@ -207,9 +196,9 @@ private static BidType getBidType(String impId, List imps) { if (imp.getVideo() != null) { return BidType.video; } - throw new PreBidException(String.format("Unknown impression type for ID: '%s'", impId)); } } - throw new PreBidException(String.format("Failed to find impression for ID: '%s'", impId)); + throw new PreBidException( + String.format("Failed to find a supported media type impression with ID: '%s'", impId)); } } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java index 972614a8b45..71e665acca9 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java @@ -11,9 +11,7 @@ public class ExtImpImpactify { @JsonProperty("appId") String appId; - @JsonProperty("format") String format; - @JsonProperty("style") String style; } diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml index 78f61203060..67c69524529 100644 --- a/src/main/resources/bidder-config/impactify.yaml +++ b/src/main/resources/bidder-config/impactify.yaml @@ -9,7 +9,7 @@ adapters: supported-vendors: vendor-id: 606 usersync: - url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect_url={{.RedirectURL}} + url: https://sonic.impactify.media/static/cookie_sync.html?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&redirect_url= redirect-url: /setuid?bidder=impactify&gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&us_privacy={{us_privacy}}&uid={IMPACTIFY_UID} cookie-family-name: impactify type: iframe diff --git a/src/main/resources/static/bidder-params/impactify.json b/src/main/resources/static/bidder-params/impactify.json index 79966bff471..1b0bbf4596a 100644 --- a/src/main/resources/static/bidder-params/impactify.json +++ b/src/main/resources/static/bidder-params/impactify.json @@ -6,15 +6,18 @@ "properties": { "appId": { "type": "string", - "description": "The appId of your website" + "description": "The appId of your website", + "minLength": 1 }, "format": { "type": "string", - "description": "The format of the ad" + "description": "The format of the ad", + "minLength": 1 }, "style": { "type": "string", - "description": "The style of the ad" + "description": "The style of the ad", + "minLength": 1 } }, "required": [ @@ -23,4 +26,3 @@ "style" ] } - diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 230d4fabae0..e9e7446fcb4 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -1,7 +1,6 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.JsonProcessingException; -import com.iab.openrtb.request.Audio; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; @@ -41,7 +40,6 @@ import java.util.stream.Collectors; import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; import static java.util.function.Function.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; @@ -83,11 +81,11 @@ public void makeHttpRequestsShouldConvertCurrencyIfNotDefault() { final BidRequest bidRequest = givenBidRequest( impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("EUR")); - //when + // when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - //then - assertThat(result.getErrors()).hasSize(0); + // then + assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()).hasSize(1) .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) @@ -104,10 +102,10 @@ public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion( final BidRequest bidRequest = givenBidRequest( impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("EUR")); - //when + // when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - //then + // then assertThat(result.getErrors()).hasSize(1) .extracting(BidderError::getMessage) .containsExactly("Unable to convert provided bid floor currency from EUR to USD for imp `123`"); @@ -116,21 +114,21 @@ public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion( @Test public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6() { - //given + // given final BidRequest bidRequest = givenBidRequest( bidRequestCustomizer -> bidRequestCustomizer .device(givenDevice(deviceCustomizer -> deviceCustomizer.ua("ua").ip("ip").ipv6("ipv6"))) .site(Site.builder().page("https://proper.web.site").build()) .user(User.builder().buyeruid("buyer_user_uid").build()), - singletonList(impCustomizer -> impCustomizer + List.of(impCustomizer -> impCustomizer .bidfloorcur("USD") .bidfloor(BigDecimal.ONE))); - //when + // when final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - //then - assertThat(result.getErrors()).hasSize(0); + // then + assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getHeaders) .flatExtracting(MultiMap::entries) @@ -140,50 +138,24 @@ public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6 tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), tuple(HttpUtil.USER_AGENT_HEADER.toString(), "ua"), tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ip"), + tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipv6"), tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5"), tuple(HttpUtil.REFERER_HEADER.toString(), "https://proper.web.site"), tuple(HttpUtil.COOKIE_HEADER.toString(), "uids=buyer_user_uid") ); } - @Test - public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIp() { - //given - final BidRequest bidRequest = givenBidRequest( - bidRequestCustomizer -> bidRequestCustomizer - .device(givenDevice(deviceCustomizer -> deviceCustomizer.ipv6("ipv6"))), - singletonList(impCustomizer -> impCustomizer - .bidfloorcur("USD") - .bidfloor(BigDecimal.ONE))); - - //when - final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - - //then - assertThat(result.getErrors()).hasSize(0); - assertThat(result.getValue()) - .extracting(HttpRequest::getHeaders) - .flatExtracting(MultiMap::entries) - .extracting(Map.Entry::getKey, Map.Entry::getValue) - .containsExactlyInAnyOrder( - tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), - tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), - tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipv6"), - tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5") - ); - } - @Test public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloorAndBidFloorCur() { // given final BidRequest bidRequest = givenBidRequest( impCustomizer -> impCustomizer.bidfloor(BigDecimal.ONE).bidfloorcur("USD")); - //when + // when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - //then - assertThat(result.getErrors()).hasSize(0); + // then + assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()).hasSize(1) .extracting(httpRequest -> mapper.readValue(httpRequest.getBody(), BidRequest.class)) .flatExtracting(BidRequest::getImp) @@ -197,10 +169,10 @@ public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))); - //when + // when Result>> result = impactifyBidder.makeHttpRequests(bidRequest); - //then + // then assertThat(result.getErrors()).hasSize(1) .extracting(BidderError::getMessage) .containsExactly("Unable to decode the impression ext for id: 123"); @@ -208,7 +180,7 @@ public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { @Test public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessingException { - //given + // given final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer.banner(Banner.builder().build())); final HttpCall httpCall = givenHttpCall( @@ -216,11 +188,11 @@ public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessi mapper.writeValueAsString( givenBidResponse(identity()))); - //when + // when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); - //then - assertThat(result.getErrors()).hasSize(0); + // then + assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(BidderBid::getBid) .containsOnly(Bid.builder() @@ -234,37 +206,37 @@ public void makeBidsShouldReturnValidBidResponseWithBanner() throws JsonProcessi @Test public void makeBidsWithInvalidBodyShouldResultInError() { - //given + // given final HttpCall httpCall = givenHttpCall(null, "invalid"); - //when + // when final Result> result = impactifyBidder.makeBids(httpCall, null); - //then + // then assertThat(result.getErrors()).hasSize(1); assertThat(result.getErrors().get(0).getMessage()).startsWith("Failed to decode: Unrecognized token"); } @Test public void makeBidsReturnEmptyListsResultWhenEmptySeatBidInBidResponse() throws JsonProcessingException { - //given + // given final BidRequest bidRequest = BidRequest.builder().build(); final HttpCall httpCall = givenHttpCall( bidRequest, mapper.writeValueAsString(BidResponse.builder().build())); - //when + // when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); - //then + // then assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()).isEmpty(); } @Test public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessingException { - //given + // given final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer.video(Video.builder().build())); final HttpCall httpCall = givenHttpCall( @@ -272,11 +244,11 @@ public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessin mapper.writeValueAsString( givenBidResponse(identity()))); - //when + // when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); - //then - assertThat(result.getErrors()).hasSize(0); + // then + assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(BidderBid::getBid) .containsOnly(Bid.builder() @@ -288,30 +260,10 @@ public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessin .containsExactly(BidType.video); } - @Test - public void makeBidsShouldReturnErrorWithNoValidBidType() throws JsonProcessingException { - //given - final BidRequest bidRequest = givenBidRequest( - impCustomizer -> impCustomizer.banner(null).audio(Audio.builder().build())); - - final HttpCall httpCall = givenHttpCall( - bidRequest, - mapper.writeValueAsString( - givenBidResponse(identity()))); - - //when - final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); - - //then - assertThat(result.getErrors()).hasSize(1); - assertThat(result.getErrors()) - .extracting(BidderError::getMessage).containsExactly("Unknown impression type for ID: '123'"); - } - @Test public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestImpId() throws JsonProcessingException { - //given + // given final BidRequest bidRequest = givenBidRequest(identity()); final HttpCall httpCall = givenHttpCall( @@ -319,13 +271,14 @@ public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestIm mapper.writeValueAsString( givenBidResponse(bidBuilder -> bidBuilder.impid("321")))); - //when + // when final Result> result = impactifyBidder.makeBids(httpCall, bidRequest); - //then + // then assertThat(result.getErrors()).hasSize(1); assertThat(result.getErrors()) - .extracting(BidderError::getMessage).containsExactly("Failed to find impression for ID: '321'"); + .extracting(BidderError::getMessage) + .containsExactly("Failed to find a supported media type impression with ID: '321'"); } private static BidRequest givenBidRequest( @@ -358,8 +311,8 @@ private static Imp givenImp(Function impCustomiz private static BidResponse givenBidResponse(Function bidCustomizer) { return BidResponse.builder() - .seatbid(singletonList(SeatBid.builder() - .bid(singletonList(bidCustomizer.apply(Bid.builder().impid("123")).build())) + .seatbid(List.of(SeatBid.builder() + .bid(List.of(bidCustomizer.apply(Bid.builder().impid("123")).build())) .build())) .build(); } From a7657caad660c46b9b1f0ab779228877ac8bc801 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 9 Nov 2021 16:56:37 +0200 Subject: [PATCH 22/30] Remove blank line --- .../java/org/prebid/server/bidder/impactify/ImpactifyBidder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 8cd9f8b630d..74d0f466e8f 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -68,7 +68,6 @@ public Result>> makeHttpRequests(BidRequest request } catch (PreBidException e) { return Result.withError(BidderError.badInput(e.getMessage())); } - } final BidRequest updatedBidRequest = request.toBuilder() From 4998908da1584afa06740c75ba83fa615b160d38 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 9 Nov 2021 17:08:06 +0200 Subject: [PATCH 23/30] Remove final --- .../org/prebid/server/bidder/impactify/ImpactifyBidder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 74d0f466e8f..748c295eacd 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -61,6 +61,9 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { BigDecimal bidFloor = imp.getBidfloor(); try { +// shouldConvertBidFloor(bidFloor, imp.getBidfloorcur()) +// ? convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()) +// : updatedImps.add(updateImpWithBidFloor(imp, bidFloor)); if (shouldConvertBidFloor(bidFloor, imp.getBidfloorcur())) { bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); } @@ -70,7 +73,7 @@ public Result>> makeHttpRequests(BidRequest request } } - final BidRequest updatedBidRequest = request.toBuilder() + BidRequest updatedBidRequest = request.toBuilder() .imp(updatedImps) .cur(List.of(BIDDER_CURRENCY)) .build(); From d74a0daa3c127a36fd604bd824c6f783c1ca92dc Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 9 Nov 2021 17:10:10 +0200 Subject: [PATCH 24/30] Remove final --- .../org/prebid/server/bidder/impactify/ImpactifyBidder.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 748c295eacd..77c79d38b27 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -61,9 +61,6 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { BigDecimal bidFloor = imp.getBidfloor(); try { -// shouldConvertBidFloor(bidFloor, imp.getBidfloorcur()) -// ? convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()) -// : updatedImps.add(updateImpWithBidFloor(imp, bidFloor)); if (shouldConvertBidFloor(bidFloor, imp.getBidfloorcur())) { bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); } From cf01e33176706ea5fc524b477c6645db41d8fc4d Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Tue, 9 Nov 2021 17:21:26 +0200 Subject: [PATCH 25/30] Reverted back and adapted JacksonMapper to new version --- .../org/prebid/server/bidder/impactify/ImpactifyBidder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 77c79d38b27..53c9692c196 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -70,7 +70,7 @@ public Result>> makeHttpRequests(BidRequest request } } - BidRequest updatedBidRequest = request.toBuilder() + final BidRequest updatedBidRequest = request.toBuilder() .imp(updatedImps) .cur(List.of(BIDDER_CURRENCY)) .build(); @@ -79,7 +79,7 @@ public Result>> makeHttpRequests(BidRequest request .method(HttpMethod.POST) .uri(endpointUrl) .headers(constructHeaders(updatedBidRequest)) - .body(mapper.encode(updatedBidRequest)) + .body(mapper.encodeToBytes(updatedBidRequest)) .payload(updatedBidRequest) .build()); } From 47b926e55723fc2b5b8ce33c41c6c3ef9b87d095 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 11 Nov 2021 13:00:37 +0200 Subject: [PATCH 26/30] Fix minor cosmetic stuff --- .../org/prebid/server/bidder/impactify/ImpactifyBidder.java | 6 +++--- src/test/java/org/prebid/server/it/ImpactifyTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 53c9692c196..73cf6357bcb 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -64,7 +64,7 @@ public Result>> makeHttpRequests(BidRequest request if (shouldConvertBidFloor(bidFloor, imp.getBidfloorcur())) { bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); } - updatedImps.add(updateImpWithBidFloor(imp, bidFloor)); + updatedImps.add(updateImp(imp, bidFloor)); } catch (PreBidException e) { return Result.withError(BidderError.badInput(e.getMessage())); } @@ -85,7 +85,7 @@ public Result>> makeHttpRequests(BidRequest request } private static boolean shouldConvertBidFloor(BigDecimal bidFloor, String bidFloorCur) { - return Objects.nonNull(bidFloor) + return bidFloor != null && StringUtils.isNotEmpty(bidFloorCur) && BigDecimal.ZERO.compareTo(bidFloor) <= 0 && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); @@ -103,7 +103,7 @@ private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRe } } - private Imp updateImpWithBidFloor(Imp imp, BigDecimal bidFloor) { + private Imp updateImp(Imp imp, BigDecimal bidFloor) { return imp.toBuilder() .bidfloorcur(BIDDER_CURRENCY) .bidfloor(bidFloor) diff --git a/src/test/java/org/prebid/server/it/ImpactifyTest.java b/src/test/java/org/prebid/server/it/ImpactifyTest.java index e51797b9bd2..d4e58997f55 100644 --- a/src/test/java/org/prebid/server/it/ImpactifyTest.java +++ b/src/test/java/org/prebid/server/it/ImpactifyTest.java @@ -20,14 +20,14 @@ public class ImpactifyTest extends IntegrationTest { @Test public void openrtb2AuctionShouldRespondWithBidsFromImpactify() throws IOException, JSONException { - //given + // given WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/impactify-exchange")) .withRequestBody(equalToJson(jsonFrom("openrtb2/impactify/test-impactify-bid-request.json"))) .willReturn(aResponse().withBody(jsonFrom("openrtb2/impactify/test-impactify-bid-response.json")))); - //when + // when final Response response = responseFor("openrtb2/impactify/test-auction-impactify-request.json", Endpoint.openrtb2_auction); - //then + // then assertJsonEquals("openrtb2/impactify/test-auction-impactify-response.json", response, singletonList("impactify")); } From 2307d64cd1b2c3d0febaee772b56fea76e493a79 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 15 Nov 2021 21:35:02 +0200 Subject: [PATCH 27/30] Fix CR comments --- .../bidder/impactify/ImpactifyBidder.java | 66 +++++++++---- .../request/impactify/ExtImpImpactify.java | 4 +- .../resources/bidder-config/impactify.yaml | 1 + .../bidder/impactify/ImpactifyBidderTest.java | 98 +++++++++++++++---- .../test-auction-impactify-request.json | 2 + .../impactify/test-impactify-bid-request.json | 3 +- 6 files changed, 132 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index 73cf6357bcb..e9bbb15b5a8 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -1,6 +1,8 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; @@ -26,6 +28,7 @@ import org.prebid.server.proto.openrtb.ext.ExtPrebid; import org.prebid.server.proto.openrtb.ext.request.impactify.ExtImpImpactify; import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.BidderUtil; import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; @@ -59,21 +62,15 @@ public Result>> makeHttpRequests(BidRequest request final List updatedImps = new ArrayList<>(); for (Imp imp : request.getImp()) { - BigDecimal bidFloor = imp.getBidfloor(); try { - if (shouldConvertBidFloor(bidFloor, imp.getBidfloorcur())) { - bidFloor = convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()); - } - updatedImps.add(updateImp(imp, bidFloor)); + final BigDecimal resolvedBidFloor = resolveBidFloor(request, imp, imp.getBidfloor()); + updatedImps.add(updateImp(imp, resolvedBidFloor)); } catch (PreBidException e) { return Result.withError(BidderError.badInput(e.getMessage())); } } - final BidRequest updatedBidRequest = request.toBuilder() - .imp(updatedImps) - .cur(List.of(BIDDER_CURRENCY)) - .build(); + final BidRequest updatedBidRequest = updateBidRequest(request, updatedImps); return Result.withValue(HttpRequest.builder() .method(HttpMethod.POST) @@ -84,11 +81,14 @@ public Result>> makeHttpRequests(BidRequest request .build()); } + private BigDecimal resolveBidFloor(BidRequest request, Imp imp, BigDecimal bidFloor) { + return shouldConvertBidFloor(bidFloor, imp.getBidfloorcur()) + ? convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()) + : imp.getBidfloor(); + } + private static boolean shouldConvertBidFloor(BigDecimal bidFloor, String bidFloorCur) { - return bidFloor != null - && StringUtils.isNotEmpty(bidFloorCur) - && BigDecimal.ZERO.compareTo(bidFloor) <= 0 - && !bidFloorCur.equalsIgnoreCase(BIDDER_CURRENCY); + return BidderUtil.isValidPrice(bidFloor) && !StringUtils.equalsIgnoreCase(bidFloorCur, BIDDER_CURRENCY); } private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, @@ -104,10 +104,12 @@ private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRe } private Imp updateImp(Imp imp, BigDecimal bidFloor) { + final ObjectNode modifiedImpExtBidder = createImpExtObjectNode(parseExtImp(imp)); + return imp.toBuilder() .bidfloorcur(BIDDER_CURRENCY) .bidfloor(bidFloor) - .ext(mapper.mapper().valueToTree(ExtPrebid.of(null, parseExtImp(imp)))) + .ext(mapper.mapper().createObjectNode().set("impactify", modifiedImpExtBidder)) .build(); } @@ -121,25 +123,49 @@ private ExtImpImpactify parseExtImp(Imp imp) { } } + private ObjectNode createImpExtObjectNode(ExtImpImpactify impExt) { + final ObjectNode modifiedImpExtBidder = mapper.mapper().createObjectNode(); + + if (impExt != null) { + modifiedImpExtBidder.set("appId", TextNode.valueOf(impExt.getAppId())); + modifiedImpExtBidder.set("format", TextNode.valueOf(impExt.getFormat())); + modifiedImpExtBidder.set("style", TextNode.valueOf(impExt.getStyle())); + } + + return modifiedImpExtBidder; + } + + private static BidRequest updateBidRequest(BidRequest request, List updatedImps) { + + return request.toBuilder() + .imp(updatedImps) + .cur(List.of(BIDDER_CURRENCY)) + .build(); + } + private static MultiMap constructHeaders(BidRequest bidRequest) { final MultiMap headers = HttpUtil.headers(); headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); final Device device = bidRequest.getDevice(); - if (Objects.nonNull(device)) { + if (device != null) { HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa()); - HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp()); - HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6()); + if (device.getIp() != null) { + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp()); + } else { + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6()); + } } final Site site = bidRequest.getSite(); - final String sitePage = site != null ? site.getPage() : null; - HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.REFERER_HEADER, sitePage); + if (site != null) { + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.REFERER_HEADER, site.getPage()); + } final User user = bidRequest.getUser(); final String userUid = user != null ? user.getBuyeruid() : null; - if (Objects.nonNull(user) && StringUtils.isNotEmpty(userUid)) { + if (StringUtils.isNotEmpty(userUid)) { headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); } diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java index 71e665acca9..d562605a312 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/impactify/ExtImpImpactify.java @@ -1,11 +1,9 @@ package org.prebid.server.proto.openrtb.ext.request.impactify; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; import lombok.Value; -@Value -@AllArgsConstructor(staticName = "of") +@Value(staticConstructor = "of") public class ExtImpImpactify { @JsonProperty("appId") diff --git a/src/main/resources/bidder-config/impactify.yaml b/src/main/resources/bidder-config/impactify.yaml index 67c69524529..162d0d36ddf 100644 --- a/src/main/resources/bidder-config/impactify.yaml +++ b/src/main/resources/bidder-config/impactify.yaml @@ -3,6 +3,7 @@ adapters: endpoint: https://sonic.impactify.media/bidder meta-info: maintainer-email: support@impactify.io + app-media-types: site-media-types: - banner - video diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index e9e7446fcb4..21f1979e667 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -1,6 +1,8 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; @@ -37,10 +39,9 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.function.UnaryOperator; -import static java.util.Arrays.asList; -import static java.util.function.Function.identity; +import static java.util.function.UnaryOperator.identity; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.tuple; @@ -94,7 +95,7 @@ public void makeHttpRequestsShouldConvertCurrencyIfNotDefault() { } @Test - public void makeHttpRequestsWithValidDataWillThrowExceptionOnCurrencyConversion() { + public void makeHttpRequestsShouldReturnErrorMessageOnFailedCurrencyConversion() { // given given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) .willThrow(PreBidException.class); @@ -120,9 +121,9 @@ public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6 .device(givenDevice(deviceCustomizer -> deviceCustomizer.ua("ua").ip("ip").ipv6("ipv6"))) .site(Site.builder().page("https://proper.web.site").build()) .user(User.builder().buyeruid("buyer_user_uid").build()), - List.of(impCustomizer -> impCustomizer + impCustomizer -> impCustomizer .bidfloorcur("USD") - .bidfloor(BigDecimal.ONE))); + .bidfloor(BigDecimal.ONE)); // when final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); @@ -138,6 +139,60 @@ public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv6 tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), tuple(HttpUtil.USER_AGENT_HEADER.toString(), "ua"), tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ip"), + tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5"), + tuple(HttpUtil.REFERER_HEADER.toString(), "https://proper.web.site"), + tuple(HttpUtil.COOKIE_HEADER.toString(), "uids=buyer_user_uid") + ); + } + + @Test + public void makeHttpRequestsWithValidDataShouldContainCorrectExt() { + // given + final BidRequest bidRequest = givenBidRequest( + bidRequestCustomizer -> bidRequestCustomizer + .site(Site.builder().page("https://proper.web.site").build()) + .user(User.builder().buyeruid("buyer_user_uid").build()), + impCustomizer -> impCustomizer + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE)); + + // when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getExt) + .containsExactly(createObjectNode()); + } + + @Test + public void makeHttpRequestsShouldReturnValidBidResponseWithAllHeadersExceptIpv4() { + // given + final BidRequest bidRequest = givenBidRequest( + bidRequestCustomizer -> bidRequestCustomizer + .device(givenDevice(deviceCustomizer -> deviceCustomizer.ua("ua").ipv6("ipv6"))) + .site(Site.builder().page("https://proper.web.site").build()) + .user(User.builder().buyeruid("buyer_user_uid").build()), + impCustomizer -> impCustomizer + .bidfloorcur("USD") + .bidfloor(BigDecimal.ONE)); + + // when + final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getHeaders) + .flatExtracting(MultiMap::entries) + .extracting(Map.Entry::getKey, Map.Entry::getValue) + .containsExactlyInAnyOrder( + tuple(HttpUtil.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString()), + tuple(HttpUtil.USER_AGENT_HEADER.toString(), "ua"), tuple(HttpUtil.X_FORWARDED_FOR_HEADER.toString(), "ipv6"), tuple(HttpUtil.X_OPENRTB_VERSION_HEADER.toString(), "2.5"), tuple(HttpUtil.REFERER_HEADER.toString(), "https://proper.web.site"), @@ -164,7 +219,7 @@ public void makeHttpRequestsShouldCheckIfValidDataInImpressionHasCorrectBidFloor } @Test - public void makeHttpRequestsWithInvalidImpressionExtWillReturnWithError() { + public void makeHttpRequestsWithInvalidImpressionExtShouldReturnUnableToDecodeError() { // given final BidRequest bidRequest = givenBidRequest(impCustomizer -> impCustomizer .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode())))); @@ -282,22 +337,19 @@ public void makeBidsShouldReturnErrorWhenBidResponseImpIdIsNotSameAsBidRequestIm } private static BidRequest givenBidRequest( - Function bidRequestCustomizer, - List> impCustomizers) { + UnaryOperator bidRequestCustomizer, + UnaryOperator impCustomizer) { return bidRequestCustomizer.apply(BidRequest.builder() - .imp(impCustomizers.stream() - .map(ImpactifyBidderTest::givenImp) - .collect(Collectors.toList()))) + .imp(List.of(givenImp(impCustomizer)))) .build(); } - @SafeVarargs - private static BidRequest givenBidRequest(Function... impCustomizers) { - return givenBidRequest(identity(), asList(impCustomizers)); + private static BidRequest givenBidRequest(UnaryOperator impCustomizer) { + return givenBidRequest(identity(), impCustomizer); } - private static Device givenDevice(Function deviceCustomizer) { + private static Device givenDevice(UnaryOperator deviceCustomizer) { return deviceCustomizer.apply(Device.builder()).build(); } @@ -305,11 +357,11 @@ private static Imp givenImp(Function impCustomiz return impCustomizer.apply(Imp.builder() .id("123") .ext(mapper.valueToTree(ExtPrebid.of(null, - ExtImpImpactify.of("accountId", "format", "style"))))) + ExtImpImpactify.of("appId", "format", "style"))))) .build(); } - private static BidResponse givenBidResponse(Function bidCustomizer) { + private static BidResponse givenBidResponse(UnaryOperator bidCustomizer) { return BidResponse.builder() .seatbid(List.of(SeatBid.builder() .bid(List.of(bidCustomizer.apply(Bid.builder().impid("123")).build())) @@ -323,4 +375,14 @@ private static HttpCall givenHttpCall(BidRequest bidRequest, String HttpResponse.of(200, null, body), null); } + + private static ObjectNode createObjectNode() { + final ObjectNode modifiedImpExtBidder = mapper.createObjectNode(); + + modifiedImpExtBidder.set("appId", TextNode.valueOf("appId")); + modifiedImpExtBidder.set("format", TextNode.valueOf("format")); + modifiedImpExtBidder.set("style", TextNode.valueOf("style")); + + return mapper.createObjectNode().set("impactify", modifiedImpExtBidder); + } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json index 8bc411a5a49..4006623abaf 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-auction-impactify-request.json @@ -7,6 +7,8 @@ "w": 320, "h": 250 }, + "bidfloor": 10, + "bidfloorcur": "USD", "ext": { "impactify": { "appId": "appId", diff --git a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json index da29639a910..08b94025306 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/impactify/test-impactify-bid-request.json @@ -7,9 +7,10 @@ "w": 320, "h": 250 }, + "bidfloor": 10, "bidfloorcur": "USD", "ext": { - "bidder": { + "impactify": { "appId": "appId", "format": "format", "style": "style" From 08f4b80d2f81bbd96097b27514e75ba1bee5a577 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Thu, 25 Nov 2021 10:19:33 +0200 Subject: [PATCH 28/30] Change logic so makeBids fail on failing get BidType --- .../bidder/impactify/ImpactifyBidder.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index e9bbb15b5a8..bbd997cc75f 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -178,7 +178,7 @@ public Result> makeBids(HttpCall httpCall, BidReques final List errors = new ArrayList<>(); final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); return Result.of(extractBids(bidRequest, bidResponse, errors), errors); - } catch (DecodeException e) { + } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } @@ -192,22 +192,25 @@ private List extractBids(BidRequest bidRequest, BidResponse bidRespon private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, List errors) { - return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .flatMap(Collection::stream) - .map(bid -> resolveBidderBid(bid, bidResponse.getCur(), bidRequest.getImp(), errors)) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + try { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .flatMap(Collection::stream) + .map(bid -> resolveBidderBid(bid, bidResponse.getCur(), bidRequest.getImp())) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } catch (PreBidException e) { + throw e; + } } - private static BidderBid resolveBidderBid(Bid bid, String currency, List imps, List errors) { + private static BidderBid resolveBidderBid(Bid bid, String currency, List imps) { final BidType bidType; try { bidType = getBidType(bid.getImpid(), imps); } catch (PreBidException e) { - errors.add(BidderError.badServerResponse(e.getMessage())); - return null; + throw e; } return BidderBid.of(bid, bidType, currency); } From e25162a6f1b88ce012b2c8aa31d5dacb2da78350 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Fri, 26 Nov 2021 13:05:59 +0200 Subject: [PATCH 29/30] Another bunch of CR fixes --- .../bidder/impactify/ImpactifyBidder.java | 59 ++++++++----------- .../bidder/impactify/ImpactifyBidderTest.java | 8 +-- 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index bbd997cc75f..acbaaf1c82b 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -8,7 +8,6 @@ import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; import com.iab.openrtb.request.User; -import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; import io.vertx.core.MultiMap; @@ -63,7 +62,7 @@ public Result>> makeHttpRequests(BidRequest request for (Imp imp : request.getImp()) { try { - final BigDecimal resolvedBidFloor = resolveBidFloor(request, imp, imp.getBidfloor()); + final BigDecimal resolvedBidFloor = resolveBidFloor(request, imp); updatedImps.add(updateImp(imp, resolvedBidFloor)); } catch (PreBidException e) { return Result.withError(BidderError.badInput(e.getMessage())); @@ -81,9 +80,9 @@ public Result>> makeHttpRequests(BidRequest request .build()); } - private BigDecimal resolveBidFloor(BidRequest request, Imp imp, BigDecimal bidFloor) { - return shouldConvertBidFloor(bidFloor, imp.getBidfloorcur()) - ? convertBidFloorCurrency(bidFloor, request, imp.getId(), imp.getBidfloorcur()) + private BigDecimal resolveBidFloor(BidRequest request, Imp imp) { + return shouldConvertBidFloor(imp.getBidfloor(), imp.getBidfloorcur()) + ? convertBidFloorCurrency(imp.getBidfloor(), request, imp.getId(), imp.getBidfloorcur()) : imp.getBidfloor(); } @@ -91,8 +90,10 @@ private static boolean shouldConvertBidFloor(BigDecimal bidFloor, String bidFloo return BidderUtil.isValidPrice(bidFloor) && !StringUtils.equalsIgnoreCase(bidFloorCur, BIDDER_CURRENCY); } - private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, BidRequest bidRequest, - String impId, String bidFloorCur) { + private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, + BidRequest bidRequest, + String impId, + String bidFloorCur) { try { return currencyConversionService .convertCurrency(bidFloor, bidRequest, bidFloorCur, BIDDER_CURRENCY); @@ -136,7 +137,6 @@ private ObjectNode createImpExtObjectNode(ExtImpImpactify impExt) { } private static BidRequest updateBidRequest(BidRequest request, List updatedImps) { - return request.toBuilder() .imp(updatedImps) .cur(List.of(BIDDER_CURRENCY)) @@ -151,8 +151,10 @@ private static MultiMap constructHeaders(BidRequest bidRequest) { final Device device = bidRequest.getDevice(); if (device != null) { HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa()); - if (device.getIp() != null) { - HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp()); + + final String deviceIp = device.getIp(); + if (deviceIp != null) { + HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, deviceIp); } else { HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6()); } @@ -177,42 +179,27 @@ public Result> makeBids(HttpCall httpCall, BidReques try { final List errors = new ArrayList<>(); final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); - return Result.of(extractBids(bidRequest, bidResponse, errors), errors); + return Result.of(extractBids(bidRequest, bidResponse), errors); } catch (DecodeException | PreBidException e) { return Result.withError(BidderError.badServerResponse(e.getMessage())); } } - private List extractBids(BidRequest bidRequest, BidResponse bidResponse, List errors) { + private List extractBids(BidRequest bidRequest, BidResponse bidResponse) { if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { return Collections.emptyList(); } - return bidsFromResponse(bidResponse, bidRequest, errors); - } - - private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest, - List errors) { - try { - return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .flatMap(Collection::stream) - .map(bid -> resolveBidderBid(bid, bidResponse.getCur(), bidRequest.getImp())) - .filter(Objects::nonNull) - .collect(Collectors.toList()); - } catch (PreBidException e) { - throw e; - } + return bidsFromResponse(bidResponse, bidRequest); } - private static BidderBid resolveBidderBid(Bid bid, String currency, List imps) { - final BidType bidType; - try { - bidType = getBidType(bid.getImpid(), imps); - } catch (PreBidException e) { - throw e; - } - return BidderBid.of(bid, bidType, currency); + private List bidsFromResponse(BidResponse bidResponse, BidRequest bidRequest) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .flatMap(Collection::stream) + .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur())) + .filter(Objects::nonNull) + .collect(Collectors.toList()); } private static BidType getBidType(String impId, List imps) { diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index 21f1979e667..f0b08aa8828 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -51,9 +51,6 @@ public class ImpactifyBidderTest extends VertxTest { - private static final String TEST_ENDPOINT = "https://test.endpoint.com"; - private static final String INCORRECT_TEST_ENDPOINT = "incorrect.endpoint"; - @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); @@ -64,12 +61,13 @@ public class ImpactifyBidderTest extends VertxTest { @Before public void setUp() { - impactifyBidder = new ImpactifyBidder(TEST_ENDPOINT, jacksonMapper, currencyConversionService); + impactifyBidder = + new ImpactifyBidder("https://test.endpoint.com", jacksonMapper, currencyConversionService); } @Test public void createBidderWithWrongEndpointShouldThrowException() { - assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder(INCORRECT_TEST_ENDPOINT, + assertThatIllegalArgumentException().isThrownBy(() -> new ImpactifyBidder("incorrect.endpoint", jacksonMapper, currencyConversionService)); } From 84f2083233dce29aff1dfccb5e27f2b4f1846b39 Mon Sep 17 00:00:00 2001 From: Yevhenii Viktorov Date: Mon, 29 Nov 2021 16:49:48 +0200 Subject: [PATCH 30/30] re-implement how new ext is created for Impactify logic, some CR fixes --- .../bidder/impactify/ImpactifyBidder.java | 28 ++++--------------- .../bidder/impactify/ImpactifyBidderTest.java | 19 +++---------- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java index acbaaf1c82b..95e1a8d9126 100644 --- a/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java +++ b/src/main/java/org/prebid/server/bidder/impactify/ImpactifyBidder.java @@ -1,8 +1,6 @@ package org.prebid.server.bidder.impactify; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; @@ -105,12 +103,11 @@ private BigDecimal convertBidFloorCurrency(BigDecimal bidFloor, } private Imp updateImp(Imp imp, BigDecimal bidFloor) { - final ObjectNode modifiedImpExtBidder = createImpExtObjectNode(parseExtImp(imp)); - return imp.toBuilder() .bidfloorcur(BIDDER_CURRENCY) .bidfloor(bidFloor) - .ext(mapper.mapper().createObjectNode().set("impactify", modifiedImpExtBidder)) + .ext(mapper.mapper().createObjectNode() + .set("impactify", mapper.mapper().valueToTree(parseExtImp(imp)))) .build(); } @@ -124,29 +121,15 @@ private ExtImpImpactify parseExtImp(Imp imp) { } } - private ObjectNode createImpExtObjectNode(ExtImpImpactify impExt) { - final ObjectNode modifiedImpExtBidder = mapper.mapper().createObjectNode(); - - if (impExt != null) { - modifiedImpExtBidder.set("appId", TextNode.valueOf(impExt.getAppId())); - modifiedImpExtBidder.set("format", TextNode.valueOf(impExt.getFormat())); - modifiedImpExtBidder.set("style", TextNode.valueOf(impExt.getStyle())); - } - - return modifiedImpExtBidder; - } - private static BidRequest updateBidRequest(BidRequest request, List updatedImps) { return request.toBuilder() .imp(updatedImps) - .cur(List.of(BIDDER_CURRENCY)) + .cur(Collections.singletonList(BIDDER_CURRENCY)) .build(); } private static MultiMap constructHeaders(BidRequest bidRequest) { - final MultiMap headers = HttpUtil.headers(); - - headers.set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); + final MultiMap headers = HttpUtil.headers().set(HttpUtil.X_OPENRTB_VERSION_HEADER, X_OPENRTB_VERSION); final Device device = bidRequest.getDevice(); if (device != null) { @@ -167,7 +150,7 @@ private static MultiMap constructHeaders(BidRequest bidRequest) { final User user = bidRequest.getUser(); final String userUid = user != null ? user.getBuyeruid() : null; - if (StringUtils.isNotEmpty(userUid)) { + if (StringUtils.isNotBlank(userUid)) { headers.set(HttpUtil.COOKIE_HEADER, "uids=" + userUid); } @@ -198,7 +181,6 @@ private List bidsFromResponse(BidResponse bidResponse, BidRequest bid .map(SeatBid::getBid) .flatMap(Collection::stream) .map(bid -> BidderBid.of(bid, getBidType(bid.getImpid(), bidRequest.getImp()), bidResponse.getCur())) - .filter(Objects::nonNull) .collect(Collectors.toList()); } diff --git a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java index f0b08aa8828..871080fb89b 100644 --- a/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/impactify/ImpactifyBidderTest.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; @@ -38,7 +37,6 @@ import java.math.BigDecimal; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.function.UnaryOperator; import static java.util.function.UnaryOperator.identity; @@ -158,12 +156,14 @@ public void makeHttpRequestsWithValidDataShouldContainCorrectExt() { final Result>> result = impactifyBidder.makeHttpRequests(bidRequest); // then + final ObjectNode expectedExtNode = mapper.createObjectNode() + .set("impactify", mapper.valueToTree(ExtImpImpactify.of("appId", "format", "style"))); assertThat(result.getErrors()).isEmpty(); assertThat(result.getValue()) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .extracting(Imp::getExt) - .containsExactly(createObjectNode()); + .containsExactly(expectedExtNode); } @Test @@ -307,7 +307,6 @@ public void makeBidsShouldReturnValidBidResponseWithVideo() throws JsonProcessin .containsOnly(Bid.builder() .impid("123") .build()); - assertThat(result.getValue()) .extracting(BidderBid::getType) .containsExactly(BidType.video); @@ -351,7 +350,7 @@ private static Device givenDevice(UnaryOperator deviceCust return deviceCustomizer.apply(Device.builder()).build(); } - private static Imp givenImp(Function impCustomizer) { + private static Imp givenImp(UnaryOperator impCustomizer) { return impCustomizer.apply(Imp.builder() .id("123") .ext(mapper.valueToTree(ExtPrebid.of(null, @@ -373,14 +372,4 @@ private static HttpCall givenHttpCall(BidRequest bidRequest, String HttpResponse.of(200, null, body), null); } - - private static ObjectNode createObjectNode() { - final ObjectNode modifiedImpExtBidder = mapper.createObjectNode(); - - modifiedImpExtBidder.set("appId", TextNode.valueOf("appId")); - modifiedImpExtBidder.set("format", TextNode.valueOf("format")); - modifiedImpExtBidder.set("style", TextNode.valueOf("style")); - - return mapper.createObjectNode().set("impactify", modifiedImpExtBidder); - } }