Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions src/main/java/org/prebid/server/bidder/ogury/OguryBidder.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,17 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
}
}

if (!isValidRequestKeys(bidRequest, impsWithOguryParams)) {
errors.add(BidderError.badInput(
"Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
return Result.withErrors(errors);
if (CollectionUtils.isEmpty(impsWithOguryParams)) {
if (bidRequest.getApp() != null) {
errors.add(BidderError.badInput("Invalid request. assetKey/adUnitId required"));
return Result.withErrors(errors);
}
// for "site" request we can serve ads with just publisher.id
if (!hasPublisherId(bidRequest)) {
errors.add(BidderError.badInput(
"Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
return Result.withErrors(errors);
}
}

final BidRequest modifiedBidRequest = bidRequest.toBuilder()
Expand Down Expand Up @@ -137,8 +144,8 @@ private boolean hasOguryParams(Imp imp) {
&& impExtBidderHoist.has(PREBID_FIELD_ADUNIT_ID);
}

private boolean isValidRequestKeys(BidRequest request, List<Imp> impsWithOguryParams) {
return !CollectionUtils.isEmpty(impsWithOguryParams) || Optional.ofNullable(request.getSite())
private boolean hasPublisherId(BidRequest request) {
return Optional.ofNullable(request.getSite())
.map(Site::getPublisher)
.map(Publisher::getId)
.isPresent();
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/bidder-config/ogury.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ adapters:
maintainer-email: deliveryservices@ogury.co
site-media-types:
- banner
app-media-types:
- banner
vendor-id: 31
usersync:
cookie-family-name: ogury
Expand Down
46 changes: 46 additions & 0 deletions src/test/java/org/prebid/server/bidder/ogury/OguryBidderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.iab.openrtb.request.App;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Device;
import com.iab.openrtb.request.Imp;
Expand Down Expand Up @@ -191,6 +192,47 @@ public void makeHttpRequestsShouldNotSendImpsWhenHasNotPublisherIdAndImpsWithOgu
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
}

@Test
public void makeHttpRequestsAppShouldSendOnlyImpsWithOguryParamsIfPresent() {
// given
final BidRequest bidrequest = givenBidRequest(
bidRequest -> bidRequest.app(givenApp()),
givenImp(imp -> imp.id("without_ogury_keys").ext(givenEmptyImpExt())),
givenImp(imp -> imp.id("with_ogury_keys").ext(givenImpExtWithOguryKeys())));

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

// then
assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getPayload)
.flatExtracting(BidRequest::getImp)
.extracting(Imp::getId)
.containsExactly("with_ogury_keys");

assertThat(result.getErrors()).isEmpty();
}

@Test
public void makeHttpRequestsAppShouldNotSendImpsWhenImpsWithOguryIsEmpty() {
// given
final ObjectNode emptyImpExt = givenEmptyImpExt();

final BidRequest bidrequest = givenBidRequest(
bidRequest -> bidRequest.app(givenApp()),
givenImp(imp -> imp.id("id1").ext(emptyImpExt)),
givenImp(imp -> imp.id("id2").ext(emptyImpExt)));

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

// then
assertThat(result.getValue()).isEmpty();

assertThat(result.getErrors()).containsExactly(
BidderError.badInput("Invalid request. assetKey/adUnitId required"));
}

@Test
public void makeHttpRequestsShouldCopyImpIdToTagId() {
// given
Expand Down Expand Up @@ -564,6 +606,10 @@ private Site givenSite() {
.build();
}

private App givenApp() {
return App.builder().bundle("app_bundle").build();
}

private ObjectNode givenEmptyImpExt() {
final ObjectNode ext = mapper.createObjectNode();
ext.putIfAbsent("bidder", mapper.createObjectNode());
Expand Down
Loading