Skip to content

[pull] master from prebid:master #73

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

Merged
pull merged 2 commits into from
Jan 13, 2026
Merged

[pull] master from prebid:master #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cdb2d1
Ogury: Allow inventory mapping for in-app traffic. (#4321)
crepi Jan 13, 2026
25f7b49
RTBHouse: Extract tagid from Imp fields (#4306)
pjaworski-rtbh Jan 13, 2026
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
20 changes: 14 additions & 6 deletions src/main/java/org/prebid/server/bidder/ogury/OguryBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.prebid.server.bidder.ogury;

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 @@ -71,14 +72,10 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
}

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
// 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"));
"Invalid request. assetKey/adUnitId or request.site/app.publisher.id required"));
return Result.withErrors(errors);
}
}
Expand Down Expand Up @@ -145,12 +142,23 @@ private boolean hasOguryParams(Imp imp) {
}

private boolean hasPublisherId(BidRequest request) {
return hasSitePublisherId(request) || hasAppPublisherId(request);
}

private boolean hasSitePublisherId(BidRequest request) {
return Optional.ofNullable(request.getSite())
.map(Site::getPublisher)
.map(Publisher::getId)
.isPresent();
}

private boolean hasAppPublisherId(BidRequest request) {
return Optional.ofNullable(request.getApp())
.map(App::getPublisher)
.map(Publisher::getId)
.isPresent();
}

private MultiMap resolveHeaders(Device device) {
final MultiMap headers = HttpUtil.headers();

Expand Down
194 changes: 115 additions & 79 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 @@ -94,6 +94,110 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
return Result.withValue(BidderUtil.defaultRequest(outgoingRequest, endpointUrl, mapper));
}

private ExtImpRtbhouse parseImpExt(Imp imp) {
try {
return mapper.mapper().convertValue(imp.getExt(), RTBHOUSE_EXT_TYPE_REFERENCE).getBidder();
} catch (IllegalArgumentException e) {
throw new PreBidException(e.getMessage());
}
}

private Price resolveBidFloor(Imp imp, ExtImpRtbhouse impExt, BidRequest bidRequest) {
final List<String> brCur = bidRequest.getCur();
final Price initialBidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor());

final BigDecimal impExtBidFloor = impExt.getBidFloor();
final String impExtCurrency = impExtBidFloor != null && brCur != null && !brCur.isEmpty()
? brCur.getFirst() : null;
final Price impExtBidFloorPrice = Price.of(impExtCurrency, impExtBidFloor);
final Price resolvedPrice = initialBidFloorPrice.getValue() == null
? impExtBidFloorPrice : initialBidFloorPrice;

return BidderUtil.isValidPrice(resolvedPrice)
&& !StringUtils.equalsIgnoreCase(resolvedPrice.getCurrency(), BIDDER_CURRENCY)
? convertBidFloor(resolvedPrice, imp.getId(), bidRequest)
: resolvedPrice;
}

private Price convertBidFloor(Price bidFloorPrice, String impId, BidRequest bidRequest) {
final String bidFloorCur = bidFloorPrice.getCurrency();
try {
final BigDecimal convertedPrice = currencyConversionService
.convertCurrency(bidFloorPrice.getValue(), bidRequest, bidFloorCur, BIDDER_CURRENCY);

return Price.of(BIDDER_CURRENCY, convertedPrice);
} catch (PreBidException e) {
throw new PreBidException(String.format(
"Unable to convert provided bid floor currency from %s to %s for imp `%s`",
bidFloorCur, BIDDER_CURRENCY, impId));
}
}

private static Imp modifyImp(Imp imp, Price bidFloorPrice) {
return imp.toBuilder()
.tagid(extractTagId(imp))
.bidfloorcur(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getCurrency))
.bidfloor(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getValue))
.pmp(null)
.build();
}

