Skip to content
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

Jump to bottom

Add DmxBidder and tests #859

Merged
merged 9 commits into from
Sep 23, 2020
Merged

Add DmxBidder and tests #859

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f5a57c
Add DmxBidder and tests
AndriyPavlyuk Aug 12, 2020
0f2e236
Merge branch 'master' into add-dmx-bidder
AndriyPavlyuk Sep 19, 2020
c2e737c
Fixing bug and refactoring methods
AndriyPavlyuk Sep 19, 2020
c412805
Refactoring code related to site and hasId
AndriyPavlyuk Sep 22, 2020
dd115ef
Merge branch 'master' into add-dmx-bidder
AndriyPavlyuk Sep 22, 2020
9092cdf
Merge branch 'master' into add-dmx-bidder
AndriyPavlyuk Sep 22, 2020
f04a743
Merge branch 'master' into add-dmx-bidder
AndriyPavlyuk Sep 22, 2020
9f3bd95
Merge branch 'master' into add-dmx-bidder
Sep 23, 2020
ceae089
Clean code
Sep 23, 2020
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
136 changes: 69 additions & 67 deletions src/main/java/org/prebid/server/bidder/dmx/DmxBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,32 @@ public DmxBidder(String endpointUrl, JacksonMapper mapper) {

@Override
public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request) {
final List<BidderError> errors = new ArrayList<>();
final List<Imp> validImps = new ArrayList<>();

if (request.getUser() == null) {
if (request.getApp() == null) {
errors.add(BidderError.badInput("No user id or app id found. Could not send request to DMX."));
return Result.of(Collections.emptyList(), errors);
}
if (request.getUser() == null && request.getApp() == null) {
return Result.emptyWithError(BidderError
.badInput("No user id or app id found. Could not send request to DMX."));
}

final List<BidderError> errors = new ArrayList<>();
final List<Imp> validImps = new ArrayList<>();
final List<Imp> imps = request.getImp();
if (CollectionUtils.isEmpty(imps)) {
errors.add(BidderError.badInput("No valid impressions in the bid request"));
return Result.of(Collections.emptyList(), errors);
}

String updatedPublisherId = null;
String updatedSellerId = null;
for (int i = 0; i < imps.size(); i++) {
try {
final ExtImpDmx extImp = parseImpExt(imps.get(i));
if (i == 0) {
final String publisherId = extImp.getPublisherId();
updatedPublisherId = StringUtils.isBlank(publisherId)
? publisherId
: extImp.getMemberId();
updatedSellerId = extImp.getSellerId();
try {
final ExtImpDmx extImp = parseImpExt(imps.get(0));
final String publisherId = extImp.getPublisherId();
updatedPublisherId = StringUtils.isBlank(publisherId)
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
? publisherId
: extImp.getMemberId();
updatedSellerId = extImp.getSellerId();
for (Imp imp : request.getImp()) {
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
final Imp validImp = validateAndModifyImp(imp, parseImpExt(imp));
if (validImp != null) {
validImps.add(validImp);
}
final Imp validImp = validateAndModifyImp(imps.get(i), extImp);
validImps.add(validImp);
} catch (PreBidException e) {
errors.add(BidderError.badInput(e.getMessage()));
}
} catch (PreBidException e) {
errors.add(BidderError.badInput(e.getMessage()));
}

boolean anyHasId = false;
Expand All @@ -105,33 +98,37 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
}

final Site site = request.getSite();
final Publisher publisher = site.getPublisher();
if (site.getPublisher() != null) {
request.toBuilder()
.site(site.toBuilder().publisher(publisher.toBuilder().id(updatedPublisherId).build()).build())
.build();
} else {
request.toBuilder()
.site(site.toBuilder().publisher(Publisher.builder().id(updatedPublisherId).build()).build())
.build();
if (site != null) {
final Publisher publisher = site.getPublisher();
if (site.getPublisher() != null) {
request.toBuilder()
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
.site(site.toBuilder().publisher(publisher.toBuilder().id(updatedPublisherId).build()).build())
.build();
} else {
request.toBuilder()
.site(site.toBuilder().publisher(Publisher.builder().id(updatedPublisherId).build()).build())
.build();
}
}

final User user = request.getUser();
if (user != null) {
if (StringUtils.isNotBlank(user.getId())) {
anyHasId = true;
}
final ExtUser ext = user.getExt();
if (ext != null) {
final ExtUserDigiTrust digitrust = ext.getDigitrust();
if (CollectionUtils.isNotEmpty(ext.getEids()) || (digitrust != null
final ExtUser userExt = user.getExt();
if (userExt != null) {
final ExtUserDigiTrust digitrust = userExt.getDigitrust();
if (CollectionUtils.isNotEmpty(userExt.getEids()) || (digitrust != null
&& StringUtils.isNotBlank(digitrust.getId()))) {
anyHasId = true;
}
}
}

if (!anyHasId) {
try {
checkIfHasId(anyHasId);
} catch (PreBidException e) {
return Result.emptyWithError(BidderError.badInput("This request contained no identifier"));
}

Expand Down Expand Up @@ -162,30 +159,31 @@ private ExtImpDmx parseImpExt(Imp imp) {
}

private Imp validateAndModifyImp(Imp imp, ExtImpDmx extImp) {
Imp updatedImp = null;
final Banner banner = imp.getBanner();
if (banner != null) {
if (CollectionUtils.isNotEmpty(banner.getFormat())) {
updatedImp = updateImp(imp, extImp).toBuilder().banner(banner).build();
Imp modifiedImp = null;
final Imp updatedImp = updateImp(imp, extImp);
if (updatedImp != null) {
final Banner banner = imp.getBanner();

if (banner != null) {
if (CollectionUtils.isNotEmpty(banner.getFormat())) {
modifiedImp = updatedImp.toBuilder().banner(banner).build();
}
}
}

final Video video = imp.getVideo();
if (video != null) {
updatedImp = updateImp(imp, extImp).toBuilder().video(video).build();
final Video video = imp.getVideo();
if (video != null) {
modifiedImp = updatedImp.toBuilder().video(video).build();
}
}
return updatedImp;
return modifiedImp;
}

private Imp updateImp(Imp imp, ExtImpDmx extImp) {
Imp updatedImp;
if (StringUtils.isNotBlank(extImp.getPublisherId())
|| StringUtils.isNotBlank(extImp.getMemberId())) {
updatedImp = fetchParams(imp, extImp);
if (StringUtils.isNotBlank(extImp.getPublisherId()) || StringUtils.isNotBlank(extImp.getMemberId())) {
return fetchParams(imp, extImp);
} else {
throw new PreBidException("Missing Params for auction to be send");
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
}
return updatedImp;
}

private Imp fetchParams(Imp imp, ExtImpDmx extImp) {
Expand All @@ -210,7 +208,15 @@ private Imp fetchParams(Imp imp, ExtImpDmx extImp) {
.build();
}

return (updatedImp != null && StringUtils.isBlank(updatedImp.getTagid())) ? imp : updatedImp;
return updatedImp != null && StringUtils.isBlank(updatedImp.getTagid()) && StringUtils.isBlank(imp.getTagid())
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
? null
: updatedImp;
}

private void checkIfHasId(boolean anyHasId) {
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
if (!anyHasId) {
throw new PreBidException("This request contained no identifier");
}
}

@Override
Expand Down Expand Up @@ -238,12 +244,9 @@ public Result<List<BidderBid>> makeBids(HttpCall<BidRequest> httpCall, BidReques
for (Bid bid : seatBid.getBid()) {
try {
final BidType bidType = getBidType(bid.getImpid(), bidRequest.getImp());
String adm = null;
if (bidType == BidType.video) {
adm = getAdm(bid);
}

final Bid updatedBid = bid.toBuilder().adm(adm).build();
final Bid updatedBid = bidType == BidType.video
? bid.toBuilder().adm(getAdm(bid)).build()
: bid;
final BidderBid bidderBid = BidderBid.of(updatedBid, bidType, DEFAULT_BID_CURRENCY);
bidderBids.add(bidderBid);
} catch (PreBidException e) {
Expand All @@ -263,12 +266,11 @@ private BidResponse decodeBodyToBidResponse(HttpCall<BidRequest> httpCall) {
}

private BidType getBidType(String impId, List<Imp> imps) {
AndriyPavlyuk marked this conversation as resolved.
Show resolved Hide resolved
for (Imp imp : imps) {
if (imp.getId().equals(impId)) {
return imp.getVideo() != null ? BidType.video : BidType.banner;
}
}
throw new PreBidException(String.format("Failed to find impression %s", impId));
return imps.stream()
.filter(imp -> Objects.equals(imp.getId(), impId))
.map(imp -> imp.getVideo() != null ? BidType.video : BidType.banner)
.findFirst()
.orElseThrow(() -> new PreBidException(String.format("Failed to find impression %s", impId)));
}

private String getAdm(Bid bid) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/proto/openrtb/ext/request/dmx/ExtImpDmx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.prebid.server.proto.openrtb.ext.request.dmx;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Value;

/**
* Defines the contract for bidRequest.imp[i].ext.dmx
*/
@AllArgsConstructor(staticName = "of")
@Builder
@Value
public class ExtImpDmx {

Expand Down
Loading