Add bidderInfoResponse container as a first step to use BidInfo in workflow

src/main/java/org/prebid/server/auction/model/BidInfo.java

@@ -15,14 +15,19 @@ public class BidInfo {
 
     Bid bid;
 
+    // Can be null
     Imp correspondingImp;
 
+    String bidCurrency;
+
     String bidder;
 
     BidType bidType;
 
     CacheInfo cacheInfo;
 
+    TargetingInfo targetingInfo;
+
     public String getBidId() {
         return generatedBidId != null ? generatedBidId : bid.getId();
     }

src/main/java/org/prebid/server/auction/model/BidderResponseInfo.java

@@ -0,0 +1,20 @@
+package org.prebid.server.auction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Value;
+import org.prebid.server.bidder.model.BidderSeatBidInfo;
+
+@AllArgsConstructor(staticName = "of")
+@Value
+public class BidderResponseInfo {
+
+    String bidder;
+
+    BidderSeatBidInfo seatBid;
+
+    int responseTime;
+
+    public BidderResponseInfo with(BidderSeatBidInfo seatBid) {
+        return of(this.bidder, seatBid, this.responseTime);
+    }
+}

src/main/java/org/prebid/server/auction/model/TargetingInfo.java

@@ -0,0 +1,19 @@
+package org.prebid.server.auction.model;
+
+import lombok.Builder;
+import lombok.Value;
+
+@Builder(toBuilder = true)
+@Value
+public class TargetingInfo {
+
+    String bidderCode;
+
+    boolean isTargetingEnabled;
+
+    boolean isWinningBid;
+
+    boolean isBidderWinningBid;
+
+    boolean isAddTargetBidderCode;
+}

src/main/java/org/prebid/server/bidder/model/BidderSeatBid.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * Seatid returned by a {@link Bidder}.
+ * Seatbid returned by a {@link Bidder}.
  * <p>
  * This is distinct from the {@link com.iab.openrtb.response.SeatBid} so that the prebid-server ext can be passed
  * back with type safety.

src/main/java/org/prebid/server/bidder/model/BidderSeatBidInfo.java

@@ -0,0 +1,23 @@
+package org.prebid.server.bidder.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Value;
+import org.prebid.server.auction.model.BidInfo;
+import org.prebid.server.proto.openrtb.ext.response.ExtHttpCall;
+
+import java.util.List;
+
+@AllArgsConstructor(staticName = "of")
+@Value
+public class BidderSeatBidInfo {
+
+    List<BidInfo> bidsInfos;
+
+    List<ExtHttpCall> httpCalls;
+
+    List<BidderError> errors;
+
+    public BidderSeatBidInfo with(List<BidInfo> bids) {
+        return BidderSeatBidInfo.of(bids, this.httpCalls, this.errors);
+    }
+}

src/main/java/org/prebid/server/cache/CacheService.java

@@ -252,7 +252,7 @@ private CacheBid toCacheBid(BidInfo bidInfo,
         final com.iab.openrtb.response.Bid bid = bidInfo.getBid();
         final Integer bidTtl = bid.getExp();
         final Imp correspondingImp = bidInfo.getCorrespondingImp();
-        final Integer impTtl = correspondingImp.getExp();
+        final Integer impTtl = correspondingImp != null ? correspondingImp.getExp() : null;
         final Integer accountMediaTypeTtl = isVideoBid
                 ? accountCacheTtl.getVideoCacheTtl()
                 : accountCacheTtl.getBannerCacheTtl();

src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java

@@ -31,6 +31,7 @@
 import org.prebid.server.auction.model.BidRequestCacheInfo;
 import org.prebid.server.auction.model.BidderResponse;
 import org.prebid.server.auction.model.MultiBidConfig;
+import org.prebid.server.auction.model.TargetingInfo;
 import org.prebid.server.bidder.BidderCatalog;
 import org.prebid.server.bidder.model.BidderBid;
 import org.prebid.server.bidder.model.BidderError;
@@ -245,8 +246,9 @@ public void shouldRequestCacheServiceWithExpectedArguments() {
         // then
         final BidInfo bidInfo1 = toBidInfo(bid1, imp1, "bidder1", banner);
         final BidInfo bidInfo2 = toBidInfo(bid2, imp2, "bidder1", banner);
-        final BidInfo bidInfo3 = toBidInfo(bid3, imp1, "bidder2", banner);
-        final BidInfo bidInfo4 = toBidInfo(bid4, imp2, "bidder2", banner);
+        final TargetingInfo loosedTargetingInfo = toTargetingInfo("bidder2", false);
+        final BidInfo bidInfo3 = toBidInfo(bid3, null, imp1, "bidder2", banner, loosedTargetingInfo);
+        final BidInfo bidInfo4 = toBidInfo(bid4, null, imp2, "bidder2", banner, loosedTargetingInfo);
         ArgumentCaptor<CacheContext> contextArgumentCaptor = ArgumentCaptor.forClass(CacheContext.class);
         verify(cacheService).cacheBidsOpenrtb(
                 argThat(t -> t.containsAll(asList(bidInfo1, bidInfo2, bidInfo3, bidInfo4))),
@@ -305,10 +307,11 @@ public void shouldRequestCacheServiceWithWinningBidsOnlyWhenWinningonlyIsTrue()
         bidResponseCreator.create(bidderResponses, auctionContext, cacheInfo, MULTI_BIDS, false);
 
         // then
+
         final BidInfo bidInfo1 = toBidInfo(bid1, imp1, "bidder1", banner);
         final BidInfo bidInfo2 = toBidInfo(bid2, imp2, "bidder1", banner);
         verify(cacheService).cacheBidsOpenrtb(
-                argThat(t -> t.containsAll(asList(bidInfo1, bidInfo2))),
+                argThat(t -> t.containsAll(asList(bidInfo2, bidInfo1))),
                 same(auctionContext),
                 any(),
                 eq(EventsContext.builder().auctionTimestamp(1000L).build()));
@@ -615,7 +618,16 @@ public void shouldUseGeneratedBidIdForEventAndCacheWhenIdGeneratorIsUUIDAndEvent
         bidResponseCreator.create(bidderResponses, auctionContext, cacheInfo, MULTI_BIDS, false).result();
 
         // then
-        final BidInfo expectedBidInfo = toBidInfo(bid, generatedBid, imp, bidder, banner);
+        TargetingInfo.builder()
+                .bidderCode(bidder)
+                .isTargetingEnabled(true)
+                .isWinningBid(true)
+                .isBidderWinningBid(true)
+                .isAddTargetBidderCode(false)
+                .build();
+
+        final TargetingInfo targetingInfo = toTargetingInfo(bidder, true);
+        final BidInfo expectedBidInfo = toBidInfo(bid, generatedBid, imp, bidder, banner, targetingInfo);
         verify(cacheService).cacheBidsOpenrtb(eq(singletonList(expectedBidInfo)), any(), any(), any());
 
         verify(eventsService).createEvent(eq(generatedBid), anyString(), anyString(), anyLong(), anyString());
@@ -2252,20 +2264,33 @@ private static BidInfo toBidInfo(Bid bid,
                 .correspondingImp(correspondingImp)
                 .bidder(bidder)
                 .bidType(bidType)
+                .targetingInfo(toTargetingInfo(bidder, true))
                 .build();
     }
 
     private static BidInfo toBidInfo(Bid bid,
                                      String generatedBidId,
                                      Imp correspondingImp,
                                      String bidder,
-                                     BidType bidType) {
+                                     BidType bidType,
+                                     TargetingInfo targetingInfo) {
         return BidInfo.builder()
                 .generatedBidId(generatedBidId)
                 .bid(bid)
                 .correspondingImp(correspondingImp)
                 .bidder(bidder)
                 .bidType(bidType)
+                .targetingInfo(targetingInfo)
+                .build();
+    }
+
+    private static TargetingInfo toTargetingInfo(String bidder, boolean isWinningBid) {
+        return TargetingInfo.builder()
+                .bidderCode(bidder)
+                .isTargetingEnabled(true)
+                .isWinningBid(isWinningBid)
+                .isBidderWinningBid(true)
+                .isAddTargetBidderCode(false)
                 .build();
     }