From 41913ef0a2183a34ed3dadc7c20b0e339a7e967c Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 18 Sep 2025 09:28:25 -0400 Subject: [PATCH 01/16] initial release with code fixes --- .../server/bidder/alvads/AlvadsBidder.java | 216 ++++++++++++++++ .../server/bidder/alvads/ExtBidAlvads.java | 10 + .../bidder/alvads/model/AlvaAdsImp.java | 18 ++ .../bidder/alvads/model/AlvaAdsSite.java | 15 ++ .../alvads/model/AlvadsRequestOrtb.java | 21 ++ .../ext/request/alvads/AlvadsImpExt.java | 14 ++ .../config/bidder/AlvadsConfiguration.java | 41 +++ src/main/resources/bidder-config/alvads.yaml | 14 ++ .../static/bidder-params/alvads.json | 19 ++ .../bidder/alvads/AlvadsBidderTest.java | 233 ++++++++++++++++++ 10 files changed, 601 insertions(+) create mode 100644 src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java create mode 100644 src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java create mode 100644 src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java create mode 100644 src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java create mode 100644 src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java create mode 100644 src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java create mode 100644 src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java create mode 100644 src/main/resources/bidder-config/alvads.yaml create mode 100644 src/main/resources/static/bidder-params/alvads.json create mode 100644 src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java new file mode 100644 index 00000000000..2e4d361c389 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -0,0 +1,216 @@ +package org.prebid.server.bidder.alvads; + +import com.fasterxml.jackson.core.type.TypeReference; +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 io.vertx.core.http.HttpMethod; +import org.apache.commons.collections4.CollectionUtils; +import org.prebid.server.bidder.Bidder; +import org.prebid.server.bidder.alvads.model.AlvaAdsImp; +import org.prebid.server.bidder.alvads.model.AlvaAdsSite; +import org.prebid.server.bidder.alvads.model.AlvadsRequestOrtb; +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.JacksonMapper; +import org.prebid.server.proto.openrtb.ext.ExtPrebid; +import org.prebid.server.proto.openrtb.ext.request.alvads.AlvadsImpExt; +import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.HttpUtil; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + +public class AlvadsBidder implements Bidder { + + private static final TypeReference> + ALVADS_EXT_TYPE_REFERENCE = new TypeReference<>() { }; + + private final String endpointUrl; + private final JacksonMapper mapper; + + public AlvadsBidder(String endpointUrl, JacksonMapper mapper) { + this.endpointUrl = HttpUtil.validateUrlSyntax(Objects.requireNonNull(endpointUrl)); + this.mapper = Objects.requireNonNull(mapper); + } + + @Override + public final Result>> makeHttpRequests(BidRequest bidRequest) { + final List errors = new ArrayList<>(); + final List> httpRequests = new ArrayList<>(); + + for (Imp imp : bidRequest.getImp()) { + try { + final AlvadsImpExt impExt = parseImpExt(imp); + final HttpRequest request = makeHttpRequest(bidRequest, imp, impExt); + httpRequests.add(request); + } catch (PreBidException e) { + errors.add(BidderError.badInput(e.getMessage())); + } + } + + if (httpRequests.isEmpty()) { + errors.add(BidderError.badInput("found no valid impressions")); + return Result.withErrors(errors); + } + + return Result.of(httpRequests, errors); + } + + private HttpRequest makeHttpRequest(BidRequest request, Imp imp, AlvadsImpExt impExt) { + final String resolvedUrl = makeUrl(impExt); + final AlvaAdsImp impObj = makeImp(imp); + final AlvaAdsSite siteObj = makeSite(request, impExt); + final AlvadsRequestOrtb alvadsRequest = AlvadsRequestOrtb.builder() + .id(request.getId()) + .imp(List.of(impObj)) + .device(request.getDevice()) + .user(request.getUser()) + .regs(request.getRegs()) + .site(siteObj) + .build(); + + return HttpRequest.builder() + .method(HttpMethod.POST) + .uri(resolvedUrl) + .headers(HttpUtil.headers()) + .payload(alvadsRequest) + .body(mapper.encodeToBytes(alvadsRequest)) + .impIds(alvadsRequest.getImp().stream().map(AlvaAdsImp::getId).collect(Collectors.toSet())) + .build(); + } + + private AlvadsImpExt parseImpExt(Imp imp) { + try { + return mapper.mapper().convertValue(imp.getExt(), ALVADS_EXT_TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException("Missing or invalid bidder ext in impression with id: " + imp.getId()); + } + } + + private String makeUrl(AlvadsImpExt impExt) { + final String resolvedUrl = impExt.getEndpointUrl() != null ? impExt.getEndpointUrl() : endpointUrl; + try { + URI.create(resolvedUrl); + return resolvedUrl; + } catch (IllegalArgumentException e) { + throw new PreBidException("Invalid endpoint URL: " + resolvedUrl, e); + } + } + + private AlvaAdsImp makeImp(Imp imp) { + final Banner banner = imp.getBanner(); + Map bannerMap = null; + if (banner != null) { + bannerMap = new HashMap<>(); + if (banner.getW() != null) { + bannerMap.put("w", banner.getW()); + } + if (banner.getH() != null) { + bannerMap.put("h", banner.getH()); + } + } + + final Video video = imp.getVideo(); + Map videoMap = null; + if (video != null) { + videoMap = new HashMap<>(); + if (video.getW() != null) { + videoMap.put("w", video.getW()); + } + if (video.getH() != null) { + videoMap.put("h", video.getH()); + } + } + + return AlvaAdsImp.builder() + .id(imp.getId()) + .tagid(imp.getTagid()) + .bidfloor(imp.getBidfloor()) + .banner(bannerMap) + .video(videoMap) + .build(); + } + + private AlvaAdsSite makeSite(BidRequest request, AlvadsImpExt impExt) { + final String page = request.getSite() != null ? request.getSite().getPage() : null; + return AlvaAdsSite.builder() + .page(page) + .ref(page) + .publisher(Map.of("id", impExt.getPublisherUniqueId())) + .build(); + } + + @Override + public final Result> makeBids(BidderCall httpCall, BidRequest bidRequest) { + try { + final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); + return Result.withValues(extractBids(bidResponse, httpCall.getRequest().getPayload())); + } catch (org.prebid.server.json.DecodeException e) { + return Result.withError(BidderError.badServerResponse("Failed to decode BidResponse: " + e.getMessage())); + } + } + + private List extractBids(BidResponse bidResponse, AlvadsRequestOrtb request) { + if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) { + return Collections.emptyList(); + } + return bidsFromResponse(bidResponse, request); + } + + private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestOrtb request) { + return bidResponse.getSeatbid().stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .filter(Objects::nonNull) + .map(bid -> { + final AlvaAdsImp imp = request.getImp().stream() + .filter(i -> i.getId().equals(bid.getImpid())) + .findFirst() + .orElse(null); + + return BidderBid.of(bid, getBidType(bid, imp), bidResponse.getCur()); + }) + .filter(Objects::nonNull) + .toList(); + } + + private BidType getBidType(Bid bid, AlvaAdsImp imp) { + if (imp != null && imp.getVideo() != null) { + return BidType.video; + } + + final ExtBidAlvads bidExt = getBidExt(bid); + if (bidExt == null) { + return BidType.banner; + } + + final BidType crtype = bidExt.getCrtype(); + return crtype != null ? crtype : BidType.banner; + } + + private ExtBidAlvads getBidExt(Bid bid) { + try { + return mapper.mapper().convertValue(bid.getExt(), ExtBidAlvads.class); + } catch (IllegalArgumentException e) { + return null; + } + } +} diff --git a/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java new file mode 100644 index 00000000000..1ec981ac8d7 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java @@ -0,0 +1,10 @@ +package org.prebid.server.bidder.alvads; + +import lombok.Data; +import org.prebid.server.proto.openrtb.ext.response.BidType; + +@Data +public class ExtBidAlvads { + + private BidType crtype; +} diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java new file mode 100644 index 00000000000..acf83bb514b --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java @@ -0,0 +1,18 @@ +package org.prebid.server.bidder.alvads.model; + +import lombok.Builder; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Map; + +@Data +@Builder +public class AlvaAdsImp { + + private String id; + private Map banner; + private Map video; + private String tagid; + private BigDecimal bidfloor; +} diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java new file mode 100644 index 00000000000..c5f7a855514 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java @@ -0,0 +1,15 @@ +package org.prebid.server.bidder.alvads.model; + +import lombok.Builder; +import lombok.Data; + +import java.util.Map; + +@Data +@Builder +public class AlvaAdsSite { + + private String page; + private String ref; + private Map publisher; +} diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java new file mode 100644 index 00000000000..6ae61deea81 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java @@ -0,0 +1,21 @@ +package org.prebid.server.bidder.alvads.model; + +import com.iab.openrtb.request.Device; +import com.iab.openrtb.request.Regs; +import com.iab.openrtb.request.User; +import lombok.Builder; +import lombok.Data; + +import java.util.List; + +@Data +@Builder(toBuilder = true) +public class AlvadsRequestOrtb { + + private String id; + private List imp; + private Device device; + private User user; + private Regs regs; + private AlvaAdsSite site; +} diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java new file mode 100644 index 00000000000..da6f24062f2 --- /dev/null +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java @@ -0,0 +1,14 @@ +package org.prebid.server.proto.openrtb.ext.request.alvads; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Value; + +@Value(staticConstructor = "of") +public class AlvadsImpExt { + + @JsonProperty("publisherUniqueId") + String publisherUniqueId; + + @JsonProperty("endPointUrl") + String endpointUrl; +} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java new file mode 100644 index 00000000000..c30b1379a55 --- /dev/null +++ b/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java @@ -0,0 +1,41 @@ +package org.prebid.server.spring.config.bidder; + +import org.prebid.server.bidder.BidderDeps; +import org.prebid.server.bidder.alvads.AlvadsBidder; +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/alvads.yaml", factory = YamlPropertySourceFactory.class) +public class AlvadsConfiguration { + + private static final String BIDDER_NAME = "alvads"; + + @Bean("alvadsConfigurationProperties") + @ConfigurationProperties("adapters.alvads") + BidderConfigurationProperties configurationProperties() { + return new BidderConfigurationProperties(); + } + + @Bean + BidderDeps alvadsBidderDeps(BidderConfigurationProperties alvadsConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { + + return BidderDepsAssembler.forBidder(BIDDER_NAME) + .withConfig(alvadsConfigurationProperties) + .usersyncerCreator(UsersyncerCreator.create(externalUrl)) + .bidderCreator(config -> new AlvadsBidder(config.getEndpoint(), mapper)) + .assemble(); + } +} diff --git a/src/main/resources/bidder-config/alvads.yaml b/src/main/resources/bidder-config/alvads.yaml new file mode 100644 index 00000000000..2fddd965a67 --- /dev/null +++ b/src/main/resources/bidder-config/alvads.yaml @@ -0,0 +1,14 @@ +adapters: + alvads: + endpoint: https://helios-ads-qa-core.ssidevops.com/decision/openrtb + meta-info: + maintainer-email: alvads@oyealva.com + app-media-types: + - banner + - video + site-media-types: + - banner + - video + supported-vendors: + vendor-id: 0 + diff --git a/src/main/resources/static/bidder-params/alvads.json b/src/main/resources/static/bidder-params/alvads.json new file mode 100644 index 00000000000..ae822c18ae5 --- /dev/null +++ b/src/main/resources/static/bidder-params/alvads.json @@ -0,0 +1,19 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "Alvads Adapter Params", + "description": "A schema which validates params accepted by the Alvads adapter", + "type": "object", + + "properties": { + "publisherUniqueId": { + "type": "string", + "description": "Publisher Unique Id" + }, + "endPointUrl": { + "type": "string", + "description": "Url ads openrtb" + } + }, + + "required": ["publisherUniqueId"] +} diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java new file mode 100644 index 00000000000..8ffaa43faba --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -0,0 +1,233 @@ +package org.prebid.server.bidder.alvads; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.iab.openrtb.request.Banner; +import com.iab.openrtb.request.BidRequest; +import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; +import com.iab.openrtb.response.Bid; +import com.iab.openrtb.response.BidResponse; +import com.iab.openrtb.response.SeatBid; +import io.vertx.core.MultiMap; +import org.junit.jupiter.api.Test; +import org.prebid.server.VertxTest; +import org.prebid.server.bidder.alvads.model.AlvaAdsImp; +import org.prebid.server.bidder.alvads.model.AlvadsRequestOrtb; +import org.prebid.server.bidder.model.BidderBid; +import org.prebid.server.bidder.model.BidderCall; +import org.prebid.server.bidder.model.HttpRequest; +import org.prebid.server.bidder.model.HttpResponse; +import org.prebid.server.bidder.model.Result; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +class AlvadsBidderTest extends VertxTest { + + private static final String ENDPOINT_URL = "https://helios-ads-qa-core.ssidevops.com/decision/openrtb"; + + private final AlvadsBidder target = new AlvadsBidder(ENDPOINT_URL, jacksonMapper); + + @Test + void creationShouldFailOnInvalidEndpointUrl() { + assertThatIllegalArgumentException() + .isThrownBy(() -> new AlvadsBidder("invalid_url", jacksonMapper)); + } + + @Test + void makeHttpRequestsShouldReturnErrorForInvalidImpExt() { + + final ObjectNode extNode = new ObjectMapper().createObjectNode(); + extNode.put("bidder", "invalid"); + + final BidRequest bidRequest = BidRequest.builder() + .imp(List.of(Imp.builder().id("1").ext(extNode).build())) + .build(); + + final Result>> result = target.makeHttpRequests(bidRequest); + + assertThat(result.getErrors()).isNotEmpty(); + assertThat(result.getErrors().get(0).getMessage()) + .contains("Missing or invalid bidder ext"); + } + + @Test + void makeHttpRequestsShouldBuildValidHttpRequests() { + final ObjectMapper mapper = new ObjectMapper(); + + final ObjectNode bidderNode1 = mapper.createObjectNode(); + bidderNode1.put("publisherUniqueId", "pub-1"); + bidderNode1.put("endPointUrl", ENDPOINT_URL); + + final ObjectNode impExtNode1 = mapper.createObjectNode(); + impExtNode1.set("bidder", bidderNode1); + + final ObjectNode bidderNode2 = mapper.createObjectNode(); + bidderNode2.put("publisherUniqueId", "pub-2"); + bidderNode2.put("endPointUrl", ENDPOINT_URL); + + final ObjectNode impExtNode2 = mapper.createObjectNode(); + impExtNode2.set("bidder", bidderNode2); + + final Imp imp1 = Imp.builder() + .id("imp-1") + .banner(Banner.builder().w(300).h(250).build()) + .ext(impExtNode1) + .build(); + + final Imp imp2 = Imp.builder() + .id("imp-2") + .video(com.iab.openrtb.request.Video.builder().w(640).h(480).build()) + .ext(impExtNode2) + .build(); + + final Site site = Site.builder() + .page("https://example.com") + .build(); + + final BidRequest bidRequest = BidRequest.builder() + .id("req-123") + .imp(List.of(imp1, imp2)) + .site(site) + .device(com.iab.openrtb.request.Device.builder().build()) + .build(); + + final Result>> result = target.makeHttpRequests(bidRequest); + + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(2); + + final HttpRequest request1 = result.getValue().get(0); + final HttpRequest request2 = result.getValue().get(1); + + assertThat(request1.getUri()).isEqualTo(ENDPOINT_URL); + assertThat(request2.getUri()).isEqualTo(ENDPOINT_URL); + + assertThat(request1.getHeaders()).isNotEmpty(); + assertThat(request2.getHeaders()).isNotEmpty(); + + assertThat(request1.getImpIds()).contains("imp-1"); + assertThat(request2.getImpIds()).contains("imp-2"); + + assertThat(request1.getPayload().getImp().get(0).getBanner()).isNotNull(); + assertThat(request1.getPayload().getImp().get(0).getVideo()).isNull(); + + assertThat(request2.getPayload().getImp().get(0).getVideo()).isNotNull(); + assertThat(request2.getPayload().getImp().get(0).getBanner()).isNull(); + + assertThat(request1.getPayload().getId()).isEqualTo("req-123"); + assertThat(request2.getPayload().getId()).isEqualTo("req-123"); + } + + @Test + void makeBidsShouldReturnEmptyListForEmptyResponse() { + final BidResponse bidResponse = BidResponse.builder().build(); + final HttpResponse response = HttpResponse.of( + 200, + MultiMap.caseInsensitiveMultiMap(), + jacksonMapper.encodeToString(bidResponse) + ); + + final BidderCall call = BidderCall.succeededHttp( + HttpRequest.builder().payload(null).build(), + response, + null + ); + + final Result> result = target.makeBids(call, BidRequest.builder().build()); + + assertThat(result.getValue()).isEmpty(); + } + + @Test + void makeBidsShouldReturnBidderBids() { + // GIVEN + final String impId = "AE_AD_1748977459403"; + final String publisherId = "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F"; + + final Bid bid = createBid("bid1", impId, 1); + final SeatBid seatBid = createSeatBid(bid); + final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); + + final HttpResponse response = HttpResponse.of( + 200, + MultiMap.caseInsensitiveMultiMap(), + jacksonMapper.encodeToString(bidResponse) + ); + + final Imp imp = createImp(impId, publisherId, 320, 100); + final BidRequest bidRequest = createBidRequest(List.of(imp)); + + final AlvadsRequestOrtb alvadsRequest = createAlvadsRequest(impId, 320, 100); + final HttpRequest httpRequest = HttpRequest.builder() + .payload(alvadsRequest) + .build(); + + final BidderCall call = BidderCall.succeededHttp(httpRequest, response, null); + + // WHEN + final Result> result = target.makeBids(call, bidRequest); + + // THEN + assertThat(result.getValue()).hasSize(1); + assertThat(result.getValue().get(0).getBid().getId()).isEqualTo("bid1"); + } + + private static Bid createBid(String id, String impId, double price) { + return Bid.builder() + .id(id) + .impid(impId) + .price(BigDecimal.valueOf(price)) + .build(); + } + + private static SeatBid createSeatBid(Bid... bids) { + return SeatBid.builder() + .bid(Arrays.asList(bids)) + .build(); + } + + private static BidResponse createBidResponse(List seatBids, String currency) { + return BidResponse.builder() + .seatbid(seatBids) + .cur(currency) + .build(); + } + + private static Imp createImp(String id, String publisherId, int width, int height) { + final ObjectNode extNode = new ObjectMapper().createObjectNode() + .putObject("bidder") + .put("publisherUniqueId", publisherId); + + return Imp.builder() + .id(id) + .banner(Banner.builder().w(width).h(height).build()) + .ext(extNode) + .build(); + } + + private static BidRequest createBidRequest(List imps) { + return BidRequest.builder() + .id("req-123") + .imp(imps) + .build(); + } + + private static AlvadsRequestOrtb createAlvadsRequest(String impId, int width, int height) { + final AlvaAdsImp alvaImp = AlvaAdsImp.builder() + .id(impId) + .banner(Map.of("w", width, "h", height)) + .build(); + + return AlvadsRequestOrtb.builder() + .imp(List.of(alvaImp)) + .build(); + } + +} From c395bcb7deacad3536884b57e2ad0db65ced22ca Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 25 Sep 2025 09:06:15 -0400 Subject: [PATCH 02/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 60 +++++++++---------- .../config/bidder/AlvadsConfiguration.java | 7 ++- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 2e4d361c389..72c64623c7f 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -4,6 +4,7 @@ import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Site; import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; @@ -20,6 +21,7 @@ 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.request.alvads.AlvadsImpExt; @@ -37,7 +39,6 @@ import java.util.stream.Collectors; public class AlvadsBidder implements Bidder { - private static final TypeReference> ALVADS_EXT_TYPE_REFERENCE = new TypeReference<>() { }; @@ -64,18 +65,21 @@ public final Result>> makeHttpRequests(BidRe } } - if (httpRequests.isEmpty()) { - errors.add(BidderError.badInput("found no valid impressions")); - return Result.withErrors(errors); - } + return httpRequests.isEmpty() ? Result.withErrors(errors) : Result.of(httpRequests, errors); + } - return Result.of(httpRequests, errors); + private AlvadsImpExt parseImpExt(Imp imp) { + try { + return mapper.mapper().convertValue(imp.getExt(), ALVADS_EXT_TYPE_REFERENCE).getBidder(); + } catch (IllegalArgumentException e) { + throw new PreBidException("Missing or invalid bidder ext in impression with id: " + imp.getId()); + } } private HttpRequest makeHttpRequest(BidRequest request, Imp imp, AlvadsImpExt impExt) { final String resolvedUrl = makeUrl(impExt); final AlvaAdsImp impObj = makeImp(imp); - final AlvaAdsSite siteObj = makeSite(request, impExt); + final AlvaAdsSite siteObj = makeSite(request.getSite(), impExt.getPublisherUniqueId()); final AlvadsRequestOrtb alvadsRequest = AlvadsRequestOrtb.builder() .id(request.getId()) .imp(List.of(impObj)) @@ -95,13 +99,6 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp i .build(); } - private AlvadsImpExt parseImpExt(Imp imp) { - try { - return mapper.mapper().convertValue(imp.getExt(), ALVADS_EXT_TYPE_REFERENCE).getBidder(); - } catch (IllegalArgumentException e) { - throw new PreBidException("Missing or invalid bidder ext in impression with id: " + imp.getId()); - } - } private String makeUrl(AlvadsImpExt impExt) { final String resolvedUrl = impExt.getEndpointUrl() != null ? impExt.getEndpointUrl() : endpointUrl; @@ -113,7 +110,7 @@ private String makeUrl(AlvadsImpExt impExt) { } } - private AlvaAdsImp makeImp(Imp imp) { + private static AlvaAdsImp makeImp(Imp imp) { final Banner banner = imp.getBanner(); Map bannerMap = null; if (banner != null) { @@ -147,12 +144,12 @@ private AlvaAdsImp makeImp(Imp imp) { .build(); } - private AlvaAdsSite makeSite(BidRequest request, AlvadsImpExt impExt) { - final String page = request.getSite() != null ? request.getSite().getPage() : null; + private static AlvaAdsSite makeSite(Site site, String publisherUniqueId) { + final String page = site != null ? site.getPage() : null; return AlvaAdsSite.builder() .page(page) .ref(page) - .publisher(Map.of("id", impExt.getPublisherUniqueId())) + .publisher(Map.of("id", publisherUniqueId)) .build(); } @@ -161,7 +158,7 @@ public final Result> makeBids(BidderCall http try { final BidResponse bidResponse = mapper.decodeValue(httpCall.getResponse().getBody(), BidResponse.class); return Result.withValues(extractBids(bidResponse, httpCall.getRequest().getPayload())); - } catch (org.prebid.server.json.DecodeException e) { + } catch (DecodeException e) { return Result.withError(BidderError.badServerResponse("Failed to decode BidResponse: " + e.getMessage())); } } @@ -175,23 +172,20 @@ private List extractBids(BidResponse bidResponse, AlvadsRequestOrtb r private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestOrtb request) { return bidResponse.getSeatbid().stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .filter(Objects::nonNull) - .map(bid -> { - final AlvaAdsImp imp = request.getImp().stream() - .filter(i -> i.getId().equals(bid.getImpid())) - .findFirst() - .orElse(null); - - return BidderBid.of(bid, getBidType(bid, imp), bidResponse.getCur()); - }) - .filter(Objects::nonNull) + .flatMap(seatBid -> seatBid.getBid().stream()) + .map(bid -> makeBid(bid, request, bidResponse.getCur())) .toList(); } + private BidderBid makeBid(Bid bid, AlvadsRequestOrtb request, String currency) { + final AlvaAdsImp imp = request.getImp().stream() + .filter(i -> i.getId().equals(bid.getImpid())) + .findFirst() + .orElse(null); + + return BidderBid.of(bid, getBidType(bid, imp), currency); + } + private BidType getBidType(Bid bid, AlvaAdsImp imp) { if (imp != null && imp.getVideo() != null) { return BidType.video; diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java index c30b1379a55..b345661957c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AlvadsConfiguration.java @@ -28,9 +28,10 @@ BidderConfigurationProperties configurationProperties() { } @Bean - BidderDeps alvadsBidderDeps(BidderConfigurationProperties alvadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, - JacksonMapper mapper) { + BidderDeps alvadsBidderDeps( + BidderConfigurationProperties alvadsConfigurationProperties, + @NotBlank @Value("${external-url}") String externalUrl, + JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(alvadsConfigurationProperties) From b49ced18b485c61f0070d6fb1827948a5b6e7c03 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 25 Sep 2025 10:14:03 -0400 Subject: [PATCH 03/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 3 - .../bidder/alvads/AlvadsBidderTest.java | 185 ++++++++++++------ 2 files changed, 122 insertions(+), 66 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 72c64623c7f..92e127e7389 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -8,7 +8,6 @@ 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.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; import org.prebid.server.bidder.Bidder; @@ -30,7 +29,6 @@ import java.net.URI; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -99,7 +97,6 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp i .build(); } - private String makeUrl(AlvadsImpExt impExt) { final String resolvedUrl = impExt.getEndpointUrl() != null ? impExt.getEndpointUrl() : endpointUrl; try { diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index 8ffaa43faba..aebf45524c8 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; 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.response.Bid; @@ -42,37 +43,109 @@ void creationShouldFailOnInvalidEndpointUrl() { @Test void makeHttpRequestsShouldReturnErrorForInvalidImpExt() { - - final ObjectNode extNode = new ObjectMapper().createObjectNode(); + // given + final ObjectNode extNode = jacksonMapper.mapper().createObjectNode(); extNode.put("bidder", "invalid"); final BidRequest bidRequest = BidRequest.builder() .imp(List.of(Imp.builder().id("1").ext(extNode).build())) .build(); + // when final Result>> result = target.makeHttpRequests(bidRequest); + // then assertThat(result.getErrors()).isNotEmpty(); assertThat(result.getErrors().get(0).getMessage()) .contains("Missing or invalid bidder ext"); } @Test - void makeHttpRequestsShouldBuildValidHttpRequests() { - final ObjectMapper mapper = new ObjectMapper(); + void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { + // given + final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + result.getValue().forEach(req -> assertThat(req.getUri()).isEqualTo(ENDPOINT_URL)); + } + + @Test + void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { + // given + final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + result.getValue().forEach(req -> assertThat(req.getHeaders()).isNotEmpty()); + } + + @Test + void makeHttpRequestsShouldBuildValidHttpRequestsImpIds() { + // given + final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getValue().get(0).getImpIds()).contains("imp-1"); + assertThat(result.getValue().get(1).getImpIds()).contains("imp-2"); + } + + @Test + void makeHttpRequestsShouldBuildValidHttpRequestsImpContent() { + // given + final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + final HttpRequest req1 = result.getValue().get(0); + final HttpRequest req2 = result.getValue().get(1); + + assertThat(req1.getPayload().getImp().get(0).getBanner()).isNotNull(); + assertThat(req1.getPayload().getImp().get(0).getVideo()).isNull(); + + assertThat(req2.getPayload().getImp().get(0).getVideo()).isNotNull(); + assertThat(req2.getPayload().getImp().get(0).getBanner()).isNull(); + } + + @Test + void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { + // given + final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + + // when + final Result>> result = target.makeHttpRequests(bidRequest); + + // then + assertThat(result.getValue().get(0).getPayload().getId()).isEqualTo("req-123"); + assertThat(result.getValue().get(1).getPayload().getId()).isEqualTo("req-123"); - final ObjectNode bidderNode1 = mapper.createObjectNode(); + assertThat(result.getValue().get(0).getPayload().getSite()).isNotNull(); + assertThat(result.getValue().get(1).getPayload().getSite()).isNotNull(); + } + + private static BidRequest createBidRequestWithBannerAndVideo() { + final ObjectNode bidderNode1 = new ObjectMapper().createObjectNode(); bidderNode1.put("publisherUniqueId", "pub-1"); - bidderNode1.put("endPointUrl", ENDPOINT_URL); + bidderNode1.put("endpointUrl", ENDPOINT_URL); - final ObjectNode impExtNode1 = mapper.createObjectNode(); + final ObjectNode impExtNode1 = new ObjectMapper().createObjectNode(); impExtNode1.set("bidder", bidderNode1); - final ObjectNode bidderNode2 = mapper.createObjectNode(); + final ObjectNode bidderNode2 = new ObjectMapper().createObjectNode(); bidderNode2.put("publisherUniqueId", "pub-2"); - bidderNode2.put("endPointUrl", ENDPOINT_URL); + bidderNode2.put("endpointUrl", ENDPOINT_URL); - final ObjectNode impExtNode2 = mapper.createObjectNode(); + final ObjectNode impExtNode2 = new ObjectMapper().createObjectNode(); impExtNode2.set("bidder", bidderNode2); final Imp imp1 = Imp.builder() @@ -87,46 +160,20 @@ void makeHttpRequestsShouldBuildValidHttpRequests() { .ext(impExtNode2) .build(); - final Site site = Site.builder() - .page("https://example.com") - .build(); + final Site site = Site.builder().page("https://example.com").build(); - final BidRequest bidRequest = BidRequest.builder() + return BidRequest.builder() .id("req-123") .imp(List.of(imp1, imp2)) .site(site) - .device(com.iab.openrtb.request.Device.builder().build()) + .device(Device.builder().build()) .build(); - - final Result>> result = target.makeHttpRequests(bidRequest); - - assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()).hasSize(2); - - final HttpRequest request1 = result.getValue().get(0); - final HttpRequest request2 = result.getValue().get(1); - - assertThat(request1.getUri()).isEqualTo(ENDPOINT_URL); - assertThat(request2.getUri()).isEqualTo(ENDPOINT_URL); - - assertThat(request1.getHeaders()).isNotEmpty(); - assertThat(request2.getHeaders()).isNotEmpty(); - - assertThat(request1.getImpIds()).contains("imp-1"); - assertThat(request2.getImpIds()).contains("imp-2"); - - assertThat(request1.getPayload().getImp().get(0).getBanner()).isNotNull(); - assertThat(request1.getPayload().getImp().get(0).getVideo()).isNull(); - - assertThat(request2.getPayload().getImp().get(0).getVideo()).isNotNull(); - assertThat(request2.getPayload().getImp().get(0).getBanner()).isNull(); - - assertThat(request1.getPayload().getId()).isEqualTo("req-123"); - assertThat(request2.getPayload().getId()).isEqualTo("req-123"); } + // ---- makeBids tests ---- @Test void makeBidsShouldReturnEmptyListForEmptyResponse() { + // given final BidResponse bidResponse = BidResponse.builder().build(); final HttpResponse response = HttpResponse.of( 200, @@ -140,43 +187,54 @@ void makeBidsShouldReturnEmptyListForEmptyResponse() { null ); + // when final Result> result = target.makeBids(call, BidRequest.builder().build()); + // then assertThat(result.getValue()).isEmpty(); } @Test - void makeBidsShouldReturnBidderBids() { - // GIVEN - final String impId = "AE_AD_1748977459403"; - final String publisherId = "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F"; + void makeBidsShouldReturnBidderBidsWithFullFields() { + // given + final Imp bannerImp = createImp("imp-banner", "pub-1", 300, 250); + final Imp videoImp = createImp("imp-video", "pub-2", 640, 480); + + final BidRequest bidRequest = createBidRequest(List.of(bannerImp, videoImp)); - final Bid bid = createBid("bid1", impId, 1); - final SeatBid seatBid = createSeatBid(bid); + final Bid bannerBid = createBid("bid-banner", "imp-banner", 1.5); + final Bid videoBid = createBid("bid-video", "imp-video", 2.5); + + final SeatBid seatBid = createSeatBid(bannerBid, videoBid); final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); - final HttpResponse response = HttpResponse.of( + final HttpResponse httpResponse = HttpResponse.of( 200, MultiMap.caseInsensitiveMultiMap(), jacksonMapper.encodeToString(bidResponse) ); - final Imp imp = createImp(impId, publisherId, 320, 100); - final BidRequest bidRequest = createBidRequest(List.of(imp)); - - final AlvadsRequestOrtb alvadsRequest = createAlvadsRequest(impId, 320, 100); - final HttpRequest httpRequest = HttpRequest.builder() - .payload(alvadsRequest) + final HttpRequest request = HttpRequest.builder() + .payload(createAlvadsRequest("imp-banner", 300, 250)) .build(); - final BidderCall call = BidderCall.succeededHttp(httpRequest, response, null); - - // WHEN - final Result> result = target.makeBids(call, bidRequest); + // when + final Result> result = target.makeBids( + BidderCall.succeededHttp(request, httpResponse, null), + bidRequest + ); - // THEN - assertThat(result.getValue()).hasSize(1); - assertThat(result.getValue().get(0).getBid().getId()).isEqualTo("bid1"); + // then - banner bid + final BidderBid bannerBidderBid = result.getValue().stream() + .filter(b -> b.getBid().getImpid().equals("imp-banner")) + .findFirst() + .orElseThrow(); + + // then - video bid + final BidderBid videoBidderBid = result.getValue().stream() + .filter(b -> b.getBid().getImpid().equals("imp-video")) + .findFirst() + .orElseThrow(); } private static Bid createBid(String id, String impId, double price) { @@ -208,6 +266,7 @@ private static Imp createImp(String id, String publisherId, int width, int heigh return Imp.builder() .id(id) .banner(Banner.builder().w(width).h(height).build()) + .video(height > 250 ? com.iab.openrtb.request.Video.builder().w(width).h(height).build() : null) .ext(extNode) .build(); } @@ -222,12 +281,12 @@ private static BidRequest createBidRequest(List imps) { private static AlvadsRequestOrtb createAlvadsRequest(String impId, int width, int height) { final AlvaAdsImp alvaImp = AlvaAdsImp.builder() .id(impId) - .banner(Map.of("w", width, "h", height)) + .banner(height <= 250 ? Map.of("w", width, "h", height) : null) + .video(height > 250 ? Map.of("w", width, "h", height) : null) .build(); return AlvadsRequestOrtb.builder() .imp(List.of(alvaImp)) .build(); } - } From 9f39685e027e07dc903b8156ae0cdcb552c466f1 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 25 Sep 2025 10:16:20 -0400 Subject: [PATCH 04/16] fixes --- .../java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index aebf45524c8..ee28b67b1ac 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -170,7 +170,6 @@ private static BidRequest createBidRequestWithBannerAndVideo() { .build(); } - // ---- makeBids tests ---- @Test void makeBidsShouldReturnEmptyListForEmptyResponse() { // given From e0a4564bad087c8fa128213476a4536c615465cf Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Mon, 29 Sep 2025 14:58:21 -0400 Subject: [PATCH 05/16] added integration test --- .../java/org/prebid/server/it/AlvadsTest.java | 35 +++++++++++++++ .../alvads/test-alvads-bid-request.json | 41 +++++++++++++++++ .../alvads/test-alvads-bid-response.json | 20 +++++++++ .../alvads/test-auction-alvads-request.json | 41 +++++++++++++++++ .../alvads/test-auction-alvads-response.json | 44 +++++++++++++++++++ 5 files changed, 181 insertions(+) create mode 100644 src/test/java/org/prebid/server/it/AlvadsTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json diff --git a/src/test/java/org/prebid/server/it/AlvadsTest.java b/src/test/java/org/prebid/server/it/AlvadsTest.java new file mode 100644 index 00000000000..528c27d11a0 --- /dev/null +++ b/src/test/java/org/prebid/server/it/AlvadsTest.java @@ -0,0 +1,35 @@ +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 AlvadsTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromAlvads() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/decision/openrtb")) + .withRequestBody(equalToJson( + jsonFrom("openrtb2/alvads/test-alvads-bid-request.json"))) + .willReturn(aResponse().withBody( + jsonFrom("openrtb2/alvads/test-alvads-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/alvads/test-auction-alvads-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/alvads/test-auction-alvads-response.json", response, + singletonList("alvads")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json new file mode 100644 index 00000000000..577ad197839 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json @@ -0,0 +1,41 @@ +{ + "id": "REQ-OPENRTB-1758805437433", + "site": { + "page": "https://facebooktest.com", + "ref": "https://facebooktest.com", + "publisher": { + "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" + } + }, + "imp": [ + { + "id": "4776dd98-33c9-4c87-859c-370ee434168c", + "banner": { + "w": 250, + "h": 250 + }, + "bidfloor": 0, + "bidfloorcur": "USD", + "ext": { + "userId": "+59172893207" + } + } + ], + "device": { + "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" + }, + "user": { + "id": "+59172893207", + "buyeruid": "79e917b5-8bb3-4e46-94dc-1053497311f8" + }, + "regs": { + "gpp": "", + "gpp_sid": [], + "ext": { + "gdpr": null + } + }, + "ext": { + "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json new file mode 100644 index 00000000000..47074e7d7a9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json @@ -0,0 +1,20 @@ +{ + "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": 250 + } + ] + } + ] +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json new file mode 100644 index 00000000000..8de8645beb9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json @@ -0,0 +1,41 @@ +{ + "id": "test-bid-request", + "site": { + "page": "https://facebooktest.com", + "ref": "https://facebooktest.com", + "publisher": { + "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" + } + }, + "device": { + "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" + }, + "user": { + "id": "+59172893207", + "buyeruid": "79e917b5-8bb3-4e46-94dc-1053497311f8" + }, + "imp": [ + { + "id": "imp1", + "banner": { "w": 250, "h": 250 }, + "tagid": "123", + "bidfloor": 0, + "bidfloorcur": "USD", + "ext": { + "alvads": { + "sid": "testSid", + "placementId": "testPlacementId", + "publisherUniqueId": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" + }, + "prebid": { "is_rewarded_inventory": 1 }, + "userId": "+59172893207" + } + } + ], + "regs": { + "ext": { "gdpr": 0 } + }, + "ext": { + "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json new file mode 100644 index 00000000000..e50a2212059 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json @@ -0,0 +1,44 @@ +{ + "id": "test-bid-request", + "seatbid": [ + { + "bid": [ + { + "id": "imp1", + "impid": "imp1", + "exp": 300, + "price": 0.2, + "adm": "adm001", + "adid": "adid", + "cid": "323", + "crid": "2142", + "w": 250, + "h": 250, + "ext": { + "alva_format": "Display", + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "alvads" + } + }, + "origbidcpm": 0.2, + "origbidcur":"USD" + } + } + ], + "seat": "alvads", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "alvads": "{{ alvads.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "tmaxrequest": 5000 + } +} From f1f8218fcea3c42c0f03be77686cf65e274e84a8 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 16 Oct 2025 10:14:13 -0400 Subject: [PATCH 06/16] added integration test --- .../server/bidder/alvads/AlvadsBidder.java | 2 +- .../java/org/prebid/server/it/AlvadsTest.java | 2 +- .../alvads/test-alvads-bid-request.json | 35 +++++++---------- .../alvads/test-alvads-bid-response.json | 19 +++++++--- .../alvads/test-auction-alvads-request.json | 38 +++++++++---------- .../alvads/test-auction-alvads-response.json | 23 ++++++----- .../server/it/test-application.properties | 2 + 7 files changed, 59 insertions(+), 62 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 92e127e7389..2d9fb70332e 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -44,7 +44,7 @@ public class AlvadsBidder implements Bidder { private final JacksonMapper mapper; public AlvadsBidder(String endpointUrl, JacksonMapper mapper) { - this.endpointUrl = HttpUtil.validateUrlSyntax(Objects.requireNonNull(endpointUrl)); + this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl)); this.mapper = Objects.requireNonNull(mapper); } diff --git a/src/test/java/org/prebid/server/it/AlvadsTest.java b/src/test/java/org/prebid/server/it/AlvadsTest.java index 528c27d11a0..f5d6a6a3590 100644 --- a/src/test/java/org/prebid/server/it/AlvadsTest.java +++ b/src/test/java/org/prebid/server/it/AlvadsTest.java @@ -18,7 +18,7 @@ public class AlvadsTest extends IntegrationTest { @Test public void openrtb2AuctionShouldRespondWithBidsFromAlvads() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/decision/openrtb")) + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/alvads-exchange")) .withRequestBody(equalToJson( jsonFrom("openrtb2/alvads/test-alvads-bid-request.json"))) .willReturn(aResponse().withBody( diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json index 577ad197839..81791f47055 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-request.json @@ -1,41 +1,34 @@ { - "id": "REQ-OPENRTB-1758805437433", - "site": { - "page": "https://facebooktest.com", - "ref": "https://facebooktest.com", - "publisher": { - "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" - } - }, + "id": "tid", "imp": [ { - "id": "4776dd98-33c9-4c87-859c-370ee434168c", + "id": "imp1", "banner": { - "w": 250, + "w": 300, "h": 250 }, - "bidfloor": 0, - "bidfloorcur": "USD", - "ext": { - "userId": "+59172893207" - } + "tagid": "123", + "bidfloor": 0 } ], "device": { - "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" + "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)", + "ip": "193.168.244.1" }, "user": { "id": "+59172893207", "buyeruid": "79e917b5-8bb3-4e46-94dc-1053497311f8" }, "regs": { - "gpp": "", - "gpp_sid": [], "ext": { - "gdpr": null + "gdpr": 0 } }, - "ext": { - "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" + "site": { + "page": "https://facebooktest.com", + "ref": "https://facebooktest.com", + "publisher": { + "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" + } } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json index 47074e7d7a9..82ed15f1664 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-alvads-bid-response.json @@ -1,20 +1,27 @@ { - "id": "request_id", + "id": "tid", "seatbid": [ { "bid": [ { - "id": "bid_id", - "impid": "imp_id", + "id": "bid001", + "impid": "imp1", "price": 3.33, "adid": "adid001", "crid": "crid001", "cid": "cid001", "adm": "adm001", "h": 250, - "w": 250 + "w": 300 } - ] + ], + "seat": "alvads" } - ] + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "alvads": 250 + } + } } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json index 8de8645beb9..370b5983894 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json @@ -1,23 +1,9 @@ { - "id": "test-bid-request", - "site": { - "page": "https://facebooktest.com", - "ref": "https://facebooktest.com", - "publisher": { - "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" - } - }, - "device": { - "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" - }, - "user": { - "id": "+59172893207", - "buyeruid": "79e917b5-8bb3-4e46-94dc-1053497311f8" - }, + "id": "tid", "imp": [ { "id": "imp1", - "banner": { "w": 250, "h": 250 }, + "banner": { "w": 300, "h": 250 }, "tagid": "123", "bidfloor": 0, "bidfloorcur": "USD", @@ -32,10 +18,20 @@ } } ], - "regs": { - "ext": { "gdpr": 0 } + "device": { + "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)", + "ip": "193.168.244.1" + }, + "user": { + "id": "+59172893207", + "buyeruid": "79e917b5-8bb3-4e46-94dc-1053497311f8" + }, + "site": { + "page": "https://facebooktest.com", + "ref": "https://facebooktest.com", + "publisher": { "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" } }, - "ext": { - "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" - } + "regs": { "ext": { "gdpr": 0 } }, + "ext": { "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" }, + "tmax": 5000 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json index e50a2212059..926110e7586 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json @@ -1,29 +1,28 @@ { - "id": "test-bid-request", + "id": "tid", "seatbid": [ { "bid": [ { - "id": "imp1", + "id": "bid001", "impid": "imp1", - "exp": 300, - "price": 0.2, + "price": 3.33, "adm": "adm001", - "adid": "adid", - "cid": "323", - "crid": "2142", - "w": 250, + "adid": "adid001", + "cid": "cid001", + "crid": "crid001", + "w": 300, "h": 250, + "exp": 300, "ext": { - "alva_format": "Display", "prebid": { "type": "banner", "meta": { "adaptercode": "alvads" } }, - "origbidcpm": 0.2, - "origbidcur":"USD" + "origbidcpm": 3.33, + "origbidcur": "USD" } } ], @@ -37,7 +36,7 @@ "alvads": "{{ alvads.response_time_ms }}" }, "prebid": { - "auctiontimestamp": 0 + "auctiontimestamp": 1000 }, "tmaxrequest": 5000 } 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 51958ab075b..d9b6ba06924 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -72,6 +72,8 @@ adapters.adverxo.aliases.bidsmind.enabled=true adapters.adverxo.aliases.bidsmind.endpoint=http://localhost:8090/bidsmind-exchange adapters.adverxo.aliases.mobupps.enabled=true adapters.adverxo.aliases.mobupps.endpoint=http://localhost:8090/mobupps-exchange +adapters.alvads.enabled=true +adapters.alvads.endpoint=http://localhost:8090/alvads-exchange adapters.adview.enabled=true adapters.adview.endpoint=http://localhost:8090/adview-exchange?accountId={{AccountId}} adapters.adprime.enabled=true From 82a225e6318de58daebbd11b97c236635d7aabd6 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Mon, 27 Oct 2025 08:42:35 -0400 Subject: [PATCH 07/16] fixes --- src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 2d9fb70332e..6be290f4d1b 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -37,6 +37,7 @@ import java.util.stream.Collectors; public class AlvadsBidder implements Bidder { + private static final TypeReference> ALVADS_EXT_TYPE_REFERENCE = new TypeReference<>() { }; From cbc014f16f51d6a0ecd0cacd4956e0e3d0b455e8 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Tue, 28 Oct 2025 09:34:02 -0400 Subject: [PATCH 08/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 46 +++++++------------ .../bidder/alvads/model/AlvaAdsImp.java | 18 +++++--- .../bidder/alvads/model/AlvaAdsSite.java | 12 +++-- .../alvads/model/AlvadsRequestOrtb.java | 21 +++++---- 4 files changed, 47 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 6be290f4d1b..0b744d86350 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -1,11 +1,9 @@ package org.prebid.server.bidder.alvads; import com.fasterxml.jackson.core.type.TypeReference; -import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; -import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import io.vertx.core.http.HttpMethod; @@ -38,8 +36,9 @@ public class AlvadsBidder implements Bidder { - private static final TypeReference> - ALVADS_EXT_TYPE_REFERENCE = new TypeReference<>() { }; + private static final TypeReference> ALVADS_EXT_TYPE_REFERENCE = + new TypeReference<>() { + }; private final String endpointUrl; private final JacksonMapper mapper; @@ -109,39 +108,26 @@ private String makeUrl(AlvadsImpExt impExt) { } private static AlvaAdsImp makeImp(Imp imp) { - final Banner banner = imp.getBanner(); - Map bannerMap = null; - if (banner != null) { - bannerMap = new HashMap<>(); - if (banner.getW() != null) { - bannerMap.put("w", banner.getW()); - } - if (banner.getH() != null) { - bannerMap.put("h", banner.getH()); - } - } - - final Video video = imp.getVideo(); - Map videoMap = null; - if (video != null) { - videoMap = new HashMap<>(); - if (video.getW() != null) { - videoMap.put("w", video.getW()); - } - if (video.getH() != null) { - videoMap.put("h", video.getH()); - } - } - return AlvaAdsImp.builder() .id(imp.getId()) .tagid(imp.getTagid()) .bidfloor(imp.getBidfloor()) - .banner(bannerMap) - .video(videoMap) + .banner(imp.getBanner() != null ? sizes(imp.getBanner().getW(), imp.getBanner().getH()) : null) + .video(imp.getVideo() != null ? sizes(imp.getVideo().getW(), imp.getVideo().getH()) : null) .build(); } + private static Map sizes(Integer w, Integer h) { + final Map map = new HashMap<>(); + if (w != null) { + map.put("w", w); + } + if (h != null) { + map.put("h", h); + } + return map.isEmpty() ? null : map; + } + private static AlvaAdsSite makeSite(Site site, String publisherUniqueId) { final String page = site != null ? site.getPage() : null; return AlvaAdsSite.builder() diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java index acf83bb514b..c339f5882df 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsImp.java @@ -1,18 +1,22 @@ package org.prebid.server.bidder.alvads.model; import lombok.Builder; -import lombok.Data; +import lombok.Value; import java.math.BigDecimal; import java.util.Map; -@Data +@Value @Builder public class AlvaAdsImp { - private String id; - private Map banner; - private Map video; - private String tagid; - private BigDecimal bidfloor; + String id; + + Map banner; + + Map video; + + String tagid; + + BigDecimal bidfloor; } diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java index c5f7a855514..cc6626c4190 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvaAdsSite.java @@ -1,15 +1,17 @@ package org.prebid.server.bidder.alvads.model; import lombok.Builder; -import lombok.Data; +import lombok.Value; import java.util.Map; -@Data +@Value @Builder public class AlvaAdsSite { - private String page; - private String ref; - private Map publisher; + String page; + + String ref; + + Map publisher; } diff --git a/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java b/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java index 6ae61deea81..4683a8500b6 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java +++ b/src/main/java/org/prebid/server/bidder/alvads/model/AlvadsRequestOrtb.java @@ -4,18 +4,23 @@ import com.iab.openrtb.request.Regs; import com.iab.openrtb.request.User; import lombok.Builder; -import lombok.Data; +import lombok.Value; import java.util.List; -@Data +@Value @Builder(toBuilder = true) public class AlvadsRequestOrtb { - private String id; - private List imp; - private Device device; - private User user; - private Regs regs; - private AlvaAdsSite site; + String id; + + List imp; + + Device device; + + User user; + + Regs regs; + + AlvaAdsSite site; } From cfc08eac846926c231a5af5cf571e47a544bb414 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 30 Oct 2025 09:02:02 -0400 Subject: [PATCH 09/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 34 +++++++------------ .../server/bidder/alvads/ExtBidAlvads.java | 6 ++-- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 0b744d86350..bf9cd47e300 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -1,9 +1,11 @@ package org.prebid.server.bidder.alvads; import com.fasterxml.jackson.core.type.TypeReference; +import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; +import com.iab.openrtb.request.Video; import com.iab.openrtb.response.Bid; import com.iab.openrtb.response.BidResponse; import io.vertx.core.http.HttpMethod; @@ -25,13 +27,13 @@ import org.prebid.server.proto.openrtb.ext.response.BidType; import org.prebid.server.util.HttpUtil; -import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; public class AlvadsBidder implements Bidder { @@ -75,7 +77,6 @@ private AlvadsImpExt parseImpExt(Imp imp) { } private HttpRequest makeHttpRequest(BidRequest request, Imp imp, AlvadsImpExt impExt) { - final String resolvedUrl = makeUrl(impExt); final AlvaAdsImp impObj = makeImp(imp); final AlvaAdsSite siteObj = makeSite(request.getSite(), impExt.getPublisherUniqueId()); final AlvadsRequestOrtb alvadsRequest = AlvadsRequestOrtb.builder() @@ -89,7 +90,7 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp i return HttpRequest.builder() .method(HttpMethod.POST) - .uri(resolvedUrl) + .uri(endpointUrl) .headers(HttpUtil.headers()) .payload(alvadsRequest) .body(mapper.encodeToBytes(alvadsRequest)) @@ -97,23 +98,16 @@ private HttpRequest makeHttpRequest(BidRequest request, Imp i .build(); } - private String makeUrl(AlvadsImpExt impExt) { - final String resolvedUrl = impExt.getEndpointUrl() != null ? impExt.getEndpointUrl() : endpointUrl; - try { - URI.create(resolvedUrl); - return resolvedUrl; - } catch (IllegalArgumentException e) { - throw new PreBidException("Invalid endpoint URL: " + resolvedUrl, e); - } - } - private static AlvaAdsImp makeImp(Imp imp) { + final Banner banner = imp.getBanner(); + final Video video = imp.getVideo(); + return AlvaAdsImp.builder() .id(imp.getId()) .tagid(imp.getTagid()) .bidfloor(imp.getBidfloor()) - .banner(imp.getBanner() != null ? sizes(imp.getBanner().getW(), imp.getBanner().getH()) : null) - .video(imp.getVideo() != null ? sizes(imp.getVideo().getW(), imp.getVideo().getH()) : null) + .banner(banner != null ? sizes(banner.getW(), banner.getH()) : null) + .video(video != null ? sizes(video.getW(), video.getH()) : null) .build(); } @@ -175,13 +169,9 @@ private BidType getBidType(Bid bid, AlvaAdsImp imp) { return BidType.video; } - final ExtBidAlvads bidExt = getBidExt(bid); - if (bidExt == null) { - return BidType.banner; - } - - final BidType crtype = bidExt.getCrtype(); - return crtype != null ? crtype : BidType.banner; + return Optional.ofNullable(getBidExt(bid)) + .map(ExtBidAlvads::getCrtype) + .orElse(BidType.banner); } private ExtBidAlvads getBidExt(Bid bid) { diff --git a/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java index 1ec981ac8d7..4048222e410 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java +++ b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java @@ -1,10 +1,10 @@ package org.prebid.server.bidder.alvads; -import lombok.Data; +import lombok.Value; import org.prebid.server.proto.openrtb.ext.response.BidType; -@Data +@Value public class ExtBidAlvads { - private BidType crtype; + BidType crtype; } From f06ea5f8e0c1f2ed6d28781c48e78a0677319b51 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Fri, 31 Oct 2025 08:29:56 -0400 Subject: [PATCH 10/16] fixes --- src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java index 4048222e410..2792260095e 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java +++ b/src/main/java/org/prebid/server/bidder/alvads/ExtBidAlvads.java @@ -6,5 +6,5 @@ @Value public class ExtBidAlvads { - BidType crtype; + BidType crtype; } From 5ab22862271f68fd9aa8d315a8162d6dacceede1 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Fri, 31 Oct 2025 09:37:42 -0400 Subject: [PATCH 11/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 13 +- .../bidder/alvads/AlvadsBidderTest.java | 132 ++++++++++-------- 2 files changed, 86 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index bf9cd47e300..a5cb3956355 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -8,6 +8,7 @@ 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.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; import org.prebid.server.bidder.Bidder; @@ -28,6 +29,7 @@ import org.prebid.server.util.HttpUtil; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -149,12 +151,19 @@ private List extractBids(BidResponse bidResponse, AlvadsRequestOrtb r } private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestOrtb request) { - return bidResponse.getSeatbid().stream() - .flatMap(seatBid -> seatBid.getBid().stream()) + return Optional.ofNullable(bidResponse.getSeatbid()) + .orElse(Collections.emptyList()) + .stream() + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .filter(Objects::nonNull) .map(bid -> makeBid(bid, request, bidResponse.getCur())) .toList(); } + private BidderBid makeBid(Bid bid, AlvadsRequestOrtb request, String currency) { final AlvaAdsImp imp = request.getImp().stream() .filter(i -> i.getId().equals(bid.getImpid())) diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index ee28b67b1ac..3faa1acab38 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -1,6 +1,5 @@ package org.prebid.server.bidder.alvads; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.iab.openrtb.request.Banner; import com.iab.openrtb.request.BidRequest; @@ -20,6 +19,7 @@ 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.response.BidType; import java.math.BigDecimal; import java.util.Arrays; @@ -36,13 +36,13 @@ class AlvadsBidderTest extends VertxTest { private final AlvadsBidder target = new AlvadsBidder(ENDPOINT_URL, jacksonMapper); @Test - void creationShouldFailOnInvalidEndpointUrl() { + public void creationShouldFailOnInvalidEndpointUrl() { assertThatIllegalArgumentException() .isThrownBy(() -> new AlvadsBidder("invalid_url", jacksonMapper)); } @Test - void makeHttpRequestsShouldReturnErrorForInvalidImpExt() { + public void makeHttpRequestsShouldReturnErrorForInvalidImpExt() { // given final ObjectNode extNode = jacksonMapper.mapper().createObjectNode(); extNode.put("bidder", "invalid"); @@ -61,7 +61,7 @@ void makeHttpRequestsShouldReturnErrorForInvalidImpExt() { } @Test - void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { + public void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -74,7 +74,7 @@ void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { } @Test - void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { + public void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -86,7 +86,7 @@ void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { } @Test - void makeHttpRequestsShouldBuildValidHttpRequestsImpIds() { + public void makeHttpRequestsShouldBuildValidHttpRequestsImpIds() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -99,7 +99,7 @@ void makeHttpRequestsShouldBuildValidHttpRequestsImpIds() { } @Test - void makeHttpRequestsShouldBuildValidHttpRequestsImpContent() { + public void makeHttpRequestsShouldBuildValidHttpRequestsImpContent() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -118,7 +118,7 @@ void makeHttpRequestsShouldBuildValidHttpRequestsImpContent() { } @Test - void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { + public void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -133,58 +133,19 @@ void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { assertThat(result.getValue().get(1).getPayload().getSite()).isNotNull(); } - private static BidRequest createBidRequestWithBannerAndVideo() { - final ObjectNode bidderNode1 = new ObjectMapper().createObjectNode(); - bidderNode1.put("publisherUniqueId", "pub-1"); - bidderNode1.put("endpointUrl", ENDPOINT_URL); - - final ObjectNode impExtNode1 = new ObjectMapper().createObjectNode(); - impExtNode1.set("bidder", bidderNode1); - - final ObjectNode bidderNode2 = new ObjectMapper().createObjectNode(); - bidderNode2.put("publisherUniqueId", "pub-2"); - bidderNode2.put("endpointUrl", ENDPOINT_URL); - - final ObjectNode impExtNode2 = new ObjectMapper().createObjectNode(); - impExtNode2.set("bidder", bidderNode2); - - final Imp imp1 = Imp.builder() - .id("imp-1") - .banner(Banner.builder().w(300).h(250).build()) - .ext(impExtNode1) - .build(); - - final Imp imp2 = Imp.builder() - .id("imp-2") - .video(com.iab.openrtb.request.Video.builder().w(640).h(480).build()) - .ext(impExtNode2) - .build(); - - final Site site = Site.builder().page("https://example.com").build(); - - return BidRequest.builder() - .id("req-123") - .imp(List.of(imp1, imp2)) - .site(site) - .device(Device.builder().build()) - .build(); - } - @Test - void makeBidsShouldReturnEmptyListForEmptyResponse() { + public void makeBidsShouldReturnEmptyListForEmptyResponse() { // given final BidResponse bidResponse = BidResponse.builder().build(); final HttpResponse response = HttpResponse.of( 200, MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse) - ); + jacksonMapper.encodeToString(bidResponse)); final BidderCall call = BidderCall.succeededHttp( HttpRequest.builder().payload(null).build(), response, - null - ); + null); // when final Result> result = target.makeBids(call, BidRequest.builder().build()); @@ -194,7 +155,7 @@ void makeBidsShouldReturnEmptyListForEmptyResponse() { } @Test - void makeBidsShouldReturnBidderBidsWithFullFields() { + public void makeBidsShouldReturnBidderBidsWithFullFields() { // given final Imp bannerImp = createImp("imp-banner", "pub-1", 300, 250); final Imp videoImp = createImp("imp-video", "pub-2", 640, 480); @@ -210,11 +171,15 @@ void makeBidsShouldReturnBidderBidsWithFullFields() { final HttpResponse httpResponse = HttpResponse.of( 200, MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse) - ); + jacksonMapper.encodeToString(bidResponse)); final HttpRequest request = HttpRequest.builder() - .payload(createAlvadsRequest("imp-banner", 300, 250)) + .payload(AlvadsRequestOrtb.builder() + .imp(List.of( + createAlvadsRequestImp("imp-banner", 300, 250), + createAlvadsRequestImp("imp-video", 640, 480) + )) + .build()) .build(); // when @@ -223,17 +188,61 @@ void makeBidsShouldReturnBidderBidsWithFullFields() { bidRequest ); - // then - banner bid + // then + assertThat(result.getValue()).hasSize(2); + final BidderBid bannerBidderBid = result.getValue().stream() .filter(b -> b.getBid().getImpid().equals("imp-banner")) .findFirst() .orElseThrow(); + assertThat(bannerBidderBid.getBid().getId()).isEqualTo("bid-banner"); + assertThat(bannerBidderBid.getBid().getPrice()).isEqualByComparingTo("1.5"); + assertThat(bannerBidderBid.getType()).isEqualTo(BidType.banner); - // then - video bid final BidderBid videoBidderBid = result.getValue().stream() .filter(b -> b.getBid().getImpid().equals("imp-video")) .findFirst() .orElseThrow(); + assertThat(videoBidderBid.getBid().getId()).isEqualTo("bid-video"); + assertThat(videoBidderBid.getBid().getPrice()).isEqualByComparingTo("2.5"); + assertThat(videoBidderBid.getType()).isEqualTo(BidType.video); + } + + private static BidRequest createBidRequestWithBannerAndVideo() { + final ObjectNode bidderNode1 = jacksonMapper.mapper().createObjectNode(); + bidderNode1.put("publisherUniqueId", "pub-1"); + bidderNode1.put("endpointUrl", ENDPOINT_URL); + + final ObjectNode impExtNode1 = jacksonMapper.mapper().createObjectNode(); + impExtNode1.set("bidder", bidderNode1); + + final ObjectNode bidderNode2 = jacksonMapper.mapper().createObjectNode(); + bidderNode2.put("publisherUniqueId", "pub-2"); + bidderNode2.put("endpointUrl", ENDPOINT_URL); + + final ObjectNode impExtNode2 = jacksonMapper.mapper().createObjectNode(); + impExtNode2.set("bidder", bidderNode2); + + final Imp imp1 = Imp.builder() + .id("imp-1") + .banner(Banner.builder().w(300).h(250).build()) + .ext(impExtNode1) + .build(); + + final Imp imp2 = Imp.builder() + .id("imp-2") + .video(com.iab.openrtb.request.Video.builder().w(640).h(480).build()) + .ext(impExtNode2) + .build(); + + final Site site = Site.builder().page("https://example.com").build(); + + return BidRequest.builder() + .id("req-123") + .imp(List.of(imp1, imp2)) + .site(site) + .device(Device.builder().build()) + .build(); } private static Bid createBid(String id, String impId, double price) { @@ -258,7 +267,7 @@ private static BidResponse createBidResponse(List seatBids, String curr } private static Imp createImp(String id, String publisherId, int width, int height) { - final ObjectNode extNode = new ObjectMapper().createObjectNode() + final ObjectNode extNode = jacksonMapper.mapper().createObjectNode() .putObject("bidder") .put("publisherUniqueId", publisherId); @@ -288,4 +297,13 @@ private static AlvadsRequestOrtb createAlvadsRequest(String impId, int width, in .imp(List.of(alvaImp)) .build(); } + + private static AlvaAdsImp createAlvadsRequestImp(String impId, int width, int height) { + return AlvaAdsImp.builder() + .id(impId) + .banner(height <= 250 ? Map.of("w", width, "h", height) : null) + .video(height > 250 ? Map.of("w", width, "h", height) : null) + .build(); + } + } From 7c5532bb1cd9411374fb012b8ce8439bbe6aa65c Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Tue, 4 Nov 2025 11:23:26 -0400 Subject: [PATCH 12/16] fixes --- src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index a5cb3956355..3b4a0a8322f 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -163,7 +163,6 @@ private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestO .toList(); } - private BidderBid makeBid(Bid bid, AlvadsRequestOrtb request, String currency) { final AlvaAdsImp imp = request.getImp().stream() .filter(i -> i.getId().equals(bid.getImpid())) From 1e6638ea0afec73787607372ddfd4b7e39178666 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 6 Nov 2025 09:12:19 -0400 Subject: [PATCH 13/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 48 +++--- .../ext/request/alvads/AlvadsImpExt.java | 2 - .../static/bidder-params/alvads.json | 4 - .../bidder/alvads/AlvadsBidderTest.java | 138 ++++++++++++------ .../alvads/test-auction-alvads-request.json | 23 ++- .../alvads/test-auction-alvads-response.json | 2 +- 6 files changed, 140 insertions(+), 77 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 3b4a0a8322f..01a7cc25d37 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -8,7 +8,6 @@ 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.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; import org.prebid.server.bidder.Bidder; @@ -29,7 +28,6 @@ import org.prebid.server.util.HttpUtil; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -114,14 +112,13 @@ private static AlvaAdsImp makeImp(Imp imp) { } private static Map sizes(Integer w, Integer h) { - final Map map = new HashMap<>(); - if (w != null) { - map.put("w", w); - } - if (h != null) { - map.put("h", h); + if (w == null || h == null) { + return null; } - return map.isEmpty() ? null : map; + final Map map = new HashMap<>(); + map.put("w", w); + map.put("h", h); + return map; } private static AlvaAdsSite makeSite(Site site, String publisherUniqueId) { @@ -151,15 +148,10 @@ private List extractBids(BidResponse bidResponse, AlvadsRequestOrtb r } private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestOrtb request) { - return Optional.ofNullable(bidResponse.getSeatbid()) - .orElse(Collections.emptyList()) - .stream() - .filter(Objects::nonNull) - .map(SeatBid::getBid) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .filter(Objects::nonNull) + return bidResponse.getSeatbid().stream() + .flatMap(sb -> sb.getBid().stream()) .map(bid -> makeBid(bid, request, bidResponse.getCur())) + .filter(Objects::nonNull) .toList(); } @@ -169,17 +161,27 @@ private BidderBid makeBid(Bid bid, AlvadsRequestOrtb request, String currency) { .findFirst() .orElse(null); - return BidderBid.of(bid, getBidType(bid, imp), currency); + final BidType type = getBidType(bid, imp); + + if (type == null) { + return null; + } + + return BidderBid.of(bid, type, currency); } private BidType getBidType(Bid bid, AlvaAdsImp imp) { - if (imp != null && imp.getVideo() != null) { - return BidType.video; + if (imp != null) { + if (imp.getVideo() != null) { + return BidType.video; + } + + return Optional.ofNullable(getBidExt(bid)) + .map(ExtBidAlvads::getCrtype) + .orElse(BidType.banner); } - return Optional.ofNullable(getBidExt(bid)) - .map(ExtBidAlvads::getCrtype) - .orElse(BidType.banner); + return null; } private ExtBidAlvads getBidExt(Bid bid) { diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java index da6f24062f2..86e4afe0a78 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/alvads/AlvadsImpExt.java @@ -9,6 +9,4 @@ public class AlvadsImpExt { @JsonProperty("publisherUniqueId") String publisherUniqueId; - @JsonProperty("endPointUrl") - String endpointUrl; } diff --git a/src/main/resources/static/bidder-params/alvads.json b/src/main/resources/static/bidder-params/alvads.json index ae822c18ae5..e7b4a6096b3 100644 --- a/src/main/resources/static/bidder-params/alvads.json +++ b/src/main/resources/static/bidder-params/alvads.json @@ -8,10 +8,6 @@ "publisherUniqueId": { "type": "string", "description": "Publisher Unique Id" - }, - "endPointUrl": { - "type": "string", - "description": "Url ads openrtb" } }, diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index 3faa1acab38..8ee4e6eb371 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -6,9 +6,11 @@ import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; import com.iab.openrtb.request.Site; +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.jupiter.api.Test; import org.prebid.server.VertxTest; @@ -20,6 +22,7 @@ import org.prebid.server.bidder.model.HttpResponse; import org.prebid.server.bidder.model.Result; import org.prebid.server.proto.openrtb.ext.response.BidType; +import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; import java.util.Arrays; @@ -28,8 +31,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.tuple; -class AlvadsBidderTest extends VertxTest { +public class AlvadsBidderTest extends VertxTest { private static final String ENDPOINT_URL = "https://helios-ads-qa-core.ssidevops.com/decision/openrtb"; @@ -70,7 +74,10 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { // then assertThat(result.getErrors()).isEmpty(); - result.getValue().forEach(req -> assertThat(req.getUri()).isEqualTo(ENDPOINT_URL)); + + assertThat(result.getValue()) + .extracting(HttpRequest::getUri) + .allMatch(uri -> uri.equals(ENDPOINT_URL)); } @Test @@ -82,7 +89,17 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { final Result>> result = target.makeHttpRequests(bidRequest); // then - result.getValue().forEach(req -> assertThat(req.getHeaders()).isNotEmpty()); + 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.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), + tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString())); } @Test @@ -155,17 +172,85 @@ public void makeBidsShouldReturnEmptyListForEmptyResponse() { } @Test - public void makeBidsShouldReturnBidderBidsWithFullFields() { + public void makeBidsShouldReturnBannerBidderBid() { // given final Imp bannerImp = createImp("imp-banner", "pub-1", 300, 250); - final Imp videoImp = createImp("imp-video", "pub-2", 640, 480); - - final BidRequest bidRequest = createBidRequest(List.of(bannerImp, videoImp)); + final BidRequest bidRequest = createBidRequest(List.of(bannerImp)); final Bid bannerBid = createBid("bid-banner", "imp-banner", 1.5); + final SeatBid seatBid = createSeatBid(bannerBid); + final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); + + final HttpResponse httpResponse = HttpResponse.of( + 200, + MultiMap.caseInsensitiveMultiMap(), + jacksonMapper.encodeToString(bidResponse)); + + final HttpRequest request = HttpRequest.builder() + .payload(AlvadsRequestOrtb.builder() + .imp(List.of(createAlvadsRequestImp("imp-banner", 300, 250))) + .build()) + .build(); + + // when + final Result> result = target.makeBids( + BidderCall.succeededHttp(request, httpResponse, null), + bidRequest + ); + + // then + final BidderBid expected = BidderBid.of( + bannerBid, + BidType.banner, + "USD" + ); + assertThat(result.getValue()).containsExactly(expected); + } + + @Test + public void makeBidsShouldReturnVideoBidderBid() { + // given + final Imp videoImp = createImp("imp-video", "pub-2", 640, 480); + final BidRequest bidRequest = createBidRequest(List.of(videoImp)); + final Bid videoBid = createBid("bid-video", "imp-video", 2.5); + final SeatBid seatBid = createSeatBid(videoBid); + final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); - final SeatBid seatBid = createSeatBid(bannerBid, videoBid); + final HttpResponse httpResponse = HttpResponse.of( + 200, + MultiMap.caseInsensitiveMultiMap(), + jacksonMapper.encodeToString(bidResponse)); + + final HttpRequest request = HttpRequest.builder() + .payload(AlvadsRequestOrtb.builder() + .imp(List.of(createAlvadsRequestImp("imp-video", 640, 480))) + .build()) + .build(); + + // when + final Result> result = target.makeBids( + BidderCall.succeededHttp(request, httpResponse, null), + bidRequest + ); + + // then + final BidderBid expected = BidderBid.of( + videoBid, + BidType.video, + "USD" + ); + assertThat(result.getValue()).containsExactly(expected); + } + + @Test + public void makeBidsShouldIgnoreUnsupportedBidType() { + // given + final Imp imp = createImp("imp-unknown", "pub-3", 100, 100); + final BidRequest bidRequest = createBidRequest(List.of(imp)); + + final Bid unknownBid = createBid("bid-unknown", "imp-unknown", 1.0); + final SeatBid seatBid = createSeatBid(unknownBid); final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); final HttpResponse httpResponse = HttpResponse.of( @@ -175,10 +260,7 @@ public void makeBidsShouldReturnBidderBidsWithFullFields() { final HttpRequest request = HttpRequest.builder() .payload(AlvadsRequestOrtb.builder() - .imp(List.of( - createAlvadsRequestImp("imp-banner", 300, 250), - createAlvadsRequestImp("imp-video", 640, 480) - )) + .imp(List.of()) .build()) .build(); @@ -189,23 +271,7 @@ public void makeBidsShouldReturnBidderBidsWithFullFields() { ); // then - assertThat(result.getValue()).hasSize(2); - - final BidderBid bannerBidderBid = result.getValue().stream() - .filter(b -> b.getBid().getImpid().equals("imp-banner")) - .findFirst() - .orElseThrow(); - assertThat(bannerBidderBid.getBid().getId()).isEqualTo("bid-banner"); - assertThat(bannerBidderBid.getBid().getPrice()).isEqualByComparingTo("1.5"); - assertThat(bannerBidderBid.getType()).isEqualTo(BidType.banner); - - final BidderBid videoBidderBid = result.getValue().stream() - .filter(b -> b.getBid().getImpid().equals("imp-video")) - .findFirst() - .orElseThrow(); - assertThat(videoBidderBid.getBid().getId()).isEqualTo("bid-video"); - assertThat(videoBidderBid.getBid().getPrice()).isEqualByComparingTo("2.5"); - assertThat(videoBidderBid.getType()).isEqualTo(BidType.video); + assertThat(result.getValue()).isEmpty(); } private static BidRequest createBidRequestWithBannerAndVideo() { @@ -231,7 +297,7 @@ private static BidRequest createBidRequestWithBannerAndVideo() { final Imp imp2 = Imp.builder() .id("imp-2") - .video(com.iab.openrtb.request.Video.builder().w(640).h(480).build()) + .video(Video.builder().w(640).h(480).build()) .ext(impExtNode2) .build(); @@ -286,18 +352,6 @@ private static BidRequest createBidRequest(List imps) { .build(); } - private static AlvadsRequestOrtb createAlvadsRequest(String impId, int width, int height) { - final AlvaAdsImp alvaImp = AlvaAdsImp.builder() - .id(impId) - .banner(height <= 250 ? Map.of("w", width, "h", height) : null) - .video(height > 250 ? Map.of("w", width, "h", height) : null) - .build(); - - return AlvadsRequestOrtb.builder() - .imp(List.of(alvaImp)) - .build(); - } - private static AlvaAdsImp createAlvadsRequestImp(String impId, int width, int height) { return AlvaAdsImp.builder() .id(impId) diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json index 370b5983894..a13ff93cf3e 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-request.json @@ -3,7 +3,10 @@ "imp": [ { "id": "imp1", - "banner": { "w": 300, "h": 250 }, + "banner": { + "w": 300, + "h": 250 + }, "tagid": "123", "bidfloor": 0, "bidfloorcur": "USD", @@ -13,7 +16,9 @@ "placementId": "testPlacementId", "publisherUniqueId": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" }, - "prebid": { "is_rewarded_inventory": 1 }, + "prebid": { + "is_rewarded_inventory": 1 + }, "userId": "+59172893207" } } @@ -29,9 +34,17 @@ "site": { "page": "https://facebooktest.com", "ref": "https://facebooktest.com", - "publisher": { "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" } + "publisher": { + "id": "D7DACCE3-C23D-4AB9-8FE6-9FF41BF32F8F" + } + }, + "regs": { + "ext": { + "gdpr": 0 + } + }, + "ext": { + "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" }, - "regs": { "ext": { "gdpr": 0 } }, - "ext": { "user_fingerprint": "e061375f-bba1-4a57-98f9-cc072d5a5ad8" }, "tmax": 5000 } diff --git a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json index 926110e7586..08f4720b56b 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/alvads/test-auction-alvads-response.json @@ -21,7 +21,7 @@ "adaptercode": "alvads" } }, - "origbidcpm": 3.33, + "origbidcpm": 3.33, "origbidcur": "USD" } } From cb01d5ccd78288e9f0a635766e81cd4d400f2970 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Fri, 7 Nov 2025 08:52:47 -0400 Subject: [PATCH 14/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 14 +- .../bidder/alvads/AlvadsBidderTest.java | 192 +++++++++--------- 2 files changed, 106 insertions(+), 100 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index 01a7cc25d37..a085965c07e 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -8,6 +8,7 @@ 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.vertx.core.http.HttpMethod; import org.apache.commons.collections4.CollectionUtils; import org.prebid.server.bidder.Bidder; @@ -28,8 +29,8 @@ import org.prebid.server.util.HttpUtil; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -115,10 +116,7 @@ private static Map sizes(Integer w, Integer h) { if (w == null || h == null) { return null; } - final Map map = new HashMap<>(); - map.put("w", w); - map.put("h", h); - return map; + return Map.of("w", w, "h", h); } private static AlvaAdsSite makeSite(Site site, String publisherUniqueId) { @@ -149,7 +147,11 @@ private List extractBids(BidResponse bidResponse, AlvadsRequestOrtb r private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestOrtb request) { return bidResponse.getSeatbid().stream() - .flatMap(sb -> sb.getBid().stream()) + .filter(Objects::nonNull) + .map(SeatBid::getBid) + .filter(Objects::nonNull) + .flatMap(Collection::stream) + .filter(Objects::nonNull) .map(bid -> makeBid(bid, request, bidResponse.getCur())) .filter(Objects::nonNull) .toList(); diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index 8ee4e6eb371..783710bf1d0 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -10,7 +10,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 org.junit.jupiter.api.Test; import org.prebid.server.VertxTest; @@ -22,7 +21,6 @@ import org.prebid.server.bidder.model.HttpResponse; import org.prebid.server.bidder.model.Result; import org.prebid.server.proto.openrtb.ext.response.BidType; -import org.prebid.server.util.HttpUtil; import java.math.BigDecimal; import java.util.Arrays; @@ -32,6 +30,10 @@ 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.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 AlvadsBidderTest extends VertxTest { @@ -83,23 +85,20 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsUrl() { @Test public void makeHttpRequestsShouldBuildValidHttpRequestsHeaders() { // given - final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); + final Imp bannerImp = createImp("imp-banner", "pub-1", 300, 250); + final BidRequest bidRequest = createBidRequest(List.of(bannerImp)); // when final Result>> result = target.makeHttpRequests(bidRequest); // then assertThat(result.getErrors()).isEmpty(); - assertThat(result.getValue()) + assertThat(result.getValue()).hasSize(1).first() .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.CONTENT_TYPE_HEADER.toString(), HttpUtil.APPLICATION_JSON_CONTENT_TYPE), - tuple(HttpUtil.ACCEPT_HEADER.toString(), HttpHeaderValues.APPLICATION_JSON.toString())); + .satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER)) + .isEqualTo(APPLICATION_JSON_CONTENT_TYPE)) + .satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER)) + .isEqualTo(APPLICATION_JSON_VALUE)); } @Test @@ -127,15 +126,19 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsImpContent() { final HttpRequest req1 = result.getValue().get(0); final HttpRequest req2 = result.getValue().get(1); - assertThat(req1.getPayload().getImp().get(0).getBanner()).isNotNull(); - assertThat(req1.getPayload().getImp().get(0).getVideo()).isNull(); + assertThat(req1.getPayload().getImp()) + .hasSize(1) + .extracting("id", "banner", "video") + .containsExactly(tuple("imp-1", Map.of("w", 300, "h", 250), null)); - assertThat(req2.getPayload().getImp().get(0).getVideo()).isNotNull(); - assertThat(req2.getPayload().getImp().get(0).getBanner()).isNull(); + assertThat(req2.getPayload().getImp()) + .hasSize(1) + .extracting("id", "banner", "video") + .containsExactly(tuple("imp-2", null, Map.of("w", 640, "h", 480))); } @Test - public void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { + public void makeHttpRequestsShouldBuildValidHttpRequestsFromInput() { // given final BidRequest bidRequest = createBidRequestWithBannerAndVideo(); @@ -143,29 +146,49 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsSiteAndOtherFields() { final Result>> result = target.makeHttpRequests(bidRequest); // then - assertThat(result.getValue().get(0).getPayload().getId()).isEqualTo("req-123"); - assertThat(result.getValue().get(1).getPayload().getId()).isEqualTo("req-123"); + final HttpRequest req1 = result.getValue().get(0); + final HttpRequest req2 = result.getValue().get(1); + + // --- Validate Request ID --- + assertThat(req1.getPayload().getId()).isEqualTo("req-123"); + assertThat(req2.getPayload().getId()).isEqualTo("req-123"); + + // --- Validate Site content --- + assertThat(req1.getPayload().getSite().getPage()) + .isEqualTo("https://example.com"); + assertThat(req2.getPayload().getSite().getPage()) + .isEqualTo("https://example.com"); + + // --- Validate Device presence (or specific fields if populated) --- + assertThat(req1.getPayload().getDevice()).isNotNull(); + assertThat(req2.getPayload().getDevice()).isNotNull(); + + // --- Validate Imp content for req1 (banner) --- + assertThat(req1.getPayload().getImp()) + .hasSize(1) + .extracting("id", "banner", "video") + .containsExactly( + tuple("imp-1", + Map.of("w", 300, "h", 250), + null)); + + assertThat(req2.getPayload().getImp()) + .hasSize(1) + .extracting("id", "banner", "video") + .containsExactly( + tuple("imp-2", + null, + Map.of("w", 640, "h", 480))); - assertThat(result.getValue().get(0).getPayload().getSite()).isNotNull(); - assertThat(result.getValue().get(1).getPayload().getSite()).isNotNull(); } @Test public void makeBidsShouldReturnEmptyListForEmptyResponse() { // given - final BidResponse bidResponse = BidResponse.builder().build(); - final HttpResponse response = HttpResponse.of( - 200, - MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse)); - - final BidderCall call = BidderCall.succeededHttp( - HttpRequest.builder().payload(null).build(), - response, - null); + final BidderCall call = buildBidderCall(List.of(), List.of(), "USD"); // when - final Result> result = target.makeBids(call, BidRequest.builder().build()); + final Result> result = target.makeBids(call, createBidRequest(List.of())); // then assertThat(result.getValue()).isEmpty(); @@ -179,32 +202,17 @@ public void makeBidsShouldReturnBannerBidderBid() { final Bid bannerBid = createBid("bid-banner", "imp-banner", 1.5); final SeatBid seatBid = createSeatBid(bannerBid); - final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); - - final HttpResponse httpResponse = HttpResponse.of( - 200, - MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse)); - final HttpRequest request = HttpRequest.builder() - .payload(AlvadsRequestOrtb.builder() - .imp(List.of(createAlvadsRequestImp("imp-banner", 300, 250))) - .build()) - .build(); + final BidderCall call = buildBidderCall( + List.of(createAlvadsRequestImp("imp-banner", 300, 250)), + List.of(seatBid), + "USD"); // when - final Result> result = target.makeBids( - BidderCall.succeededHttp(request, httpResponse, null), - bidRequest - ); + final Result> result = target.makeBids(call, bidRequest); // then - final BidderBid expected = BidderBid.of( - bannerBid, - BidType.banner, - "USD" - ); - assertThat(result.getValue()).containsExactly(expected); + assertThat(result.getValue()).containsExactly(BidderBid.of(bannerBid, BidType.banner, "USD")); } @Test @@ -215,60 +223,32 @@ public void makeBidsShouldReturnVideoBidderBid() { final Bid videoBid = createBid("bid-video", "imp-video", 2.5); final SeatBid seatBid = createSeatBid(videoBid); - final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); - - final HttpResponse httpResponse = HttpResponse.of( - 200, - MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse)); - final HttpRequest request = HttpRequest.builder() - .payload(AlvadsRequestOrtb.builder() - .imp(List.of(createAlvadsRequestImp("imp-video", 640, 480))) - .build()) - .build(); + final BidderCall call = buildBidderCall( + List.of(createAlvadsRequestImp("imp-video", 640, 480)), + List.of(seatBid), + "USD"); // when - final Result> result = target.makeBids( - BidderCall.succeededHttp(request, httpResponse, null), - bidRequest - ); + final Result> result = target.makeBids(call, bidRequest); // then - final BidderBid expected = BidderBid.of( - videoBid, - BidType.video, - "USD" - ); - assertThat(result.getValue()).containsExactly(expected); + assertThat(result.getValue()).containsExactly(BidderBid.of(videoBid, BidType.video, "USD")); } @Test public void makeBidsShouldIgnoreUnsupportedBidType() { // given - final Imp imp = createImp("imp-unknown", "pub-3", 100, 100); - final BidRequest bidRequest = createBidRequest(List.of(imp)); + final Imp unknownImp = createImp("imp-unknown", "pub-3", 100, 100); + final BidRequest bidRequest = createBidRequest(List.of(unknownImp)); final Bid unknownBid = createBid("bid-unknown", "imp-unknown", 1.0); final SeatBid seatBid = createSeatBid(unknownBid); - final BidResponse bidResponse = createBidResponse(List.of(seatBid), "USD"); - final HttpResponse httpResponse = HttpResponse.of( - 200, - MultiMap.caseInsensitiveMultiMap(), - jacksonMapper.encodeToString(bidResponse)); - - final HttpRequest request = HttpRequest.builder() - .payload(AlvadsRequestOrtb.builder() - .imp(List.of()) - .build()) - .build(); + final BidderCall call = buildBidderCall(List.of(), List.of(seatBid), "USD"); // when - final Result> result = target.makeBids( - BidderCall.succeededHttp(request, httpResponse, null), - bidRequest - ); + final Result> result = target.makeBids(call, bidRequest); // then assertThat(result.getValue()).isEmpty(); @@ -333,14 +313,16 @@ private static BidResponse createBidResponse(List seatBids, String curr } private static Imp createImp(String id, String publisherId, int width, int height) { - final ObjectNode extNode = jacksonMapper.mapper().createObjectNode() - .putObject("bidder") + final ObjectNode bidderNode = jacksonMapper.mapper().createObjectNode() .put("publisherUniqueId", publisherId); + final ObjectNode extNode = jacksonMapper.mapper().createObjectNode(); + extNode.set("bidder", bidderNode); + return Imp.builder() .id(id) .banner(Banner.builder().w(width).h(height).build()) - .video(height > 250 ? com.iab.openrtb.request.Video.builder().w(width).h(height).build() : null) + .video(height > 250 ? Video.builder().w(width).h(height).build() : null) .ext(extNode) .build(); } @@ -360,4 +342,26 @@ private static AlvaAdsImp createAlvadsRequestImp(String impId, int width, int he .build(); } + private static BidderCall buildBidderCall( + List imps, + List seatBids, + String currency) { + + final BidResponse bidResponse = createBidResponse(seatBids, currency); + + final HttpResponse httpResponse = HttpResponse.of( + 200, + MultiMap.caseInsensitiveMultiMap(), + jacksonMapper.encodeToString(bidResponse) + ); + + final HttpRequest request = HttpRequest.builder() + .payload(AlvadsRequestOrtb.builder() + .imp(imps) + .build()) + .build(); + + return BidderCall.succeededHttp(request, httpResponse, null); + } + } From c4dc21eacb692a37c3d9ac3c507eb5b95a0f41b3 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Wed, 12 Nov 2025 08:38:50 -0400 Subject: [PATCH 15/16] fixes --- .../server/bidder/alvads/AlvadsBidder.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java index a085965c07e..dc111550a9f 100644 --- a/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java +++ b/src/main/java/org/prebid/server/bidder/alvads/AlvadsBidder.java @@ -56,7 +56,7 @@ public final Result>> makeHttpRequests(BidRe final List errors = new ArrayList<>(); final List> httpRequests = new ArrayList<>(); - for (Imp imp : bidRequest.getImp()) { + bidRequest.getImp().forEach(imp -> { try { final AlvadsImpExt impExt = parseImpExt(imp); final HttpRequest request = makeHttpRequest(bidRequest, imp, impExt); @@ -64,7 +64,7 @@ public final Result>> makeHttpRequests(BidRe } catch (PreBidException e) { errors.add(BidderError.badInput(e.getMessage())); } - } + }); return httpRequests.isEmpty() ? Result.withErrors(errors) : Result.of(httpRequests, errors); } @@ -113,10 +113,7 @@ private static AlvaAdsImp makeImp(Imp imp) { } private static Map sizes(Integer w, Integer h) { - if (w == null || h == null) { - return null; - } - return Map.of("w", w, "h", h); + return (w == null || h == null) ? null : Map.of("w", w, "h", h); } private static AlvaAdsSite makeSite(Site site, String publisherUniqueId) { @@ -158,32 +155,25 @@ private List bidsFromResponse(BidResponse bidResponse, AlvadsRequestO } private BidderBid makeBid(Bid bid, AlvadsRequestOrtb request, String currency) { - final AlvaAdsImp imp = request.getImp().stream() + return request.getImp().stream() .filter(i -> i.getId().equals(bid.getImpid())) .findFirst() + .map(imp -> BidderBid.of(bid, getBidType(bid, imp), currency)) .orElse(null); - - final BidType type = getBidType(bid, imp); - - if (type == null) { - return null; - } - - return BidderBid.of(bid, type, currency); } private BidType getBidType(Bid bid, AlvaAdsImp imp) { - if (imp != null) { - if (imp.getVideo() != null) { - return BidType.video; - } + if (imp == null) { + return BidType.banner; + } - return Optional.ofNullable(getBidExt(bid)) - .map(ExtBidAlvads::getCrtype) - .orElse(BidType.banner); + if (imp.getVideo() != null) { + return BidType.video; } - return null; + return Optional.ofNullable(getBidExt(bid)) + .map(ExtBidAlvads::getCrtype) + .orElse(BidType.banner); } private ExtBidAlvads getBidExt(Bid bid) { From 06e9df32c2c52b32aa57f86a0b1280d434f51f93 Mon Sep 17 00:00:00 2001 From: Samuel Alejandro Maldonado Garcia Date: Thu, 20 Nov 2025 08:11:02 -0400 Subject: [PATCH 16/16] fixes --- .../bidder/alvads/AlvadsBidderTest.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java index 783710bf1d0..0cd7b3600ce 100644 --- a/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/alvads/AlvadsBidderTest.java @@ -5,7 +5,9 @@ import com.iab.openrtb.request.BidRequest; import com.iab.openrtb.request.Device; import com.iab.openrtb.request.Imp; +import com.iab.openrtb.request.Regs; 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; @@ -149,21 +151,26 @@ public void makeHttpRequestsShouldBuildValidHttpRequestsFromInput() { final HttpRequest req1 = result.getValue().get(0); final HttpRequest req2 = result.getValue().get(1); - // --- Validate Request ID --- assertThat(req1.getPayload().getId()).isEqualTo("req-123"); assertThat(req2.getPayload().getId()).isEqualTo("req-123"); - // --- Validate Site content --- assertThat(req1.getPayload().getSite().getPage()) .isEqualTo("https://example.com"); assertThat(req2.getPayload().getSite().getPage()) .isEqualTo("https://example.com"); - // --- Validate Device presence (or specific fields if populated) --- - assertThat(req1.getPayload().getDevice()).isNotNull(); - assertThat(req2.getPayload().getDevice()).isNotNull(); + Device expectedDevice = bidRequest.getDevice(); + assertThat(req1.getPayload().getDevice()).isEqualTo(expectedDevice); + assertThat(req2.getPayload().getDevice()).isEqualTo(expectedDevice); + + User expectedUser = bidRequest.getUser(); + assertThat(req1.getPayload().getUser()).isEqualTo(expectedUser); + assertThat(req2.getPayload().getUser()).isEqualTo(expectedUser); + + Regs expectedRegs = bidRequest.getRegs(); + assertThat(req1.getPayload().getRegs()).isEqualTo(expectedRegs); + assertThat(req2.getPayload().getRegs()).isEqualTo(expectedRegs); - // --- Validate Imp content for req1 (banner) --- assertThat(req1.getPayload().getImp()) .hasSize(1) .extracting("id", "banner", "video")