From 6f8ce0451bfe0ecc76a34cf6619d4e9493e24af1 Mon Sep 17 00:00:00 2001 From: Santiago Garcia Date: Tue, 15 Apr 2025 16:03:56 +0200 Subject: [PATCH 1/4] Implements new Seedtag adapter --- .../server/bidder/seedtag/SeedtagBidder.java | 177 ++++++++++ .../ext/request/seedtag/ExtImpSeedtag.java | 12 + .../config/bidder/SeedtagConfiguration.java | 45 +++ src/main/resources/bidder-config/seedtag.yaml | 17 + .../static/bidder-params/seedtag.json | 16 + .../bidder/seedtag/SeedtagBidderTest.java | 333 ++++++++++++++++++ .../org/prebid/server/it/SeedtagTest.java | 33 ++ .../seedtag/test-auction-seedtag-request.json | 23 ++ .../test-auction-seedtag-response.json | 41 +++ .../seedtag/test-seedtag-bid-request.json | 56 +++ .../seedtag/test-seedtag-bid-response.json | 21 ++ .../server/it/test-application.properties | 3 + 12 files changed, 777 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/seedtag/ExtImpSeedtag.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java create mode 100644 src/main/resources/bidder-config/seedtag.yaml create mode 100644 src/main/resources/static/bidder-params/seedtag.json create mode 100644 src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java create mode 100644 src/test/java/org/prebid/server/it/SeedtagTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-response.json diff --git a/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java b/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java new file mode 100644 index 00000000000..6c86f718aa6 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java @@ -0,0 +1,177 @@ +package org.prebid.server.bidder.seedtag; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +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.BidderCall; +import org.prebid.server.bidder.model.BidderError; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.Price; +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.seedtag.ExtImpSeedtag; +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; + +public class SeedtagBidder implements Bidder { + + private static final TypeReference> SEEDTAG_EXT_TYPE_REFERENCE = + new TypeReference<>() { + }; + private static final String BIDDER_CURRENCY = "USD"; + + private final String endpointUrl; + private final JacksonMapper mapper; + private final CurrencyConversionService currencyConversionService; + + public SeedtagBidder(String endpointUrl, + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { + + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.currencyConversionService = Objects.requireNonNull(currencyConversionService); + this.mapper = Objects.requireNonNull(mapper); + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + + final List modifiedImps = new ArrayList<>(); + final List errors = new ArrayList<>(); + + for (Imp imp : request.getImp()) { + try { + parseImpExt(imp); + final Price bidFloorPrice = resolveBidFloor(imp, request); + + modifiedImps.add(modifyImp(imp, bidFloorPrice)); + } catch (PreBidException e) { + errors.add(BidderError.badInput(e.getMessage())); + } + } + + if (modifiedImps.size() < 1) { + return Result.withErrors(errors); + } + + final BidRequest modifiedBidRequest = request.toBuilder() + .cur(Collections.singletonList(BIDDER_CURRENCY)) + .imp(modifiedImps) + .build(); + + return Result.withValue(HttpRequest.builder() + .method(HttpMethod.POST) + .uri(endpointUrl) + .headers(HttpUtil.headers()) + .payload(modifiedBidRequest) + .body(mapper.encodeToBytes(modifiedBidRequest)) + .impIds(BidderUtil.impIds(modifiedBidRequest)) + .build()); + } + + private static Imp modifyImp(Imp imp, Price bidFloorPrice) { + return imp.toBuilder() + .bidfloorcur(bidFloorPrice.getCurrency()) + .bidfloor(bidFloorPrice.getValue()) + .build(); + } + + private Price resolveBidFloor(Imp imp, BidRequest bidRequest) { + final Price initialBidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor()); + return BidderUtil.isValidPrice(initialBidFloorPrice) + && !StringUtils.equalsIgnoreCase(initialBidFloorPrice.getCurrency(), BIDDER_CURRENCY) + ? convertBidFloor(initialBidFloorPrice, imp.getId(), bidRequest) + : initialBidFloorPrice; + } + + private Price convertBidFloor(Price bidFloorPrice, String impId, BidRequest bidRequest) { + final String bidFloorCur = bidFloorPrice.getCurrency(); + try { + final BigDecimal convertedPrice = currencyConversionService + .convertCurrency(bidFloorPrice.getValue(), bidRequest, bidFloorCur, BIDDER_CURRENCY); + + return Price.of(BIDDER_CURRENCY, convertedPrice); + } catch (PreBidException e) { + throw new PreBidException( + "Unable to convert provided bid floor currency from %s to %s for imp `%s`" + .formatted(bidFloorCur, BIDDER_CURRENCY, impId)); + } + } + + private ExtImpSeedtag parseImpExt(Imp imp) { + try { + return mapper.mapper().convertValue(imp.getExt(), SEEDTAG_EXT_TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException(e.getMessage()); + } + } + + @Override + public final Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + final List errors = new ArrayList<>(); + final List bidderBids = extractBids(bidResponse, errors); + return Result.of(bidderBids, errors); + } catch (DecodeException | PreBidException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private static List extractBids(BidResponse bidResponse, List errors) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> makeBidderBid(bid, errors)) + .filter(Objects::nonNull) + .toList(); + } + + private static BidderBid makeBidderBid(Bid bid, List errors) { + final BidType bidType; + try { + bidType = getBidType(bid); + } catch (PreBidException e) { + errors.add(BidderError.badServerResponse(e.getMessage())); + return null; + } + + return BidderBid.of(bid, bidType, BIDDER_CURRENCY); + } + + private static BidType getBidType(Bid bid) { + return switch (bid.getMtype()) { + case 1 -> BidType.banner; + case 2 -> BidType.video; + default -> throw new PreBidException( + "Invalid bid.mtype for bid.id: '%s'" + .formatted(bid.getId())); + }; + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/seedtag/ExtImpSeedtag.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/seedtag/ExtImpSeedtag.java new file mode 100644 index 00000000000..364b63fb7dc --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/seedtag/ExtImpSeedtag.java @@ -0,0 +1,12 @@ +package org.prebid.server.proto.openrtb.ext.request.seedtag; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Value; + +@Value(staticConstructor = "of") +public class ExtImpSeedtag { + + @JsonProperty("adUnitId") + String adUnitId; + +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java new file mode 100644 index 00000000000..77ba1cfeb7d --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java @@ -0,0 +1,45 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.seedtag.SeedtagBidder; +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 jakarta.validation.constraints.NotBlank; + +@Configuration +@PropertySource(value = "classpath:/bidder-config/seedtag.yaml", factory = YamlPropertySourceFactory.class) +public class SeedtagConfiguration { + + private static final String BIDDER_NAME = "seedtag"; + + @Bean("seedtagConfigurationProperties") + @ConfigurationProperties("adapters.seedtag") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps seedtagBidderDeps(BidderConfigurationProperties seedtagConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(seedtagConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new SeedtagBidder(config.getEndpoint(), + currencyConversionService, + mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/seedtag.yaml b/src/main/resources/bidder-config/seedtag.yaml new file mode 100644 index 00000000000..6012eb5a2de --- /dev/null +++ b/src/main/resources/bidder-config/seedtag.yaml @@ -0,0 +1,17 @@ +adapters: + seedtag: + endpoint: "https://s.seedtag.com/c/openrtb?partner=prebidserver" + endpoint-compression: gzip + meta-info: + maintainer-email: prebid@seedtag.com + site-media-types: + - banner + - video + supported-vendors: + vendor-id: 157 + usersync: + cookie-family-name: seedtag + iframe: + url: https://s.seedtag.com/cs/cookiesync/prebid?gdpr={{gdpr}}&gdpr_consent={{gdpr_consent}}&usp_consent={{us_privacy}}&redirect={{redirect_url}} + support-cors: false + uid-macro: '$UID' diff --git a/src/main/resources/static/bidder-params/seedtag.json b/src/main/resources/static/bidder-params/seedtag.json new file mode 100644 index 00000000000..8d84b059fd0 --- /dev/null +++ b/src/main/resources/static/bidder-params/seedtag.json @@ -0,0 +1,16 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Seedtag Adapter Params", + "description": "A schema which validates params accepted by the Seedtag adapter", + "type": "object", + "properties": { + "adUnitId": { + "type": "string", + "description": "Ad Unit ID", + "minLength": 1 + } + }, + "required": [ + "adUnitId" + ] +} diff --git a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java new file mode 100644 index 00000000000..264466c2cdd --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java @@ -0,0 +1,333 @@ +package org.prebid.server.bidder.seedtag; + +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.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.prebid.server.VertxTest; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderCall; +import org.prebid.server.bidder.model.BidderError; +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.seedtag.ExtImpSeedtag; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import java.util.function.Function; + +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; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.prebid.server.proto.openrtb.ext.response.BidType.banner; +import static org.prebid.server.proto.openrtb.ext.response.BidType.video; + +@ExtendWith(MockitoExtension.class) +public class SeedtagBidderTest extends VertxTest { + + public static final String ENDPOINT_URL = "https://test.endpoint.com"; + + @Mock + private CurrencyConversionService currencyConversionService; + + private SeedtagBidder target; + + @BeforeEach + public void setUp() { + target = new SeedtagBidder(ENDPOINT_URL, currencyConversionService, jacksonMapper); + } + + @Test + public void creationShouldFailOnInvalidEndpointUrl() { + assertThatIllegalArgumentException().isThrownBy(() -> new SeedtagBidder("invalid_url", + currencyConversionService, + jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldMakeOneRequestWithAllImps() { + // given + final BidRequest bidRequest = givenBidRequest( + identity(), + requestBuilder -> requestBuilder.imp(Arrays.asList( + givenImp(identity()), + givenImp(identity())))); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .hasSize(2); + } + + @Test + public void makeHttpRequestsShouldConvertCurrency() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willReturn(BigDecimal.TEN); + + final BidRequest bidRequest = givenBidRequest(imp -> imp + .bidfloor(BigDecimal.TEN) + .bidfloorcur("EUR")); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .extracting(Imp::getBidfloor, Imp::getBidfloorcur) + .containsExactly(tuple(BigDecimal.TEN, "USD")); + } + + @Test + public void makeHttpRequestsShouldMakeOneRequesWithAllCurrencyConvertedImps() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willThrow(PreBidException.class); + + final BidRequest bidRequest = givenBidRequest( + identity(), + requestBuilder -> requestBuilder.imp(Arrays.asList( + givenImp(identity()), + givenImp(impBuilder -> impBuilder + .bidfloor(BigDecimal.TEN) + .bidfloorcur("EUR") + )))); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getPayload) + .flatExtracting(BidRequest::getImp) + .hasSize(1); + } + + @Test + public void makeHttpRequestsShouldReturnErrorMessageOnFailedConvertCurrencyForAllImps() { + // given + given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) + .willThrow(PreBidException.class); + + final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder + .bidfloor(BigDecimal.TEN) + .bidfloorcur("EUR")); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).allSatisfy(bidderError -> { + assertThat(bidderError.getType()) + .isEqualTo(BidderError.Type.bad_input); + assertThat(bidderError.getMessage()) + .isEqualTo("Unable to convert provided bid floor currency from EUR to USD for imp `123`"); + }); + } + + @Test + public void makeHttpRequestsShouldReturnErrorIfImpExtCanNotBeParsed() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(asList(Imp.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build())) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); + assertThat(error.getMessage()).startsWith("Cannot deserialize value"); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldReturnEveryOccurredErrorWithNoValue() { + // given + final BidRequest bidRequest = BidRequest.builder() + .imp(asList(Imp.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build(), + Imp.builder() + .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) + .build())) + .build(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).hasSize(2); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall(null, mapper.writeValueAsString(null)); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall(null, + mapper.writeValueAsString(BidResponse.builder().build())); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { + // given + final BidderCall httpCall = givenHttpCall(null, "invalid"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); + assertThat(error.getMessage()).startsWith("Failed to decode: Unrecognized token"); + }); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnBannerBidIfMediaTypeBanner() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").build())) + .build(), + mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(1)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(Bid.builder().impid("123").mtype(1).build(), banner, "USD")); + } + + @Test + public void makeBidsShouldReturnVideoBidIfMediaTypeVideo() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").build())) + .build(), + mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(2)))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .containsExactly(BidderBid.of(Bid.builder().impid("123").mtype(2).build(), video, "USD")); + } + + @Test + public void makeBidsShouldReturnErrorIfMediaTypeInvalid() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall( + BidRequest.builder() + .imp(singletonList(Imp.builder().id("123").build())) + .build(), + mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(4).id("456")))); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1) + .allSatisfy(error -> { + assertThat(error.getType()).isEqualTo(BidderError.Type.bad_server_response); + assertThat(error.getMessage()).startsWith("Invalid bid.mtype for bid.id: '456'"); + }); + assertThat(result.getValue()).isEmpty(); + } + + private static BidRequest givenBidRequest( + Function impCustomizer, + Function requestCustomizer) { + return requestCustomizer.apply(BidRequest.builder() + .imp(singletonList(givenImp(impCustomizer)))) + .build(); + } + + private static BidRequest givenBidRequest( + Function impCustomizer) { + return givenBidRequest(impCustomizer, identity()); + } + + private static Imp givenImp(Function impCustomizer) { + return impCustomizer.apply(Imp.builder() + .id("123")) + .banner(Banner.builder().build()) + .ext(mapper.valueToTree(ExtPrebid.of(null, + ExtImpSeedtag.of("adUnitId")))) + .build(); + } + + private static BidResponse givenBidResponse(Function bidCustomizer) { + return BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder() + .bid(singletonList(bidCustomizer.apply(Bid.builder()).build())) + .build())) + .build(); + } + + private static BidderCall givenHttpCall(BidRequest bidRequest, String body) { + return BidderCall.succeededHttp(HttpRequest.builder().payload(bidRequest).build(), + HttpResponse.of(200, null, body), null); + } +} diff --git a/src/test/java/org/prebid/server/it/SeedtagTest.java b/src/test/java/org/prebid/server/it/SeedtagTest.java new file mode 100644 index 00000000000..318f2bb506d --- /dev/null +++ b/src/test/java/org/prebid/server/it/SeedtagTest.java @@ -0,0 +1,33 @@ +package org.prebid.server.it; + +import io.restassured.response.Response; +import org.json.JSONException; +import org.junit.jupiter.api.Test; +import org.prebid.server.model.Endpoint; + +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; + +public class SeedtagTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromSeedtag() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/seedtag-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/seedtag/test-seedtag-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/seedtag/test-seedtag-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/seedtag/test-auction-seedtag-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/seedtag/test-auction-seedtag-response.json", response, + singletonList("seedtag")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-request.json b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-request.json new file mode 100644 index 00000000000..410829c8448 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-request.json @@ -0,0 +1,23 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "seedtag": { + "adUnitId": "someAdUnitId" + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json new file mode 100644 index 00000000000..0fdd6612a15 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json @@ -0,0 +1,41 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 3.33, + "adm": "adm001", + "adid": "adid001", + "cid": "cid001", + "crid": "crid001", + "w": 300, + "h": 250, + "mtype": 1, + "ext":{ + "origbidcpm":3.33, + "origbidcur":"USD", + "prebid": { + "type":"banner" + } + } + } + ], + "seat": "seedtag", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "seedtag": "{{ seedtag.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-request.json new file mode 100644 index 00000000000..cd9e1a11235 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-request.json @@ -0,0 +1,56 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "secure": 1, + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "adUnitId": "someAdUnitId" + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "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": "${json-unit.any-number}", + "cur": [ + "USD" + ], + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-response.json new file mode 100644 index 00000000000..1992d34c094 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-seedtag-bid-response.json @@ -0,0 +1,21 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 3.33, + "adid": "adid001", + "crid": "crid001", + "cid": "cid001", + "adm": "adm001", + "h": 250, + "w": 300, + "mtype": 1 + } + ] + } + ] +} 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 bf0af8f2c13..8559134d6fa 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -439,6 +439,9 @@ adapters.seedingAlliance.aliases.suntContent.enabled=true adapters.seedingAlliance.aliases.suntContent.endpoint=http://localhost:8090/suntContent-exchange?ssp={{AccountId}} adapters.seedingAlliance.aliases.finative.enabled=true adapters.seedingAlliance.aliases.finative.endpoint=http://localhost:8090/finative-exchange?ssp={{AccountId}} +adapters.seedtag.enabled=true +adapters.seedtag.endpoint=http://localhost:8090/seedtag-exchange +adapters.seedtag.usersync.url=//seedtag-usersync adapters.smaato.enabled=true adapters.smaato.endpoint=http://localhost:8090/smaato-exchange adapters.smartadserver.enabled=true From 996d96f754fc2f3e0d205de905befc7b2ee8faa0 Mon Sep 17 00:00:00 2001 From: Santiago Garcia Date: Fri, 25 Apr 2025 16:15:50 +0200 Subject: [PATCH 2/4] fixes review comments --- .../server/bidder/seedtag/SeedtagBidder.java | 53 ++----- .../config/bidder/SeedtagConfiguration.java | 9 +- .../bidder/seedtag/SeedtagBidderTest.java | 132 ++++-------------- .../server/it/test-application.properties | 1 - 4 files changed, 44 insertions(+), 151 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java b/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java index 6c86f718aa6..399437fb636 100644 --- a/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java +++ b/src/main/java/org/prebid/server/bidder/seedtag/SeedtagBidder.java @@ -6,9 +6,7 @@ import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import com.iab.openrtb.response.SeatBid; -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.BidderCall; @@ -45,8 +43,8 @@ public class SeedtagBidder implements Bidder { private final CurrencyConversionService currencyConversionService; public SeedtagBidder(String endpointUrl, - CurrencyConversionService currencyConversionService, - JacksonMapper mapper) { + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); this.currencyConversionService = Objects.requireNonNull(currencyConversionService); @@ -55,13 +53,11 @@ public SeedtagBidder(String endpointUrl, @Override public Result>> makeHttpRequests(BidRequest request) { - final List modifiedImps = new ArrayList<>(); final List errors = new ArrayList<>(); for (Imp imp : request.getImp()) { try { - parseImpExt(imp); final Price bidFloorPrice = resolveBidFloor(imp, request); modifiedImps.add(modifyImp(imp, bidFloorPrice)); @@ -75,18 +71,11 @@ public Result>> makeHttpRequests(BidRequest request } final BidRequest modifiedBidRequest = request.toBuilder() - .cur(Collections.singletonList(BIDDER_CURRENCY)) .imp(modifiedImps) .build(); - - return Result.withValue(HttpRequest.builder() - .method(HttpMethod.POST) - .uri(endpointUrl) - .headers(HttpUtil.headers()) - .payload(modifiedBidRequest) - .body(mapper.encodeToBytes(modifiedBidRequest)) - .impIds(BidderUtil.impIds(modifiedBidRequest)) - .build()); + return Result.of( + Collections.singletonList(BidderUtil.defaultRequest(modifiedBidRequest, endpointUrl, mapper)), + errors); } private static Imp modifyImp(Imp imp, Price bidFloorPrice) { @@ -98,32 +87,19 @@ private static Imp modifyImp(Imp imp, Price bidFloorPrice) { private Price resolveBidFloor(Imp imp, BidRequest bidRequest) { final Price initialBidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor()); - return BidderUtil.isValidPrice(initialBidFloorPrice) - && !StringUtils.equalsIgnoreCase(initialBidFloorPrice.getCurrency(), BIDDER_CURRENCY) + return BidderUtil.shouldConvertBidFloor(initialBidFloorPrice, BIDDER_CURRENCY) ? convertBidFloor(initialBidFloorPrice, imp.getId(), bidRequest) : initialBidFloorPrice; } private Price convertBidFloor(Price bidFloorPrice, String impId, BidRequest bidRequest) { - final String bidFloorCur = bidFloorPrice.getCurrency(); - try { - final BigDecimal convertedPrice = currencyConversionService - .convertCurrency(bidFloorPrice.getValue(), bidRequest, bidFloorCur, BIDDER_CURRENCY); - - return Price.of(BIDDER_CURRENCY, convertedPrice); - } catch (PreBidException e) { - throw new PreBidException( - "Unable to convert provided bid floor currency from %s to %s for imp `%s`" - .formatted(bidFloorCur, BIDDER_CURRENCY, impId)); - } - } + final BigDecimal convertedPrice = currencyConversionService.convertCurrency( + bidFloorPrice.getValue(), + bidRequest, + bidFloorPrice.getCurrency(), + BIDDER_CURRENCY); - private ExtImpSeedtag parseImpExt(Imp imp) { - try { - return mapper.mapper().convertValue(imp.getExt(), SEEDTAG_EXT_TYPE_REFERENCE).getBidder(); - } catch (IllegalArgumentException e) { - throw new PreBidException(e.getMessage()); - } + return Price.of(BIDDER_CURRENCY, convertedPrice); } @Override @@ -148,6 +124,7 @@ private static List extractBids(BidResponse bidResponse, List makeBidderBid(bid, errors)) .filter(Objects::nonNull) .toList(); @@ -169,9 +146,7 @@ private static BidType getBidType(Bid bid) { return switch (bid.getMtype()) { case 1 -> BidType.banner; case 2 -> BidType.video; - default -> throw new PreBidException( - "Invalid bid.mtype for bid.id: '%s'" - .formatted(bid.getId())); + default -> throw new PreBidException("Invalid bid.mtype for bid.id: '%s'".formatted(bid.getId())); }; } } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java index 77ba1cfeb7d..08d5c527d62 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java @@ -30,14 +30,15 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps seedtagBidderDeps(BidderConfigurationProperties seedtagConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, - CurrencyConversionService currencyConversionService, - JacksonMapper mapper) { + @NotBlank @Value("${external-url}") String externalUrl, + CurrencyConversionService currencyConversionService, + JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(seedtagConfigurationProperties) .usersyncerCreator(UsersyncerCreator.create(externalUrl)) - .bidderCreator(config -> new SeedtagBidder(config.getEndpoint(), + .bidderCreator(config -> new SeedtagBidder( + config.getEndpoint(), currencyConversionService, mapper)) .assemble(); diff --git a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java index 264466c2cdd..1d539ea79c7 100644 --- a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java @@ -1,7 +1,6 @@ package org.prebid.server.bidder.seedtag; 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.response.Bid; @@ -21,17 +20,14 @@ 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.seedtag.ExtImpSeedtag; import java.math.BigDecimal; -import java.util.Arrays; import java.util.List; -import java.util.function.Function; +import java.util.function.UnaryOperator; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -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; @@ -58,9 +54,11 @@ public void setUp() { @Test public void creationShouldFailOnInvalidEndpointUrl() { - assertThatIllegalArgumentException().isThrownBy(() -> new SeedtagBidder("invalid_url", - currencyConversionService, - jacksonMapper)); + assertThatIllegalArgumentException() + .isThrownBy(() -> new SeedtagBidder( + "invalid_url", + currencyConversionService, + jacksonMapper)); } @Test @@ -68,7 +66,7 @@ public void makeHttpRequestsShouldMakeOneRequestWithAllImps() { // given final BidRequest bidRequest = givenBidRequest( identity(), - requestBuilder -> requestBuilder.imp(Arrays.asList( + requestBuilder -> requestBuilder.imp(asList( givenImp(identity()), givenImp(identity())))); @@ -90,7 +88,7 @@ public void makeHttpRequestsShouldConvertCurrency() { .willReturn(BigDecimal.TEN); final BidRequest bidRequest = givenBidRequest(imp -> imp - .bidfloor(BigDecimal.TEN) + .bidfloor(BigDecimal.TWO) .bidfloorcur("EUR")); // when @@ -106,98 +104,35 @@ public void makeHttpRequestsShouldConvertCurrency() { } @Test - public void makeHttpRequestsShouldMakeOneRequesWithAllCurrencyConvertedImps() { + public void makeHttpRequestsShouldSkipImpsWithCurrencyThatCanNotBeConverted() { // given given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) .willThrow(PreBidException.class); final BidRequest bidRequest = givenBidRequest( identity(), - requestBuilder -> requestBuilder.imp(Arrays.asList( + requestBuilder -> requestBuilder.imp(asList( givenImp(identity()), givenImp(impBuilder -> impBuilder .bidfloor(BigDecimal.TEN) - .bidfloorcur("EUR") - )))); + .bidfloorcur("EUR")) + ))); // when final Result>> result = target.makeHttpRequests(bidRequest); // then - assertThat(result.getErrors()).isEmpty(); + assertThat(result.getErrors()).hasSize(1); assertThat(result.getValue()).hasSize(1) .extracting(HttpRequest::getPayload) .flatExtracting(BidRequest::getImp) .hasSize(1); } - @Test - public void makeHttpRequestsShouldReturnErrorMessageOnFailedConvertCurrencyForAllImps() { - // given - given(currencyConversionService.convertCurrency(any(), any(), anyString(), anyString())) - .willThrow(PreBidException.class); - - final BidRequest bidRequest = givenBidRequest(impBuilder -> impBuilder - .bidfloor(BigDecimal.TEN) - .bidfloorcur("EUR")); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).allSatisfy(bidderError -> { - assertThat(bidderError.getType()) - .isEqualTo(BidderError.Type.bad_input); - assertThat(bidderError.getMessage()) - .isEqualTo("Unable to convert provided bid floor currency from EUR to USD for imp `123`"); - }); - } - - @Test - public void makeHttpRequestsShouldReturnErrorIfImpExtCanNotBeParsed() { - // given - final BidRequest bidRequest = BidRequest.builder() - .imp(asList(Imp.builder() - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build())) - .build(); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).hasSize(1) - .allSatisfy(error -> { - assertThat(error.getType()).isEqualTo(BidderError.Type.bad_input); - assertThat(error.getMessage()).startsWith("Cannot deserialize value"); - }); - assertThat(result.getValue()).isEmpty(); - } - - @Test - public void makeHttpRequestsShouldReturnEveryOccurredErrorWithNoValue() { - // given - final BidRequest bidRequest = BidRequest.builder() - .imp(asList(Imp.builder() - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build(), - Imp.builder() - .ext(mapper.valueToTree(ExtPrebid.of(null, mapper.createArrayNode()))) - .build())) - .build(); - - // when - final Result>> result = target.makeHttpRequests(bidRequest); - - // then - assertThat(result.getErrors()).hasSize(2); - assertThat(result.getValue()).isEmpty(); - } - @Test public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall(null, mapper.writeValueAsString(null)); + final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(null)); // when final Result> result = target.makeBids(httpCall, null); @@ -210,8 +145,7 @@ public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProces @Test public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall(null, - mapper.writeValueAsString(BidResponse.builder().build())); + final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(BidResponse.builder().build())); // when final Result> result = target.makeBids(httpCall, null); @@ -224,7 +158,7 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws Jso @Test public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { // given - final BidderCall httpCall = givenHttpCall(null, "invalid"); + final BidderCall httpCall = givenHttpCall("invalid"); // when final Result> result = target.makeBids(httpCall, null); @@ -242,9 +176,6 @@ public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { public void makeBidsShouldReturnBannerBidIfMediaTypeBanner() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").build())) - .build(), mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(1)))); // when @@ -260,9 +191,6 @@ public void makeBidsShouldReturnBannerBidIfMediaTypeBanner() throws JsonProcessi public void makeBidsShouldReturnVideoBidIfMediaTypeVideo() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").build())) - .build(), mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(2)))); // when @@ -278,9 +206,6 @@ public void makeBidsShouldReturnVideoBidIfMediaTypeVideo() throws JsonProcessing public void makeBidsShouldReturnErrorIfMediaTypeInvalid() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - BidRequest.builder() - .imp(singletonList(Imp.builder().id("123").build())) - .build(), mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(4).id("456")))); // when @@ -296,28 +221,22 @@ public void makeBidsShouldReturnErrorIfMediaTypeInvalid() throws JsonProcessingE } private static BidRequest givenBidRequest( - Function impCustomizer, - Function requestCustomizer) { + UnaryOperator impCustomizer, + UnaryOperator requestCustomizer) { return requestCustomizer.apply(BidRequest.builder() .imp(singletonList(givenImp(impCustomizer)))) .build(); } - private static BidRequest givenBidRequest( - Function impCustomizer) { + private static BidRequest givenBidRequest(UnaryOperator impCustomizer) { return givenBidRequest(impCustomizer, identity()); } - private static Imp givenImp(Function impCustomizer) { - return impCustomizer.apply(Imp.builder() - .id("123")) - .banner(Banner.builder().build()) - .ext(mapper.valueToTree(ExtPrebid.of(null, - ExtImpSeedtag.of("adUnitId")))) - .build(); + private static Imp givenImp(UnaryOperator impCustomizer) { + return impCustomizer.apply(Imp.builder().id("123")).build(); } - private static BidResponse givenBidResponse(Function bidCustomizer) { + private static BidResponse givenBidResponse(UnaryOperator bidCustomizer) { return BidResponse.builder() .cur("USD") .seatbid(singletonList(SeatBid.builder() @@ -326,8 +245,7 @@ private static BidResponse givenBidResponse(Function givenHttpCall(BidRequest bidRequest, String body) { - return BidderCall.succeededHttp(HttpRequest.builder().payload(bidRequest).build(), - HttpResponse.of(200, null, body), null); + private static BidderCall givenHttpCall(String responseBody) { + return BidderCall.succeededHttp(null, HttpResponse.of(200, null, responseBody), null); } } 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 8559134d6fa..a88d3f10216 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -441,7 +441,6 @@ adapters.seedingAlliance.aliases.finative.enabled=true adapters.seedingAlliance.aliases.finative.endpoint=http://localhost:8090/finative-exchange?ssp={{AccountId}} adapters.seedtag.enabled=true adapters.seedtag.endpoint=http://localhost:8090/seedtag-exchange -adapters.seedtag.usersync.url=//seedtag-usersync adapters.smaato.enabled=true adapters.smaato.endpoint=http://localhost:8090/smaato-exchange adapters.smartadserver.enabled=true From 74f6a250ae4856db328ac6e899bf645dc2cc0da9 Mon Sep 17 00:00:00 2001 From: Santiago Garcia Date: Tue, 13 May 2025 10:23:08 +0200 Subject: [PATCH 3/4] hides mapper into givenHttpCall and fixes integration test --- .../server/bidder/seedtag/SeedtagBidderTest.java | 15 +++++++++++---- .../seedtag/test-auction-seedtag-response.json | 5 ++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java index 1d539ea79c7..e6b1bdcdffd 100644 --- a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java @@ -145,7 +145,7 @@ public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProces @Test public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws JsonProcessingException { // given - final BidderCall httpCall = givenHttpCall(mapper.writeValueAsString(BidResponse.builder().build())); + final BidderCall httpCall = givenHttpCall(BidResponse.builder().build()); // when final Result> result = target.makeBids(httpCall, null); @@ -176,7 +176,7 @@ public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { public void makeBidsShouldReturnBannerBidIfMediaTypeBanner() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(1)))); + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(1))); // when final Result> result = target.makeBids(httpCall, null); @@ -191,7 +191,7 @@ public void makeBidsShouldReturnBannerBidIfMediaTypeBanner() throws JsonProcessi public void makeBidsShouldReturnVideoBidIfMediaTypeVideo() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(2)))); + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(2))); // when final Result> result = target.makeBids(httpCall, null); @@ -206,7 +206,7 @@ public void makeBidsShouldReturnVideoBidIfMediaTypeVideo() throws JsonProcessing public void makeBidsShouldReturnErrorIfMediaTypeInvalid() throws JsonProcessingException { // given final BidderCall httpCall = givenHttpCall( - mapper.writeValueAsString(givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(4).id("456")))); + givenBidResponse(bidBuilder -> bidBuilder.impid("123").mtype(4).id("456"))); // when final Result> result = target.makeBids(httpCall, null); @@ -248,4 +248,11 @@ private static BidResponse givenBidResponse(UnaryOperator bidCus private static BidderCall givenHttpCall(String responseBody) { return BidderCall.succeededHttp(null, HttpResponse.of(200, null, responseBody), null); } + + private static BidderCall givenHttpCall(BidResponse bidResponse) throws JsonProcessingException { + return BidderCall.succeededHttp( + null, + HttpResponse.of(200, null, mapper.writeValueAsString(bidResponse)), + null); + } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json index 0fdd6612a15..d95fbe5ae64 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/seedtag/test-auction-seedtag-response.json @@ -19,7 +19,10 @@ "origbidcpm":3.33, "origbidcur":"USD", "prebid": { - "type":"banner" + "type":"banner", + "meta": { + "adaptercode": "seedtag" + } } } } From 76ea78d6564774257123675a1e74c3c3485158fb Mon Sep 17 00:00:00 2001 From: Santiago Garcia Date: Fri, 16 May 2025 09:17:14 +0200 Subject: [PATCH 4/4] fixes extra new line --- .../org/prebid/server/bidder/seedtag/SeedtagBidderTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java index e6b1bdcdffd..722ea6be2a6 100644 --- a/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/seedtag/SeedtagBidderTest.java @@ -115,8 +115,7 @@ public void makeHttpRequestsShouldSkipImpsWithCurrencyThatCanNotBeConverted() { givenImp(identity()), givenImp(impBuilder -> impBuilder .bidfloor(BigDecimal.TEN) - .bidfloorcur("EUR")) - ))); + .bidfloorcur("EUR"))))); // when final Result>> result = target.makeHttpRequests(bidRequest);