Skip to content

Commit

Permalink
Resolve conversations.
Browse files Browse the repository at this point in the history
  • Loading branch information
@CTMBNara
CTMBNara committed Feb 10, 2022
1 parent 4602eaa commit 932da99
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 38 deletions.
64 changes: 31 additions & 33 deletions src/main/java/org/prebid/server/bidder/thirtythreeacross/ThirtyThreeAcrossBidder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.fasterxml.jackson.core.JsonPointer;
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.BidRequest;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.request.Video;
Expand All @@ -12,6 +11,7 @@
import com.iab.openrtb.response.SeatBid;
import io.vertx.core.http.HttpMethod;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.prebid.server.bidder.Bidder;
import org.prebid.server.bidder.model.BidderBid;
Expand Down Expand Up @@ -69,9 +69,13 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
for (Imp imp : modifiedRequest.getImp()) {
try {
validateImp(imp);
final ExtImpThirtyThreeAcross extImpThirtyThreeAcross = parseImpExt(imp);
final Imp updatedImp = updateImp(imp, extImpThirtyThreeAcross);
impsMap.computeIfAbsent(computeKey(updatedImp), k -> new ArrayList<>()).add(updatedImp);
final ExtImpThirtyThreeAcross extImpTtx = parseImpExt(imp);

final String productId = extImpTtx.getProductId();
final ThirtyThreeAcrossImpExt modifiedImpExt = createImpExt(productId, extImpTtx);
final Imp updatedImp = updateImp(imp, productId, modifiedImpExt);

impsMap.computeIfAbsent(getImpGroupName(modifiedImpExt), ignored -> new ArrayList<>()).add(updatedImp);
} catch (PreBidException e) {
errors.add(BidderError.badInput(e.getMessage()));
}
Expand All @@ -94,8 +98,8 @@ private BidRequest modifyRequest(BidRequest request, List<BidderError> errors) {
}

private ExtRequest modifyRequestExt(ExtRequest ext) throws PreBidException {
final Map<String, JsonNode> properties = ObjectUtil.getIfNotNull(ext, ExtRequest::getProperties);
final JsonNode extTtxNode = ObjectUtil.getIfNotNull(properties, p -> p.get("ttx"));
final Map<String, JsonNode> extProperties = ObjectUtil.getIfNotNull(ext, ExtRequest::getProperties);
final JsonNode extTtxNode = ObjectUtil.getIfNotNull(extProperties, properties -> properties.get("ttx"));
final ThirtyThreeAcrossExtTtx extTtx;
try {
extTtx = mapper.mapper().convertValue(extTtxNode, ThirtyThreeAcrossExtTtx.class);
Expand All @@ -104,50 +108,50 @@ private ExtRequest modifyRequestExt(ExtRequest ext) throws PreBidException {
}

final ExtRequest modifiedExt = ExtRequest.empty();
if (properties != null) {
modifiedExt.addProperties(properties);
if (extProperties != null) {
modifiedExt.addProperties(extProperties);
}
modifiedExt.addProperty("ttx", mapper.mapper().valueToTree(modifyRequestExtTtx(extTtx)));

return modifiedExt;
}

private static ThirtyThreeAcrossExtTtx modifyRequestExtTtx(ThirtyThreeAcrossExtTtx extTtx) {
final List<ThirtyThreeAcrossExtTtxCaller> callers;
if (extTtx == null || CollectionUtils.isEmpty(extTtx.getCaller())) {
callers = Collections.singletonList(PREBID_CALLER);
} else {
callers = new ArrayList<>(extTtx.getCaller());
callers.add(PREBID_CALLER);
}

return ThirtyThreeAcrossExtTtx.of(callers);
return ThirtyThreeAcrossExtTtx.of(extTtx != null && CollectionUtils.isNotEmpty(extTtx.getCaller())
? ListUtils.union(extTtx.getCaller(), Collections.singletonList(PREBID_CALLER))
: Collections.singletonList(PREBID_CALLER));
}

private void validateImp(Imp imp) throws PreBidException {
private static void validateImp(Imp imp) {
if (imp.getBanner() == null && imp.getVideo() == null) {
throw new PreBidException(
String.format("Imp ID %s must have at least one of [Banner, Video] defined", imp.getId()));
}
}

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

private Imp updateImp(Imp imp, ExtImpThirtyThreeAcross extImpThirtyThreeAcross) throws PreBidException {
final String productId = extImpThirtyThreeAcross.getProductId();
private static ThirtyThreeAcrossImpExt createImpExt(String productId, ExtImpThirtyThreeAcross extImpTtx) {
final String zoneId = extImpTtx.getZoneId();

return ThirtyThreeAcrossImpExt.of(ThirtyThreeAcrossImpExtTtx.of(
productId, StringUtils.isNotEmpty(zoneId) ? zoneId : extImpTtx.getSiteId()));
}

private Imp updateImp(Imp imp, String productId, ThirtyThreeAcrossImpExt impExt) {
return imp.toBuilder()
.video(updatedVideo(imp.getVideo(), productId))
.ext(createImpExt(productId, extImpThirtyThreeAcross.getZoneId(), extImpThirtyThreeAcross.getSiteId()))
.ext(mapper.mapper().valueToTree(impExt))
.build();
}

private static Video updatedVideo(Video video, String productId) throws PreBidException {
private static Video updatedVideo(Video video, String productId) {
if (video == null) {
return null;
}
Expand Down Expand Up @@ -184,15 +188,9 @@ private static Integer resolvePlacement(Integer videoPlacement, String productId
return videoPlacement;
}

private ObjectNode createImpExt(String productId, String zoneId, String siteId) {
final ThirtyThreeAcrossImpExt thirtyThreeAcrossImpExt = ThirtyThreeAcrossImpExt.of(
ThirtyThreeAcrossImpExtTtx.of(productId, StringUtils.isNotEmpty(zoneId) ? zoneId : siteId));
return mapper.mapper().valueToTree(thirtyThreeAcrossImpExt);
}

private String computeKey(Imp imp) {
final JsonNode ttx = imp.getExt().get("ttx");
return ttx.get("prod").asText() + ttx.get("zoneid").asText();
private static String getImpGroupName(ThirtyThreeAcrossImpExt impExt) {
final ThirtyThreeAcrossImpExtTtx impExtTtx = impExt.getTtx();
return impExtTtx.getProd() + impExtTtx.getZoneid();
}

private HttpRequest<BidRequest> createRequest(BidRequest request, List<Imp> requestImps) {
Expand All @@ -219,7 +217,7 @@ public Result<List<BidderBid>> makeBids(HttpCall<BidRequest> httpCall, BidReques
}
}

private List<BidderBid> extractBids(BidResponse bidResponse) {
private static List<BidderBid> extractBids(BidResponse bidResponse) {
if (bidResponse == null || CollectionUtils.isEmpty(bidResponse.getSeatbid())) {
return Collections.emptyList();
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/org/prebid/server/bidder/thirtythreeacross/proto/ThirtyThreeAcrossExtTtx.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.prebid.server.bidder.thirtythreeacross.proto;

import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Value;

import java.util.List;

@Value(staticConstructor = "of")
public class ThirtyThreeAcrossExtTtx {

@JsonInclude(JsonInclude.Include.NON_EMPTY)
List<ThirtyThreeAcrossExtTtxCaller> caller;
}
3 changes: 0 additions & 3 deletions .../java/org/prebid/server/bidder/thirtythreeacross/proto/ThirtyThreeAcrossExtTtxCaller.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package org.prebid.server.bidder.thirtythreeacross.proto;

import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Value;

@Value(staticConstructor = "of")
public class ThirtyThreeAcrossExtTtxCaller {

@JsonInclude(JsonInclude.Include.NON_EMPTY)
String name;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
String version;
}

0 comments on commit 932da99

Please sign in to comment.