From aa7a4e82251dff1dee7b09de668b972c92eb14dd Mon Sep 17 00:00:00 2001 From: antonbabak Date: Tue, 17 Jun 2025 10:36:22 +0200 Subject: [PATCH 1/3] New BidTheatre Adapter --- .../bidder/bidtheatre/BidTheatreBidder.java | 114 +++++++++ .../request/bidtheatre/ExtImpBidTheatre.java | 12 + .../bidder/BidTheatreConfiguration.java | 41 +++ .../resources/bidder-config/bidtheatre.yaml | 14 ++ .../static/bidder-params/bidtheatre.json | 16 ++ .../bidtheatre/BidTheatreBidderTest.java | 238 ++++++++++++++++++ .../org/prebid/server/it/BidTheatreTest.java | 37 +++ .../test-auction-bidtheatre-request.json | 23 ++ .../test-auction-bidtheatre-response.json | 39 +++ .../test-bidtheatre-bid-request.json | 56 +++++ .../test-bidtheatre-bid-response.json | 22 ++ .../server/it/test-application.properties | 2 + 12 files changed, 614 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/bidtheatre/ExtImpBidTheatre.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java create mode 100644 src/main/resources/bidder-config/bidtheatre.yaml create mode 100644 src/main/resources/static/bidder-params/bidtheatre.json create mode 100644 src/test/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidderTest.java create mode 100644 src/test/java/org/prebid/server/it/BidTheatreTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-response.json diff --git a/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java new file mode 100644 index 00000000000..0600e86a761 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java @@ -0,0 +1,114 @@ +package org.prebid.server.bidder.bidtheatre; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +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.Result; +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.response.BidType; +import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; +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.Optional; + +public class BidTheatreBidder implements Bidder { + + private static final TypeReference> EXT_PREBID_TYPE_REFERENCE = + new TypeReference<>() { + }; + + private static final String PRICE_MACRO = "${AUCTION_PRICE}"; + + private final String endpointUrl; + private final JacksonMapper mapper; + + public BidTheatreBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + } + + @Override + public Result>> makeHttpRequests(BidRequest request) { + return Result.withValue(BidderUtil.defaultRequest(request, endpointUrl, mapper)); + } + + @Override + public Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + final List errors = new ArrayList<>(); + return Result.of(extractBids(bidResponse, errors), errors); + } catch (DecodeException | PreBidException e) { + return Result.withError(BidderError.badServerResponse(e.getMessage())); + } + } + + private List extractBids(BidResponse bidResponse, List errors) { + if (bidResponse == null || bidResponse.getSeatbid() == null) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse, errors); + } + + private List bidsFromResponse(BidResponse bidResponse, List errors) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .map(bid -> makeBid(bid, bidResponse.getCur(), errors)) + .filter(Objects::nonNull) + .toList(); + } + + private BidderBid makeBid(Bid bid, String currency, List errors) { + final BidType mediaType = getMediaType(bid, errors); + + if (mediaType == null) { + return null; + } + + final BigDecimal price = bid.getPrice(); + final String priceAsString = price != null ? price.toPlainString() : "0"; + + final Bid modifiedBid = bid.toBuilder() + .nurl(StringUtils.replace(bid.getNurl(), PRICE_MACRO, priceAsString)) + .adm(StringUtils.replace(bid.getAdm(), PRICE_MACRO, priceAsString)) + .build(); + + return BidderBid.of(modifiedBid, mediaType, currency); + } + + private BidType getMediaType(Bid bid, List errors) { + try { + return Optional.ofNullable(bid.getExt()) + .map(ext -> mapper.mapper().convertValue(ext, EXT_PREBID_TYPE_REFERENCE)) + .map(ExtPrebid::getPrebid) + .map(ExtBidPrebid::getType) + .orElseThrow(IllegalArgumentException::new); + } catch (IllegalArgumentException e) { + errors.add(BidderError.badServerResponse("Failed to parse impression \"%s\" mediatype" + .formatted(bid.getImpid()))); + return null; + } + } +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidtheatre/ExtImpBidTheatre.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidtheatre/ExtImpBidTheatre.java new file mode 100644 index 00000000000..3eb1696f672 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/bidtheatre/ExtImpBidTheatre.java @@ -0,0 +1,12 @@ +package org.prebid.server.proto.openrtb.ext.request.bidtheatre; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Value; + +@Value(staticConstructor = "of") +public class ExtImpBidTheatre { + + @JsonProperty("publisherId") + String publisherId; + +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java new file mode 100644 index 00000000000..2cbf98062df --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java @@ -0,0 +1,41 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.bidtheatre.BidTheatreBidder; +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/bidtheatre.yaml", factory = YamlPropertySourceFactory.class) +public class BidTheatreConfiguration { + + private static final String BIDDER_NAME = "bidtheatre"; + + @Bean("bidtheatreConfigurationProperties") + @ConfigurationProperties("adapters.bidtheatre") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps bidtheatreBidderDeps(BidderConfigurationProperties bidtheatreConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(bidtheatreConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new BidTheatreBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/bidtheatre.yaml b/src/main/resources/bidder-config/bidtheatre.yaml new file mode 100644 index 00000000000..903778e884a --- /dev/null +++ b/src/main/resources/bidder-config/bidtheatre.yaml @@ -0,0 +1,14 @@ +adapters: + bidtheatre: + endpoint: https://prebidjs-bids.bidtheatre.net/prebidjsbid + modifying-vast-xml-allowed: true + meta-info: + maintainer-email: operations@bidtheatre.com + app-media-types: + - banner + - video + site-media-types: + - banner + - video + supported-vendors: + vendor-id: 30 diff --git a/src/main/resources/static/bidder-params/bidtheatre.json b/src/main/resources/static/bidder-params/bidtheatre.json new file mode 100644 index 00000000000..f56899b7ccd --- /dev/null +++ b/src/main/resources/static/bidder-params/bidtheatre.json @@ -0,0 +1,16 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Bidtheatre Adapter Params", + "description": "A schema which validates params accepted by the Bidtheatre adapter", + "type": "object", + "properties": { + "publisherId": { + "type": "string", + "description": "Publisher ID", + "format": "uuid" + } + }, + "required": [ + "publisherId" + ] +} diff --git a/src/test/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidderTest.java b/src/test/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidderTest.java new file mode 100644 index 00000000000..a2ac4062266 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidderTest.java @@ -0,0 +1,238 @@ +package org.prebid.server.bidder.bidtheatre; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.node.ObjectNode; +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.Test; +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.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.bidtheatre.ExtImpBidTheatre; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.proto.openrtb.ext.response.ExtBidPrebid; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import java.util.function.UnaryOperator; + +import static java.util.Collections.singletonList; +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; +import static org.prebid.server.bidder.model.BidderError.Type.bad_server_response; +import static org.prebid.server.util.HttpUtil.ACCEPT_HEADER; +import static org.prebid.server.util.HttpUtil.APPLICATION_JSON_CONTENT_TYPE; +import static org.prebid.server.util.HttpUtil.CONTENT_TYPE_HEADER; +import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE; + +public class BidTheatreBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "https://randomurl.com"; + + private final BidTheatreBidder target = new BidTheatreBidder(ENDPOINT_URL, jacksonMapper); + + @Test + public void shouldFailOnBidderCreation() { + assertThatIllegalArgumentException().isThrownBy(() -> new BidTheatreBidder("invalid_url", jacksonMapper)); + } + + @Test + public void makeHttpRequestsShouldCreateExpectedUrl() { + // given + final BidRequest bidRequest = givenBidRequest(identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly("https://randomurl.com"); + } + + @Test + public void makeHttpRequestsShouldReturnExpectedHeaders() { + // given + final BidRequest bidRequest = givenBidRequest(identity()); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getValue()).hasSize(1).first() + .extracting(HttpRequest::getHeaders) + .satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER)) + .isEqualTo(APPLICATION_JSON_CONTENT_TYPE)) + .satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER)) + .isEqualTo(APPLICATION_JSON_VALUE)); + assertThat(result.getErrors()).isEmpty(); + } + + @Test + public void makeHttpRequestsShouldReturnExpectedBody() { + // given + final BidRequest bidRequest = givenBidRequest(imp -> imp.id("imp1"), imp -> imp.id("imp2")); + + // when + final Result>> results = target.makeHttpRequests(bidRequest); + + // then + assertThat(results.getValue()).hasSize(1) + .extracting(HttpRequest::getBody, HttpRequest::getPayload) + .containsExactly(tuple(jacksonMapper.encodeToBytes(bidRequest), bidRequest)); + assertThat(results.getErrors()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorIfResponseBodyCouldNotBeParsed() { + // given + final BidderCall httpCall = givenHttpCall("invalid"); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(1); + assertThat(result.getErrors().getFirst().getMessage()).startsWith("Failed to decode: Unrecognized token"); + assertThat(result.getErrors().getFirst().getType()).isEqualTo(bad_server_response); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnEmptyListWhenBidResponseSeatBidIsNull() throws JsonProcessingException { + // given + final BidderCall httpCall = givenHttpCall(); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnErrorAndEmptyListWhenBidTypeCanBeResolved() throws JsonProcessingException { + // given + final Bid invalidBid1 = Bid.builder().impid("imp_id1").ext(mapper.createObjectNode().put("prebid", 2)).build(); + final Bid invalidBid2 = Bid.builder().impid("imp_id2").ext(mapper.createObjectNode()).build(); + final BidderCall httpCall = givenHttpCall(invalidBid1, invalidBid2); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).hasSize(2) + .extracting(BidderError::getMessage, BidderError::getType) + .containsExactly( + tuple("Failed to parse impression \"imp_id1\" mediatype", bad_server_response), + tuple("Failed to parse impression \"imp_id2\" mediatype", bad_server_response)); + assertThat(result.getValue()).isEmpty(); + } + + @Test + public void makeBidsShouldReturnBidWithResolvedMacros() throws JsonProcessingException { + // given + final ObjectNode bidExt = mapper.valueToTree(ExtPrebid.of( + ExtBidPrebid.builder().type(BidType.banner).build(), null)); + final Bid givenBid = Bid.builder() + .impid("imp_id") + .price(BigDecimal.valueOf(3.32)) + .nurl("nurl_${AUCTION_PRICE}_nurl") + .adm("adm_${AUCTION_PRICE}_adm") + .ext(bidExt) + .build(); + final BidderCall httpCall = givenHttpCall(givenBid); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1).first() + .satisfies(bid -> { + assertThat(bid.getBidCurrency()).isEqualTo("USD"); + assertThat(bid.getType()).isEqualTo(BidType.banner); + assertThat(bid.getBid().getAdm()).isEqualTo("adm_3.32_adm"); + assertThat(bid.getBid().getNurl()).isEqualTo("nurl_3.32_nurl"); + assertThat(bid.getBid().getPrice()).isEqualTo(BigDecimal.valueOf(3.32)); + }); + } + + @Test + public void makeBidsShouldReturnBidWithResolvedMacrosWhenPriceIsEmpty() throws JsonProcessingException { + // given + final ObjectNode bidExt = mapper.valueToTree(ExtPrebid.of( + ExtBidPrebid.builder().type(BidType.banner).build(), null)); + final Bid givenBid = Bid.builder() + .impid("imp_id") + .price(null) + .nurl("nurl_${AUCTION_PRICE}_nurl") + .adm("adm_${AUCTION_PRICE}_adm") + .ext(bidExt) + .build(); + final BidderCall httpCall = givenHttpCall(givenBid); + + // when + final Result> result = target.makeBids(httpCall, null); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1).first() + .satisfies(bid -> { + assertThat(bid.getBidCurrency()).isEqualTo("USD"); + assertThat(bid.getType()).isEqualTo(BidType.banner); + assertThat(bid.getBid().getAdm()).isEqualTo("adm_0_adm"); + assertThat(bid.getBid().getNurl()).isEqualTo("nurl_0_nurl"); + assertThat(bid.getBid().getPrice()).isNull(); + }); + } + + private static BidRequest givenBidRequest(UnaryOperator... impCustomizers) { + return BidRequest.builder() + .imp(Arrays.stream(impCustomizers).map(BidTheatreBidderTest::givenImp).toList()) + .build(); + } + + private static Imp givenImp(UnaryOperator impCustomizer) { + return impCustomizer.apply(Imp.builder().id("imp_id").ext(givenImpExt())).build(); + } + + private static ObjectNode givenImpExt() { + return mapper.valueToTree(ExtPrebid.of(null, ExtImpBidTheatre.of("publisherId"))); + } + + private static String givenBidResponse(Bid... bids) throws JsonProcessingException { + return mapper.writeValueAsString(BidResponse.builder() + .cur("USD") + .seatbid(singletonList(SeatBid.builder().bid(List.of(bids)).build())) + .build()); + } + + private static BidderCall givenHttpCall(Bid... bids) throws JsonProcessingException { + return BidderCall.succeededHttp( + HttpRequest.builder().payload(null).build(), + HttpResponse.of(200, null, givenBidResponse(bids)), + null); + } + + private static BidderCall givenHttpCall(String body) { + return BidderCall.succeededHttp( + HttpRequest.builder().payload(null).build(), + HttpResponse.of(200, null, body), + null); + } + +} diff --git a/src/test/java/org/prebid/server/it/BidTheatreTest.java b/src/test/java/org/prebid/server/it/BidTheatreTest.java new file mode 100644 index 00000000000..419dcf71cda --- /dev/null +++ b/src/test/java/org/prebid/server/it/BidTheatreTest.java @@ -0,0 +1,37 @@ +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 BidTheatreTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromAso() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/bidtheatre-exchange")) + .withRequestBody(equalToJson( + jsonFrom("openrtb2/bidtheatre/test-bidtheatre-bid-request.json"))) + .willReturn(aResponse().withBody( + jsonFrom("openrtb2/bidtheatre/test-bidtheatre-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/bidtheatre/test-auction-bidtheatre-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals( + "openrtb2/bidtheatre/test-auction-bidtheatre-response.json", + response, + singletonList("bidtheatre")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-request.json b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-request.json new file mode 100644 index 00000000000..fc53d5f98b9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-request.json @@ -0,0 +1,23 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "bidtheatre": { + "publisherId" : "73b20b3a-12a0-4869-b54e-8d42b55786ee" + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-response.json new file mode 100644 index 00000000000..ebfbdc67de5 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-auction-bidtheatre-response.json @@ -0,0 +1,39 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 4.7, + "adm": "adm6_4.7", + "nurl": "nurl_4.7", + "crid": "crid6", + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "bidtheatre" + } + }, + "origbidcpm": 4.7 + } + } + ], + "seat": "bidtheatre", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "bidtheatre": "{{ bidtheatre.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-request.json new file mode 100644 index 00000000000..0b80c8070f0 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-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" : { + "publisherId" : "73b20b3a-12a0-4869-b54e-8d42b55786ee" + } + } + } + ], + "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/bidtheatre/test-bidtheatre-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-response.json new file mode 100644 index 00000000000..665be9472f4 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/bidtheatre/test-bidtheatre-bid-response.json @@ -0,0 +1,22 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 4.7, + "adm": "adm6_${AUCTION_PRICE}", + "nurl": "nurl_${AUCTION_PRICE}", + "crid": "crid6", + "ext": { + "prebid": { + "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 717b0c09445..ade994da72c 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -150,6 +150,8 @@ adapters.bidscube.enabled=true adapters.bidscube.endpoint=http://localhost:8090/bidscube-exchange adapters.bidstack.enabled=true adapters.bidstack.endpoint=http://localhost:8090/bidstack-exchange +adapters.bidtheatre.enabled=true +adapters.bidtheatre.endpoint=http://localhost:8090/bidtheatre-exchange adapters.bigoad.enabled=true adapters.bigoad.endpoint=http://localhost:8090/bigoad-exchange adapters.blasto.enabled=true From 34c300c9ea0e2b548b4f3b63af54c7d63d1a33f9 Mon Sep 17 00:00:00 2001 From: antonbabak Date: Wed, 9 Jul 2025 14:58:14 +0200 Subject: [PATCH 2/3] Fix comments --- .../bidder/bidtheatre/BidTheatreBidder.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java index 0600e86a761..ccee0c636b3 100644 --- a/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java +++ b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java @@ -75,6 +75,7 @@ private List bidsFromResponse(BidResponse bidResponse, List makeBid(bid, bidResponse.getCur(), errors)) .filter(Objects::nonNull) .toList(); @@ -99,15 +100,21 @@ private BidderBid makeBid(Bid bid, String currency, List errors) { } private BidType getMediaType(Bid bid, List errors) { + return Optional.ofNullable(bid.getExt()) + .map(this::parseBidExt) + .map(ExtPrebid::getPrebid) + .map(ExtBidPrebid::getType) + .orElseGet(() -> { + errors.add(BidderError.badServerResponse("Failed to parse impression \"%s\" mediatype" + .formatted(bid.getImpid()))); + return null; + }); + } + + private ExtPrebid parseBidExt(ObjectNode ext) { try { - return Optional.ofNullable(bid.getExt()) - .map(ext -> mapper.mapper().convertValue(ext, EXT_PREBID_TYPE_REFERENCE)) - .map(ExtPrebid::getPrebid) - .map(ExtBidPrebid::getType) - .orElseThrow(IllegalArgumentException::new); + return mapper.mapper().convertValue(ext, EXT_PREBID_TYPE_REFERENCE); } catch (IllegalArgumentException e) { - errors.add(BidderError.badServerResponse("Failed to parse impression \"%s\" mediatype" - .formatted(bid.getImpid()))); return null; } } From bfd77ce4d6f6af5e6858e9bec30a21ec5b79742e Mon Sep 17 00:00:00 2001 From: antonbabak Date: Wed, 9 Jul 2025 15:42:35 +0200 Subject: [PATCH 3/3] Fix comments --- .../server/bidder/bidtheatre/BidTheatreBidder.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java index ccee0c636b3..1e1fc625175 100644 --- a/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java +++ b/src/main/java/org/prebid/server/bidder/bidtheatre/BidTheatreBidder.java @@ -82,9 +82,10 @@ private List bidsFromResponse(BidResponse bidResponse, List errors) { - final BidType mediaType = getMediaType(bid, errors); - + final BidType mediaType = getMediaType(bid); if (mediaType == null) { + errors.add(BidderError.badServerResponse("Failed to parse impression \"%s\" mediatype" + .formatted(bid.getImpid()))); return null; } @@ -99,16 +100,12 @@ private BidderBid makeBid(Bid bid, String currency, List errors) { return BidderBid.of(modifiedBid, mediaType, currency); } - private BidType getMediaType(Bid bid, List errors) { + private BidType getMediaType(Bid bid) { return Optional.ofNullable(bid.getExt()) .map(this::parseBidExt) .map(ExtPrebid::getPrebid) .map(ExtBidPrebid::getType) - .orElseGet(() -> { - errors.add(BidderError.badServerResponse("Failed to parse impression \"%s\" mediatype" - .formatted(bid.getImpid()))); - return null; - }); + .orElse(null); } private ExtPrebid parseBidExt(ObjectNode ext) {