From 8cc1bcf58d50f9d4e5d6f1c04e0c905c76baa01d Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Fri, 7 Feb 2025 15:17:47 +0100 Subject: [PATCH 1/5] New adapter: Connektai - Xeworks alias #3730 --- .../resources/bidder-config/connektai.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/resources/bidder-config/connektai.yaml diff --git a/src/main/resources/bidder-config/connektai.yaml b/src/main/resources/bidder-config/connektai.yaml new file mode 100644 index 00000000000..ee4f3885410 --- /dev/null +++ b/src/main/resources/bidder-config/connektai.yaml @@ -0,0 +1,20 @@ +adapters: + connektai: + endpoint: http://rtb.connektai.live/?pid={{.SourceId}}&host={{.Host}}&s=pbs + aliases: + xeworks: + meta-info: + maintainer-email: adops@connekt.ai + app-media-types: + - banner + - video + - native + site-media-types: + - banner + - video + - native + supported-vendors: + vendor-id: 0 + usersync: + cookie-family-name: xeworks + redirect: From 559082ab3a886da5a5314031244c93170744492f Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 11 Feb 2025 12:56:59 +0100 Subject: [PATCH 2/5] fix comments --- .../resources/bidder-config/connektai.yaml | 20 ------- src/main/resources/bidder-config/xeworks.yaml | 19 +++++++ .../org/prebid/server/it/ConnektaiTest.java | 35 ++++++++++++ .../test-auction-connektai-request.json | 24 ++++++++ .../test-auction-connektai-response.json | 38 +++++++++++++ .../connektai/test-connektai-bid-request.json | 57 +++++++++++++++++++ .../test-connektai-bid-response.json | 23 ++++++++ .../server/it/test-application.properties | 1 + 8 files changed, 197 insertions(+), 20 deletions(-) delete mode 100644 src/main/resources/bidder-config/connektai.yaml create mode 100644 src/test/java/org/prebid/server/it/ConnektaiTest.java create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-response.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-request.json create mode 100644 src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-response.json diff --git a/src/main/resources/bidder-config/connektai.yaml b/src/main/resources/bidder-config/connektai.yaml deleted file mode 100644 index ee4f3885410..00000000000 --- a/src/main/resources/bidder-config/connektai.yaml +++ /dev/null @@ -1,20 +0,0 @@ -adapters: - connektai: - endpoint: http://rtb.connektai.live/?pid={{.SourceId}}&host={{.Host}}&s=pbs - aliases: - xeworks: - meta-info: - maintainer-email: adops@connekt.ai - app-media-types: - - banner - - video - - native - site-media-types: - - banner - - video - - native - supported-vendors: - vendor-id: 0 - usersync: - cookie-family-name: xeworks - redirect: diff --git a/src/main/resources/bidder-config/xeworks.yaml b/src/main/resources/bidder-config/xeworks.yaml index 339a40178ce..f56a4b5803c 100644 --- a/src/main/resources/bidder-config/xeworks.yaml +++ b/src/main/resources/bidder-config/xeworks.yaml @@ -1,6 +1,25 @@ adapters: xeworks: endpoint: http://prebid-srv.xe.works/?pid={{SourceId}}&host={{Host}} + aliases: + connektai: + enabled: false + endpoint: http://rtb.connektai.live/?pid={{SourceId}}&host={{Host}}&s=pbs + meta-info: + maintainer-email: adops@connekt.ai + app-media-types: + - banner + - video + - native + site-media-types: + - banner + - video + - native + supported-vendors: + vendor-id: 0 + usersync: + cookie-family-name: xeworks + redirect: meta-info: maintainer-email: team@xe.works app-media-types: diff --git a/src/test/java/org/prebid/server/it/ConnektaiTest.java b/src/test/java/org/prebid/server/it/ConnektaiTest.java new file mode 100644 index 00000000000..8cd6bce5756 --- /dev/null +++ b/src/test/java/org/prebid/server/it/ConnektaiTest.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 ConnektaiTest extends IntegrationTest { + + @Test + public void openrtb2AuctionShouldRespondWithBidsFromConnektai() throws IOException, JSONException { + // given + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/xeworks-exchange")) + .withRequestBody(equalToJson( + jsonFrom("openrtb2/connektai/test-connektai-bid-request.json"))) + .willReturn(aResponse().withBody( + jsonFrom("openrtb2/connektai/test-connektai-bid-response.json")))); + + // when + final Response response = responseFor("openrtb2/connektai/test-auction-connektai-request.json", + Endpoint.openrtb2_auction); + + // then + assertJsonEquals("openrtb2/connektai/test-auction-connektai-response.json", response, + singletonList("connektai")); + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-request.json b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-request.json new file mode 100644 index 00000000000..0c48b1eb28d --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-request.json @@ -0,0 +1,24 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "connektai": { + "env": "envValue", + "pid": "pidValue" + } + } + } + ], + "tmax": 5000, + "regs": { + "ext": { + "gdpr": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-response.json b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-response.json new file mode 100644 index 00000000000..66239692835 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-auction-connektai-response.json @@ -0,0 +1,38 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "exp": 300, + "price": 11.393, + "adm": "some adm value", + "adomain": [ + ], + "crid": "test-creative-id-1", + "ext": { + "prebid": { + "type": "banner" + }, + "origbidcpm": 10, + "origbidcur": "EUR" + } + } + ], + "seat": "connektai", + "group": 0 + } + ], + "cur": "USD", + "ext": { + "responsetimemillis": { + "connektai": "{{ connektai.response_time_ms }}" + }, + "tmaxrequest": 5000, + "prebid": { + "auctiontimestamp": 0 + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-request.json new file mode 100644 index 00000000000..9849089cf56 --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-request.json @@ -0,0 +1,57 @@ +{ + "id": "request_id", + "imp": [ + { + "id": "imp_id", + "secure": 1, + "banner": { + "w": 300, + "h": 250 + }, + "ext": { + "tid": "${json-unit.any-string}", + "bidder": { + "env": "envValue", + "pid": "pidValue" + } + } + } + ], + "source": { + "tid": "${json-unit.any-string}" + }, + "site": { + "domain": "www.example.com", + "page": "http://www.example.com", + "publisher": { + "domain": "example.com" + }, + "ext": { + "amp": 0 + } + }, + "device": { + "ua": "userAgent", + "ip": "193.168.244.1" + }, + "at": 1, + "tmax": "${json-unit.any-number}", + "regs": { + "ext": { + "gdpr": 0 + } + }, + "cur": [ + "USD" + ], + "ext": { + "prebid": { + "server": { + "externalurl": "http://localhost:8080", + "gvlid": 1, + "datacenter": "local", + "endpoint": "/openrtb2/auction" + } + } + } +} diff --git a/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-response.json b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-response.json new file mode 100644 index 00000000000..164be5d891e --- /dev/null +++ b/src/test/resources/org/prebid/server/it/openrtb2/connektai/test-connektai-bid-response.json @@ -0,0 +1,23 @@ +{ + "id": "request_id", + "seatbid": [ + { + "bid": [ + { + "id": "bid_id", + "impid": "imp_id", + "adm": "some adm value", + "price": 10, + "adomain": [], + "crid": "test-creative-id-1", + "ext": { + "prebid": { + "type": "banner" + } + } + } + ] + } + ], + "cur": "EUR" +} 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 2e115d00348..eaaf268dec4 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -500,6 +500,7 @@ adapters.vrtcal.enabled=true adapters.vrtcal.endpoint=http://localhost:8090/vrtcal-exchange adapters.xeworks.enabled=true adapters.xeworks.endpoint=http://localhost:8090/xeworks-exchange +adapters.xeworks.aliases.connektai=true adapters.vidazoo.enabled=true adapters.vidazoo.endpoint=http://localhost:8090/vidazoo-exchange/ adapters.videobyte.enabled=true From 569fbbcf4815f264ebc1a4fc57cfaaf2bd260d7b Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 11 Feb 2025 13:35:47 +0100 Subject: [PATCH 3/5] fix yaml --- src/main/resources/bidder-config/xeworks.yaml | 13 ------------- .../java/org/prebid/server/it/ConnektaiTest.java | 2 +- .../prebid/server/it/test-application.properties | 3 ++- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/resources/bidder-config/xeworks.yaml b/src/main/resources/bidder-config/xeworks.yaml index f56a4b5803c..4280d88ce95 100644 --- a/src/main/resources/bidder-config/xeworks.yaml +++ b/src/main/resources/bidder-config/xeworks.yaml @@ -7,19 +7,6 @@ adapters: endpoint: http://rtb.connektai.live/?pid={{SourceId}}&host={{Host}}&s=pbs meta-info: maintainer-email: adops@connekt.ai - app-media-types: - - banner - - video - - native - site-media-types: - - banner - - video - - native - supported-vendors: - vendor-id: 0 - usersync: - cookie-family-name: xeworks - redirect: meta-info: maintainer-email: team@xe.works app-media-types: diff --git a/src/test/java/org/prebid/server/it/ConnektaiTest.java b/src/test/java/org/prebid/server/it/ConnektaiTest.java index 8cd6bce5756..7a4dc64aaf5 100644 --- a/src/test/java/org/prebid/server/it/ConnektaiTest.java +++ b/src/test/java/org/prebid/server/it/ConnektaiTest.java @@ -18,7 +18,7 @@ public class ConnektaiTest extends IntegrationTest { @Test public void openrtb2AuctionShouldRespondWithBidsFromConnektai() throws IOException, JSONException { // given - WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/xeworks-exchange")) + WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/connektai-exchange")) .withRequestBody(equalToJson( jsonFrom("openrtb2/connektai/test-connektai-bid-request.json"))) .willReturn(aResponse().withBody( 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 eaaf268dec4..e13bacc5614 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -500,7 +500,8 @@ adapters.vrtcal.enabled=true adapters.vrtcal.endpoint=http://localhost:8090/vrtcal-exchange adapters.xeworks.enabled=true adapters.xeworks.endpoint=http://localhost:8090/xeworks-exchange -adapters.xeworks.aliases.connektai=true +adapters.xeworks.aliases.connektai.enabled=true +adapters.xeworks.aliases.connektai.endpoint=http://localhost:8090/connektai-exchange adapters.vidazoo.enabled=true adapters.vidazoo.endpoint=http://localhost:8090/vidazoo-exchange/ adapters.videobyte.enabled=true From 4f7511471920b796064a8fb69fea7a6e0d629ca6 Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Wed, 12 Feb 2025 16:31:16 +0100 Subject: [PATCH 4/5] fix comments --- src/test/java/org/prebid/server/it/ConnektaiTest.java | 3 +++ .../resources/org/prebid/server/it/test-application.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/prebid/server/it/ConnektaiTest.java b/src/test/java/org/prebid/server/it/ConnektaiTest.java index 7a4dc64aaf5..36fd9a872c8 100644 --- a/src/test/java/org/prebid/server/it/ConnektaiTest.java +++ b/src/test/java/org/prebid/server/it/ConnektaiTest.java @@ -8,6 +8,7 @@ import java.io.IOException; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; 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; @@ -19,6 +20,8 @@ public class ConnektaiTest extends IntegrationTest { public void openrtb2AuctionShouldRespondWithBidsFromConnektai() throws IOException, JSONException { // given WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/connektai-exchange")) + .withQueryParam("host", equalTo("envValue")) + .withQueryParam("sourceId", equalTo("pidValue")) .withRequestBody(equalToJson( jsonFrom("openrtb2/connektai/test-connektai-bid-request.json"))) .willReturn(aResponse().withBody( 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 e13bacc5614..49564d352f5 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -501,7 +501,7 @@ adapters.vrtcal.endpoint=http://localhost:8090/vrtcal-exchange adapters.xeworks.enabled=true adapters.xeworks.endpoint=http://localhost:8090/xeworks-exchange adapters.xeworks.aliases.connektai.enabled=true -adapters.xeworks.aliases.connektai.endpoint=http://localhost:8090/connektai-exchange +adapters.xeworks.aliases.connektai.endpoint=http://localhost:8090/connektai-exchange?host={{Host}}&sourceId={{SourceId}} adapters.vidazoo.enabled=true adapters.vidazoo.endpoint=http://localhost:8090/vidazoo-exchange/ adapters.videobyte.enabled=true From e7f0f04a15075a7da989242d771e1f62504fc2bc Mon Sep 17 00:00:00 2001 From: pkaczmarek Date: Tue, 18 Feb 2025 12:36:38 +0100 Subject: [PATCH 5/5] fix comments --- src/test/java/org/prebid/server/it/ConnektaiTest.java | 3 --- .../resources/org/prebid/server/it/test-application.properties | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/test/java/org/prebid/server/it/ConnektaiTest.java b/src/test/java/org/prebid/server/it/ConnektaiTest.java index 36fd9a872c8..7a4dc64aaf5 100644 --- a/src/test/java/org/prebid/server/it/ConnektaiTest.java +++ b/src/test/java/org/prebid/server/it/ConnektaiTest.java @@ -8,7 +8,6 @@ import java.io.IOException; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; 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; @@ -20,8 +19,6 @@ public class ConnektaiTest extends IntegrationTest { public void openrtb2AuctionShouldRespondWithBidsFromConnektai() throws IOException, JSONException { // given WIRE_MOCK_RULE.stubFor(post(urlPathEqualTo("/connektai-exchange")) - .withQueryParam("host", equalTo("envValue")) - .withQueryParam("sourceId", equalTo("pidValue")) .withRequestBody(equalToJson( jsonFrom("openrtb2/connektai/test-connektai-bid-request.json"))) .willReturn(aResponse().withBody( 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 49564d352f5..e13bacc5614 100644 --- a/src/test/resources/org/prebid/server/it/test-application.properties +++ b/src/test/resources/org/prebid/server/it/test-application.properties @@ -501,7 +501,7 @@ adapters.vrtcal.endpoint=http://localhost:8090/vrtcal-exchange adapters.xeworks.enabled=true adapters.xeworks.endpoint=http://localhost:8090/xeworks-exchange adapters.xeworks.aliases.connektai.enabled=true -adapters.xeworks.aliases.connektai.endpoint=http://localhost:8090/connektai-exchange?host={{Host}}&sourceId={{SourceId}} +adapters.xeworks.aliases.connektai.endpoint=http://localhost:8090/connektai-exchange adapters.vidazoo.enabled=true adapters.vidazoo.endpoint=http://localhost:8090/vidazoo-exchange/ adapters.videobyte.enabled=true