-
Notifications
You must be signed in to change notification settings - Fork 224
Module update: LI EID permissions #4315
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ | |
| import com.iab.openrtb.request.User; | ||
| import io.vertx.core.Future; | ||
| import io.vertx.core.MultiMap; | ||
| import org.apache.commons.collections4.CollectionUtils; | ||
| import org.apache.commons.collections4.ListUtils; | ||
| import org.prebid.server.activity.Activity; | ||
| import org.prebid.server.activity.ComponentType; | ||
|
|
@@ -40,18 +39,15 @@ | |
| import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidDataEidPermissions; | ||
| import org.prebid.server.util.HttpUtil; | ||
| import org.prebid.server.util.ListUtil; | ||
| import org.prebid.server.util.StreamUtil; | ||
| import org.prebid.server.vertx.httpclient.HttpClient; | ||
| import org.prebid.server.vertx.httpclient.model.HttpClientResponse; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ThreadLocalRandom; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class LiveIntentOmniChannelIdentityProcessedAuctionRequestHook implements ProcessedAuctionRequestHook { | ||
|
|
||
|
|
@@ -202,14 +198,22 @@ private AuctionRequestPayload updatedPayload(AuctionRequestPayload requestPayloa | |
| } | ||
|
|
||
| private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolvedEids) { | ||
| if (targetBidders.isEmpty()) { | ||
| if (targetBidders.isEmpty() || resolvedEids == null || resolvedEids.isEmpty()) { | ||
| return bidRequest; | ||
| } | ||
|
|
||
| final ExtRequest ext = bidRequest.getExt(); | ||
| final ExtRequestPrebid extPrebid = ext != null ? ext.getPrebid() : null; | ||
| final ExtRequestPrebidData extPrebidData = extPrebid != null ? extPrebid.getData() : null; | ||
|
|
||
| final List<ExtRequestPrebidDataEidPermissions> existingPerms = extPrebidData != null | ||
| ? ListUtils.emptyIfNull(extPrebidData.getEidPermissions()) | ||
| : List.of(); | ||
|
|
||
| if (existingPerms.isEmpty()) { | ||
| return bidRequest; | ||
| } | ||
|
Comment on lines
+209
to
+215
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| final ExtRequestPrebid updatedExtPrebid = Optional.ofNullable(extPrebid) | ||
| .map(ExtRequestPrebid::toBuilder) | ||
| .orElseGet(ExtRequestPrebid::builder) | ||
|
|
@@ -225,35 +229,37 @@ private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolve | |
| } | ||
|
|
||
| private ExtRequestPrebidData updatePrebidData(ExtRequestPrebidData extPrebidData, List<Eid> resolvedEids) { | ||
| final List<String> prebidDataBidders = extPrebidData != null ? extPrebidData.getBidders() : null; | ||
| final List<String> updatedPrebidDataBidders = prebidDataBidders != null | ||
| ? (List<String>) CollectionUtils.union(targetBidders, prebidDataBidders) | ||
| : targetBidders; | ||
| final List<String> originalBidders = extPrebidData != null ? extPrebidData.getBidders() : null; | ||
|
|
||
| final Set<String> resolvedSources = resolvedEids.stream().map(Eid::getSource).collect(Collectors.toSet()); | ||
| final Set<String> resolvedSources = resolvedEids.stream() | ||
| .map(Eid::getSource) | ||
| .collect(Collectors.toSet()); | ||
|
|
||
| final List<ExtRequestPrebidDataEidPermissions> initialPermissions = Optional.ofNullable(extPrebidData) | ||
| .map(ExtRequestPrebidData::getEidPermissions) | ||
| .orElse(Collections.emptyList()); | ||
| final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = Stream.concat( | ||
| initialPermissions.stream() | ||
| .map(permission -> updateEidPermission(permission, resolvedSources)), | ||
| resolvedSources.stream() | ||
| .map(source -> ExtRequestPrebidDataEidPermissions.of(source, targetBidders))) | ||
| .filter(StreamUtil.distinctBy(ExtRequestPrebidDataEidPermissions::getSource)) | ||
| .orElse(List.of()); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
|
||
| final List<ExtRequestPrebidDataEidPermissions> updatedPermissions = initialPermissions.stream() | ||
| .map(permission -> restrictEidPermission(permission, resolvedSources)) | ||
| .filter(Objects::nonNull) | ||
| .toList(); | ||
|
|
||
| return ExtRequestPrebidData.of(updatedPrebidDataBidders, updatedPermissions); | ||
| return ExtRequestPrebidData.of(originalBidders, updatedPermissions); | ||
| } | ||
|
|
||
| private ExtRequestPrebidDataEidPermissions updateEidPermission(ExtRequestPrebidDataEidPermissions permission, | ||
| Set<String> resolvedSources) { | ||
| private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebidDataEidPermissions permission, | ||
| Set<String> resolvedSources) { | ||
|
|
||
| if (!resolvedSources.contains(permission.getSource())) { | ||
| return permission; | ||
| } | ||
|
|
||
| final List<String> current = ListUtils.emptyIfNull(permission.getBidders()); | ||
| final List<String> finalBidders = ListUtils.intersection(current, targetBidders); | ||
|
|
||
|
Comment on lines
+257
to
259
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Make |
||
| return resolvedSources.contains(permission.getSource()) | ||
| ? ExtRequestPrebidDataEidPermissions.of( | ||
| permission.getSource(), | ||
| (List<String>) CollectionUtils.union(permission.getBidders(), targetBidders)) | ||
| : permission; | ||
| return finalBidders.isEmpty() | ||
| ? null | ||
| : ExtRequestPrebidDataEidPermissions.of(permission.getSource(), finalBidders); | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use
CollectionUtils.isEmptyinstead