Skip to content

RTBHouse: Fix unintended site object creation for app requests #4531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pjaworski-rtbh wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −15
Open

RTBHouse: Fix unintended site object creation for app requests #4531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/main/java/org/prebid/server/bidder/rtbhouse/RtbhouseBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.App;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.request.Publisher;
Expand Down Expand Up @@ -88,6 +89,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
final BidRequest outgoingRequest = bidRequest.toBuilder()
.cur(Collections.singletonList(BIDDER_CURRENCY))
.site(modifySite(bidRequest.getSite(), publisherId))
.app(modifyApp(bidRequest.getApp(), publisherId))
.imp(modifiedImps)
.build();

Expand Down Expand Up @@ -178,24 +180,33 @@ private static Optional<String> extractPbadslot(Imp imp) {
}

private Site modifySite(Site site, String publisherId) {
return Optional.ofNullable(site)
.map(Site::toBuilder)
.map(builder -> builder.publisher(modifyPublisher(site.getPublisher(), publisherId)))
.map(Site.SiteBuilder::build)
.orElse(site);
}

private App modifyApp(App app, String publisherId) {
return Optional.ofNullable(app)
.map(App::toBuilder)
.map(builder -> builder.publisher(modifyPublisher(app.getPublisher(), publisherId)))
.map(App.AppBuilder::build)
.orElse(app);
}

private Publisher modifyPublisher(Publisher publisher, String publisherId) {
final ObjectNode prebidNode = mapper.mapper().createObjectNode();
prebidNode.put("publisherId", publisherId);

final ExtPublisher extPublisher = ExtPublisher.empty();
extPublisher.addProperty("prebid", prebidNode);

final Publisher publisher = Optional.ofNullable(site)
.map(Site::getPublisher)
return Optional.ofNullable(publisher)
.map(Publisher::toBuilder)
.orElseGet(Publisher::builder)
.ext(extPublisher)
.build();

return Optional.ofNullable(site)
.map(Site::toBuilder)
.orElseGet(Site::builder)
.publisher(publisher)
.build();
}

@Override
Expand Down
34 changes: 27 additions & 7 deletions src/test/java/org/prebid/server/bidder/rtbhouse/RtbhouseBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.App;
import com.iab.openrtb.request.Banner;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Deal;
Expand Down Expand Up @@ -189,10 +190,10 @@ public void makeHttpRequestsShouldNotReturnErrorIfNativePresent() {
}

@Test
public void makeHttpRequestsShouldCreateSiteAndPublisherWhenBidRequestHasNoSite() {
public void makeHttpRequestsShouldNotCreateSiteWhenBidRequestHasAppOnly() {
// given
final BidRequest bidRequest = givenBidRequest(
bidReq -> bidReq.site(null),
bidReq -> bidReq.site(null).app(App.builder().id("app_id").build()),
identity(),
identity());

Expand All @@ -204,12 +205,31 @@ public void makeHttpRequestsShouldCreateSiteAndPublisherWhenBidRequestHasNoSite(
assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getPayload)
.extracting(BidRequest::getSite)
.allSatisfy(site -> {
assertThat(site).isNotNull();
assertThat(site.getPublisher()).isNotNull();
assertThat(site.getPublisher().getExt()).isNotNull();
.containsOnlyNulls();
}

final JsonNode prebidNode = site.getPublisher().getExt().getProperty("prebid");
@Test
public void makeHttpRequestsShouldAddPublisherToAppWhenBidRequestHasAppOnly() {
// given
final BidRequest bidRequest = givenBidRequest(
bidReq -> bidReq.site(null).app(App.builder().id("app_id").build()),
identity(),
identity());

// when
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);

// then
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getPayload)
.extracting(BidRequest::getApp)
.allSatisfy(app -> {
assertThat(app.getId()).isEqualTo("app_id");
assertThat(app.getPublisher()).isNotNull();
assertThat(app.getPublisher().getExt()).isNotNull();

final JsonNode prebidNode = app.getPublisher().getExt().getProperty("prebid");
assertThat(prebidNode).isNotNull();
assertThat(prebidNode.get("publisherId").asText()).isEqualTo("publisherId");
});
Expand Down