private static String extractTagId(Imp imp) {
return Optional.ofNullable(imp.getTagid())
.filter(StringUtils::isNotBlank)
.or(() -> extractGpid(imp))
.or(() -> extractAdslot(imp))
.or(() -> extractPbadslot(imp))
.or(() -> Optional.ofNullable(imp.getId())
.filter(StringUtils::isNotBlank))
.orElse(null);
}

private static Optional<String> extractGpid(Imp imp) {
return Optional.ofNullable(imp.getExt())
.map(ext -> ext.get("gpid"))
.map(JsonNode::textValue)
.filter(StringUtils::isNotBlank);
}

private static Optional<String> extractAdslot(Imp imp) {
return Optional.ofNullable(imp.getExt())
.map(ext -> ext.get("data"))
.map(data -> data.get("adserver"))
.map(adserver -> adserver.get("adslot"))
.map(JsonNode::textValue)
.filter(StringUtils::isNotBlank);
}

private static Optional<String> extractPbadslot(Imp imp) {
return Optional.ofNullable(imp.getExt())
.map(ext -> ext.get("data"))
.map(data -> data.get("pbadslot"))
.map(JsonNode::textValue)
.filter(StringUtils::isNotBlank);
}

private Site modifySite(Site site, 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)
.map(Publisher::toBuilder)
.orElseGet(Publisher::builder)
.ext(extPublisher)
.build();

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

