Small bugfix and cleanup for Prebid Server OpenRTB code (prebid#3113)

* change bid map to bid_id map and clean up openrtb in pbs * add src to bids in bid request when known
devunrulymedia · Oct 9, 2018 · a1f07e9 · a1f07e9
1 parent 8fdf61d
commit a1f07e9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
@@ -355,10 +355,8 @@ const LEGACY_PROTOCOL = {
  * Protocol spec for OpenRTB endpoint
  * e.g., https://<prebid-server-url>/v1/openrtb2/auction
  */
+let bidIdMap = {};
 const OPEN_RTB_PROTOCOL = {
-
- bidMap: {},
-
  buildRequest(s2sBidRequest, bidRequests, adUnits) {
  let imps = [];
  let aliases = {};
@@ -368,8 +366,7 @@ const OPEN_RTB_PROTOCOL = {
  adUnit.bids.forEach(bid => {
  // OpenRTB response contains the adunit code and bidder name. These are
  // combined to create a unique key for each bid since an id isn't returned
- const key = `${adUnit.code}${bid.bidder}`;
- this.bidMap[key] = bid;
+ bidIdMap[`${adUnit.code}${bid.bidder}`] = bid.bid_id;
 
  // check for and store valid aliases to add to the request
  if (adaptermanager.aliasRegistry[bid.bidder]) {
@@ -481,17 +478,22 @@ const OPEN_RTB_PROTOCOL = {
  // a seatbid object contains a `bid` array and a `seat` string
  response.seatbid.forEach(seatbid => {
  (seatbid.bid || []).forEach(bid => {
- const bidRequest = utils.getBidRequest(
- this.bidMap[`${bid.impid}${seatbid.seat}`].bid_id,
- bidderRequests
- );
+ let bidRequest;
+ let key = `${bid.impid}${seatbid.seat}`;
+ if (bidIdMap[key]) {
+ bidRequest = utils.getBidRequest(
+ bidIdMap[key],
+ bidderRequests
+ );
+ }
 
  const cpm = bid.price;
  const status = cpm !== 0 ? STATUS.GOOD : STATUS.NO_BID;
- let bidObject = bidfactory.createBid(status, bidRequest);
+ let bidObject = bidfactory.createBid(status, bidRequest || {
+ bidder: seatbid.seat,
+ src: TYPE
+ });
 
- bidObject.source = TYPE;
- bidObject.bidderCode = seatbid.seat;
  bidObject.cpm = cpm;
 
  let serverResponseTimeMs = utils.deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));

diff --git a/src/adaptermanager.js b/src/adaptermanager.js
@@ -47,7 +47,7 @@ function getLabels(bidOrAdUnit, activeLabels) {
  return {labelAll: false, labels: bidOrAdUnit.labelAny, activeLabels};
 }
 
-function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels}) {
+function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src}) {
  return adUnits.reduce((result, adUnit) => {
  let {
  active,
@@ -111,6 +111,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels}) {
  bidId: bid.bid_id || utils.getUniqueIdentifierStr(),
  bidderRequestId,
  auctionId,
+ src,
  bidRequestsCount: adunitCounter.getCounter(adUnit.code),
  }));
  }
@@ -207,7 +208,7 @@ exports.makeBidRequests = function(adUnits, auctionStart, auctionId, cbTimeout,
  auctionId,
  bidderRequestId,
  tid,
- bids: getBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels}),
+ bids: getBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
  auctionStart: auctionStart,
  timeout: _s2sConfig.timeout,
  src: CONSTANTS.S2S.SRC,
@@ -242,7 +243,7 @@ exports.makeBidRequests = function(adUnits, auctionStart, auctionId, cbTimeout,
  bidderCode,
  auctionId,
  bidderRequestId,
- bids: getBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsClientCopy), labels}),
+ bids: getBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsClientCopy), labels, src: 'client'}),
  auctionStart: auctionStart,
  timeout: cbTimeout,
  refererInfo