diff --git a/src/main/java/org/prebid/server/bidder/floxis/FloxisBidder.java b/src/main/java/org/prebid/server/bidder/floxis/FloxisBidder.java index 7e51b073b12..e90d244338f 100644 --- a/src/main/java/org/prebid/server/bidder/floxis/FloxisBidder.java +++ b/src/main/java/org/prebid/server/bidder/floxis/FloxisBidder.java @@ -55,7 +55,7 @@ public FloxisBidder(String endpointUrl, JacksonMapper mapper) { @Override public Result>> makeHttpRequests(BidRequest request) { final List errors = new ArrayList<>(); - final Map> impsByHost = new LinkedHashMap<>(); + final Map> impsByUrl = new LinkedHashMap<>(); for (Imp imp : request.getImp()) { final ExtImpFloxis impExt; @@ -66,15 +66,13 @@ public Result>> makeHttpRequests(BidRequest request continue; } - impsByHost.computeIfAbsent( - new HostId(impExt.getSeat(), resolveBidHost(impExt)), key -> new ArrayList<>()) - .add(imp); + impsByUrl.computeIfAbsent(resolveUrl(impExt), key -> new ArrayList<>()).add(imp); } - final List> httpRequests = impsByHost.entrySet().stream() + final List> httpRequests = impsByUrl.entrySet().stream() .map(entry -> BidderUtil.defaultRequest( request.toBuilder().imp(entry.getValue()).build(), - resolveUrl(entry.getKey()), + entry.getKey(), mapper)) .toList(); @@ -99,10 +97,10 @@ private ExtImpFloxis parseImpExt(Imp imp) { return ExtImpFloxis.of(impExt.getSeat(), region, partner); } - private String resolveUrl(HostId hostId) { + private String resolveUrl(ExtImpFloxis impExt) { return endpointUrl - .replaceMacro(HOST_MACRO, hostId.host()) - .replaceMacro(SEAT_MACRO, hostId.seat()) + .replaceMacro(HOST_MACRO, resolveBidHost(impExt)) + .replaceMacro(SEAT_MACRO, impExt.getSeat()) .expand(); } @@ -201,7 +199,4 @@ private static int countFormats(Imp imp) { } return formats; } - - private record HostId(String seat, String host) { - } } diff --git a/src/main/resources/bidder-config/floxis.yaml b/src/main/resources/bidder-config/floxis.yaml index a2f058c5e14..a78060961a4 100644 --- a/src/main/resources/bidder-config/floxis.yaml +++ b/src/main/resources/bidder-config/floxis.yaml @@ -4,6 +4,18 @@ adapters: endpoint-compression: gzip ortb-version: "2.6" modifying-vast-xml-allowed: false + aliases: + adapex: + enabled: false + endpoint: https://hb.adapex.io/pbs?seat={SeatId} + meta-info: + vendor-id: 1609 + usersync: + enabled: true + cookie-family-name: adapex + redirect: + url: "https://sync.adapex.io/sync?gdpr={gdpr}&gdpr_consent={gdpr_consent}&gpp={gpp}&gpp_sid={gpp_sid}&us_privacy={us_privacy}&dest={redirect_url}" + uid-macro: "${USER_ID}" meta-info: maintainer-email: prebid@floxis.tech app-media-types: diff --git a/src/test/java/org/prebid/server/bidder/floxis/FloxisBidderTest.java b/src/test/java/org/prebid/server/bidder/floxis/FloxisBidderTest.java index f94d035289f..879b1661b24 100644 --- a/src/test/java/org/prebid/server/bidder/floxis/FloxisBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/floxis/FloxisBidderTest.java @@ -171,6 +171,49 @@ public void makeHttpRequestsShouldLeaveEndpointUnchangedWhenItDeclaresNoMacros() .containsExactly("http://localhost:8090/floxis-exchange"); } + @Test + public void makeHttpRequestsShouldIgnoreRegionAndPartnerWhenAliasEndpointDeclaresNoHostMacro() { + // given + final FloxisBidder bidder = new FloxisBidder("https://hb.adapex.io/pbs?seat={SeatId}", jacksonMapper); + final BidRequest bidRequest = givenBidRequest(imp -> imp.ext(givenImpExt("abc", "eu", "acme"))); + + // when + final Result>> result = bidder.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(1) + .extracting(HttpRequest::getUri) + .containsExactly("https://hb.adapex.io/pbs?seat=abc"); + } + + @Test + public void makeHttpRequestsShouldRouteOnceWhenImpsDifferOnlyInRegionAndPartnerOnAliasEndpoint() { + // given + final FloxisBidder bidder = new FloxisBidder("https://hb.adapex.io/pbs?seat={SeatId}", jacksonMapper); + final BidRequest bidRequest = BidRequest.builder() + .id("req-1") + .imp(asList( + givenImp(imp -> imp.id("imp-1").ext(givenImpExt("seat-a", "eu"))), + givenImp(imp -> imp.id("imp-2").ext(givenImpExt("seat-a", "apac", "acme"))), + givenImp(imp -> imp.id("imp-3").ext(givenImpExt("seat-b", "eu"))))) + .site(Site.builder().id("271").build()) + .build(); + + // when + final Result>> result = bidder.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()).hasSize(2) + .extracting(HttpRequest::getUri, request -> request.getPayload().getImp().stream() + .map(Imp::getId) + .toList()) + .containsExactly( + tuple("https://hb.adapex.io/pbs?seat=seat-a", asList("imp-1", "imp-2")), + tuple("https://hb.adapex.io/pbs?seat=seat-b", singletonList("imp-3"))); + } + @Test public void makeHttpRequestsShouldRouteOnceAndForwardAllImpsWhenSeatAndRegionMatch() { // given diff --git a/src/test/java/org/prebid/server/it/AdapexTest.java b/src/test/java/org/prebid/server/it/AdapexTest.java new file mode 100644 index 00000000000..fe66a4be058 --- /dev/null +++ b/src/test/java/org/prebid/server/it/AdapexTest.java @@ -0,0 +1,32 @@ +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 AdapexTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromAdapex() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/adapex-exchange")) + .withRequestBody(equalToJson(jsonFrom("openrtb2/adapex/test-adapex-bid-request.json"))) + .willReturn(aResponse().withBody(jsonFrom("openrtb2/adapex/test-adapex-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/adapex/test-auction-adapex-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/adapex/test-auction-adapex-response.json", response, singletonList("adapex")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-request.json new file mode 100644 index 00000000000..909c72773d0 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-request.json @@ -0,0 +1,66 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "secure": 1, + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "seat": "pub-seat-1" + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}", + "schain": { + "complete": 1, + "ver": "1.0", + "nodes": [ + { + "asi": "adapex.io", + "sid": "pub-seat-1", + "hp": 1 + } + ] + } + }, + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "cur": [ + "USD" + ], + "regs": { + "gdpr": 0 + }, + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "http_method": "POST", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-response.json new file mode 100644 index 00000000000..7c65e4bd1a4 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-adapex-bid-response.json @@ -0,0 +1,23 @@ +{ + "id": "request_id", + "cur": "USD", + "seatbid": [ + { + "seat": "adapex", + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 3.33, + "adid": "adid001", + "crid": "crid001", + "cid": "cid001", + "adm": "adm001", + "h": 250, + "w": 300, + "mtype": 1 + } + ] + } + ] +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-request.json b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-request.json new file mode 100644 index 00000000000..59bbdf3f678 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-request.json @@ -0,0 +1,35 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "adapex": { + "seat": "pub-seat-1" + } + } + } + ], + "source": { + "schain": { + "complete": 1, + "ver": "1.0", + "nodes": [ + { + "asi": "adapex.io", + "sid": "pub-seat-1", + "hp": 1 + } + ] + } + }, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-response.json b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-response.json new file mode 100644 index 00000000000..fa15ff0cca9 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/adapex/test-auction-adapex-response.json @@ -0,0 +1,44 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "price": 3.33, + "adm": "adm001", + "adid": "adid001", + "cid": "cid001", + "crid": "crid001", + "w": 300, + "h": 250, + "exp": 300, + "mtype": 1, + "ext": { + "prebid": { + "type": "banner", + "meta": { + "adaptercode": "adapex" + } + }, + "origbidcpm": 3.33, + "origbidcur": "USD" + } + } + ], + "seat": "adapex", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "adapex": "{{ adapex.response_time_ms }}" + }, + "prebid": { + "auctiontimestamp": 0 + }, + "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 cc1a749d4ba..01456426dd0 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -271,6 +271,8 @@ adapters.flipp.enabled=true adapters.flipp.endpoint=http://localhost:8090/flipp-exchange adapters.floxis.enabled=true adapters.floxis.endpoint=http://localhost:8090/floxis-exchange +adapters.floxis.aliases.adapex.enabled=true +adapters.floxis.aliases.adapex.endpoint=http://localhost:8090/adapex-exchange adapters.audiencenetwork.enabled=true adapters.audiencenetwork.endpoint=http://localhost:8090/audienceNetwork-exchange adapters.audiencenetwork.timeout-notification-url-template=http://localhost:8090/audienceNetwork-timeout