DATA-53829: Fixing PR issues

Author: ilya

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/model/FullSource.java

@@ -0,0 +1,12 @@
+package org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model;
+
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder(toBuilder = true)
+public class FullSource {
+
+    String source;
+    String inserter;
+}

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/hooks/LiveIntentOmniChannelIdentityProcessedAuctionRequestHook.java

@@ -23,6 +23,7 @@
 import org.prebid.server.hooks.execution.v1.analytics.ResultImpl;
 import org.prebid.server.hooks.execution.v1.analytics.TagsImpl;
 import org.prebid.server.hooks.execution.v1.auction.AuctionRequestPayloadImpl;
+import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model.FullSource;
 import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model.IdResResponse;
 import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.model.config.LiveIntentOmniChannelProperties;
 import org.prebid.server.hooks.modules.liveintent.omni.channel.identity.v1.LiveIntentOmniChannelIdentityModule;
@@ -197,6 +198,9 @@ private InvocationResultImpl<AuctionRequestPayload> update(IdResResponse resolut
 
     private AuctionRequestPayload updatedPayload(AuctionRequestPayload requestPayload, List<Eid> resolvedEids) {
         final List<Eid> eids = ListUtils.emptyIfNull(resolvedEids);
+        if (CollectionUtils.isEmpty(eids)) {
+            return requestPayload;
+        }
         final BidRequest bidRequest = updateAllowedBidders(requestPayload.bidRequest(), resolvedEids);
         final User updatedUser = Optional.ofNullable(bidRequest.getUser())
                 .map(user -> user.toBuilder().eids(ListUtil.union(ListUtils.emptyIfNull(user.getEids()), eids)))
@@ -207,7 +211,7 @@ private AuctionRequestPayload updatedPayload(AuctionRequestPayload requestPayloa
     }
 
     private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolvedEids) {
-        if (CollectionUtils.isEmpty(targetBidders) || CollectionUtils.isEmpty(resolvedEids)) {
+        if (CollectionUtils.isEmpty(targetBidders)) {
             return bidRequest;
         }
 
@@ -232,8 +236,8 @@ private BidRequest updateAllowedBidders(BidRequest bidRequest, List<Eid> resolve
     private ExtRequestPrebidData updatePrebidData(ExtRequestPrebidData extPrebidData, List<Eid> resolvedEids) {
         final List<String> originalBidders = extPrebidData != null ? extPrebidData.getBidders() : null;
 
-        final Set<String> resolvedSources = resolvedEids.stream()
-                .map(Eid::getSource)
+        final Set<FullSource> resolvedSources = resolvedEids.stream()
+                .map(eid -> FullSource.builder().source(eid.getSource()).inserter(eid.getInserter()).build())
                 .collect(Collectors.toSet());
 
         final List<ExtRequestPrebidDataEidPermissions> eidPermissions = extPrebidData != null
@@ -245,13 +249,30 @@ private ExtRequestPrebidData updatePrebidData(ExtRequestPrebidData extPrebidData
                 .filter(Objects::nonNull)
                 .toList();
 
-        return ExtRequestPrebidData.of(originalBidders, updatedPermissions);
+        if (CollectionUtils.isEmpty(updatedPermissions)) {
+            return ExtRequestPrebidData.of(
+                    originalBidders,
+                    resolvedEids.stream()
+                            .map(eid ->
+                                    ExtRequestPrebidDataEidPermissions.builder()
+                                            .bidders(targetBidders.stream().toList())
+                                            .inserter(INSERTER)
+                                            .source(eid.getSource())
+                                            .build())
+                            .toList());
+        } else {
+            return ExtRequestPrebidData.of(originalBidders, updatedPermissions);
+        }
     }
 
     private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebidDataEidPermissions permission,
-                                                                     Set<String> resolvedSources) {
+                                                                     Set<FullSource> resolvedSources) {
 
-        if (!resolvedSources.contains(permission.getSource())) {
+        final FullSource permFullSource = FullSource.builder()
+                .source(permission.getSource())
+                .inserter(permission.getInserter())
+                .build();
+        if (!resolvedSources.contains(permFullSource)) {
             return permission;
         }
 
@@ -260,6 +281,7 @@ private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebi
         if (CollectionUtils.isEmpty(permittedBidders) || permittedBidders.contains("*")) {
             return ExtRequestPrebidDataEidPermissions.builder()
                     .source(permission.getSource())
+                    .inserter(permission.getInserter())
                     .bidders(targetBidders.stream().toList())
                     .build();
         }
@@ -272,6 +294,7 @@ private ExtRequestPrebidDataEidPermissions restrictEidPermission(ExtRequestPrebi
                 ? null
                 : ExtRequestPrebidDataEidPermissions.builder()
                 .source(permission.getSource())
+                .inserter(permission.getInserter())
                 .bidders(finalBidders)
                 .build();
     }

extra/modules/live-intent-omni-channel-identity/src/test/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/v1/LiveIntentOmniChannelIdentityProcessedAuctionRequestHookTest.java

@@ -386,15 +386,18 @@ public void shouldRestrictExistingEidPermissionsByIntersectionAndKeepGlobalBidde
 
         final ExtRequestPrebidDataEidPermissions otherBidder = ExtRequestPrebidDataEidPermissions.builder()
                 .source("some.other-source.com")
+                .inserter("some.other-inserter.com")
                 .bidders(singletonList("bidderY"))
                 .build();
 
         final ExtRequestPrebidDataEidPermissions liBidder2 = ExtRequestPrebidDataEidPermissions.builder()
                 .source("liveintent.com")
+                .inserter("s2s.liveintent.com")
                 .bidders(singletonList("bidder2"))
                 .build();
         final ExtRequestPrebidDataEidPermissions liBidder23 = ExtRequestPrebidDataEidPermissions.builder()
                 .source("liveintent.com")
+                .inserter("s2s.liveintent.com")
                 .bidders(List.of("bidder2", "bidder3"))
                 .build();
 
@@ -452,10 +455,12 @@ public void shouldNotAddNewEidPermissionsOrModifyGlobalBiddersWhenSourceNotPrese
         final User givenUser = User.builder().eids(singletonList(givenEid)).build();
         final ExtRequestPrebidDataEidPermissions bidder1 = ExtRequestPrebidDataEidPermissions.builder()
                 .source("some.other-source.com")
+                .inserter("some.other-inserter.com")
                 .bidders(singletonList("bidder3"))
                 .build();
         final ExtRequestPrebidDataEidPermissions bidder2 = ExtRequestPrebidDataEidPermissions.builder()
                 .source("some.source.com")
+                .inserter("s2s.liveintent.com")
                 .bidders(singletonList("bidder3"))
                 .build();
 
@@ -516,6 +521,7 @@ public void shouldRemovePermissionWhenIntersectionIsEmpty() {
                 List.of(
                         ExtRequestPrebidDataEidPermissions.builder()
                                 .source("liveintent.com")
+                                .inserter("s2s.liveintent.com")
                                 .bidders(singletonList("not-allowed"))
                                 .build(),
                         ExtRequestPrebidDataEidPermissions.builder()