@Override
public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
try {
Expand Down Expand Up @@ -144,23 +248,6 @@ private BidderBid resolveBidderBid(Bid bid,
.build();
}

private String resolveNativeAdm(String adm, List<BidderError> bidderErrors) {
final JsonNode admNode;
try {
admNode = mapper.mapper().readTree(adm);
} catch (JsonProcessingException e) {
bidderErrors.add(BidderError.badServerResponse("Unable to parse native adm: %s".formatted(adm)));
return null;
}

final JsonNode nativeNode = admNode.get("native");
if (nativeNode != null) {
return nativeNode.toString();
}

return adm;
}

private static BidType getBidType(String impId, List<Imp> imps) {
for (Imp imp : imps) {
if (imp.getId().equals(impId)) {
Expand All @@ -176,51 +263,21 @@ private static BidType getBidType(String impId, List<Imp> imps) {
return BidType.banner;
}

private ExtImpRtbhouse parseImpExt(Imp imp) {
private String resolveNativeAdm(String adm, List<BidderError> bidderErrors) {
final JsonNode admNode;
try {
return mapper.mapper().convertValue(imp.getExt(), RTBHOUSE_EXT_TYPE_REFERENCE).getBidder();
} catch (IllegalArgumentException e) {
throw new PreBidException(e.getMessage());
admNode = mapper.mapper().readTree(adm);
} catch (JsonProcessingException e) {
bidderErrors.add(BidderError.badServerResponse("Unable to parse native adm: %s".formatted(adm)));
return null;
}
}

private static Imp modifyImp(Imp imp, Price bidFloorPrice) {
return imp.toBuilder()
.bidfloorcur(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getCurrency))
.bidfloor(ObjectUtil.getIfNotNull(bidFloorPrice, Price::getValue))
.pmp(null)
.build();
}

private Price resolveBidFloor(Imp imp, ExtImpRtbhouse impExt, BidRequest bidRequest) {
final List<String> brCur = bidRequest.getCur();
final Price initialBidFloorPrice = Price.of(imp.getBidfloorcur(), imp.getBidfloor());

final BigDecimal impExtBidFloor = impExt.getBidFloor();
final String impExtCurrency = impExtBidFloor != null && brCur != null && !brCur.isEmpty()
? brCur.getFirst() : null;
final Price impExtBidFloorPrice = Price.of(impExtCurrency, impExtBidFloor);
final Price resolvedPrice = initialBidFloorPrice.getValue() == null
? impExtBidFloorPrice : initialBidFloorPrice;

return BidderUtil.isValidPrice(resolvedPrice)
&& !StringUtils.equalsIgnoreCase(resolvedPrice.getCurrency(), BIDDER_CURRENCY)
? convertBidFloor(resolvedPrice, imp.getId(), bidRequest)
: resolvedPrice;
}

private Price convertBidFloor(Price bidFloorPrice, String impId, BidRequest bidRequest) {
final String bidFloorCur = bidFloorPrice.getCurrency();
try {
final BigDecimal convertedPrice = currencyConversionService
.convertCurrency(bidFloorPrice.getValue(), bidRequest, bidFloorCur, BIDDER_CURRENCY);

return Price.of(BIDDER_CURRENCY, convertedPrice);
} catch (PreBidException e) {
throw new PreBidException(String.format(
"Unable to convert provided bid floor currency from %s to %s for imp `%s`",
bidFloorCur, BIDDER_CURRENCY, impId));
final JsonNode nativeNode = admNode.get("native");
if (nativeNode != null) {
return nativeNode.toString();
}

return adm;
}

private static Bid resolveMacros(Bid bid) {
Expand All @@ -232,25 +289,4 @@ private static Bid resolveMacros(Bid bid) {
.adm(StringUtils.replace(bid.getAdm(), PRICE_MACRO, priceAsString))
.build();
}

private Site modifySite(Site site, 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)
.map(Publisher::toBuilder)
.orElseGet(Publisher::builder)
.ext(extPublisher)
.build();

return Optional.ofNullable(site)
.map(Site::toBuilder)
.orElseGet(Site::builder)
.publisher(publisher)
.build();
}
}
40 changes: 33 additions & 7 deletions src/test/java/org/prebid/server/bidder/ogury/OguryBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,9 @@ public void makeHttpRequestsShouldReturnErrorWhenRequestDoesNotHaveOguryKeys() {

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

// then
assertThat(result.getErrors()).containsExactly(
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site/app.publisher.id required"));
}

@Test
Expand Down Expand Up @@ -189,7 +188,7 @@ public void makeHttpRequestsShouldNotSendImpsWhenHasNotPublisherIdAndImpsWithOgu
assertThat(result.getValue()).isEmpty();

assertThat(result.getErrors()).containsExactly(
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site.publisher.id required"));
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site/app.publisher.id required"));
}

@Test
Expand All @@ -214,7 +213,7 @@ public void makeHttpRequestsAppShouldSendOnlyImpsWithOguryParamsIfPresent() {
}

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

Expand All @@ -226,11 +225,33 @@ public void makeHttpRequestsAppShouldNotSendImpsWhenImpsWithOguryIsEmpty() {
// when
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidrequest);

// then
assertThat(result.getValue()).hasSize(1)
.extracting(HttpRequest::getPayload)
.flatExtracting(BidRequest::getImp)
.hasSize(2);

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

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

final BidRequest bidrequest = givenBidRequest(
bidRequest -> bidRequest.app(App.builder().bundle("app_bundle").build()),
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"));
BidderError.badInput("Invalid request. assetKey/adUnitId or request.site/app.publisher.id required"));
}

@Test
Expand Down Expand Up @@ -260,7 +281,7 @@ public void makeHttpRequestsShouldCleanImpExtWithoutLostExtraFields() {
extWithOguryKeys.put("extra_field", "extra_value");

final BidRequest bidrequest = givenBidRequest(
identity(),
bidRequest -> bidRequest.site(givenSite()),
givenImp(imp -> imp.id("id1").ext(extWithOguryKeys)));

// when
Expand Down Expand Up @@ -607,7 +628,12 @@ private Site givenSite() {
}

private App givenApp() {
return App.builder().bundle("app_bundle").build();
return App.builder()
.bundle("app_bundle")
.publisher(Publisher.builder()
.id("publiser_id")
.build())
.build();
}

private ObjectNode givenEmptyImpExt() {
Expand Down
Loading
Loading