From 9409959a58d9475128f46b7ee742438f037b1c63 Mon Sep 17 00:00:00 2001
From: Anand Venkatraman <avenkatraman@pulsepoint.com>
Date: Wed, 30 Oct 2019 15:58:18 -0400
Subject: [PATCH] PulsePoint Adapter - update for ttl logic (#4400)

* ET-1691: Pulsepoint Analytics adapter for Prebid. (#1)

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: cleanup

* ET-1691: minor

* ET-1691: revert package.json change

* Adding bidRequest to bidFactory.createBid method as per https://github.com/prebid/Prebid.js/issues/509

* ET-1765: Adding support for additional params in PulsePoint adapter (#2)

* ET-1850: Fixing https://github.com/prebid/Prebid.js/issues/866

* Minor fix

* Adding mandatory parameters to Bid

* Using the TTL from the bid.ext

* Minor refactor
---
 modules/pulsepointBidAdapter.js               | 13 ++------
 .../spec/modules/pulsepointBidAdapter_spec.js | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index fee247ba31f..3cdbd559614 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -114,9 +114,9 @@ function bidResponseAvailable(request, response) {
         creative_id: idToBidMap[id].crid,
         creativeId: idToBidMap[id].crid,
         adId: id,
-        ttl: DEFAULT_BID_TTL,
+        ttl: idToBidMap[id].exp || DEFAULT_BID_TTL,
         netRevenue: DEFAULT_NET_REVENUE,
-        currency: DEFAULT_CURRENCY
+        currency: idToBidMap[id].cur || DEFAULT_CURRENCY
       };
       if (idToImpMap[id]['native']) {
         bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
@@ -135,21 +135,12 @@ function bidResponseAvailable(request, response) {
         bid.width = idToImpMap[id].banner.w;
         bid.height = idToImpMap[id].banner.h;
       }
-      applyExt(bid, idToBidMap[id])
       bids.push(bid);
     }
   });
   return bids;
 }
 
-function applyExt(bid, ortbBid) {
-  if (ortbBid && ortbBid.ext) {
-    bid.ttl = ortbBid.ext.ttl || bid.ttl;
-    bid.currency = ortbBid.ext.currency || bid.currency;
-    bid.netRevenue = ortbBid.ext.netRevenue != null ? ortbBid.ext.netRevenue : bid.netRevenue;
-  }
-}
-
 /**
  * Produces an OpenRTBImpression from a slot config.
  */
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index 9ed6d3631f5..6d5400de216 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -200,7 +200,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.ttl).to.equal(20);
   });
 
-  it('Verify use ttl in ext', function () {
+  it('Verify ttl/currency applied to bid', function () {
     const request = spec.buildRequests(slotConfigs, bidderRequest);
     const ortbRequest = request.data;
     const ortbResponse = {
@@ -208,22 +208,31 @@ describe('PulsePoint Adapter Tests', function () {
         bid: [{
           impid: ortbRequest.imp[0].id,
           price: 1.25,
-          adm: 'This is an Ad',
-          ext: {
-            ttl: 30,
-            netRevenue: false,
-            currency: 'INR'
-          }
+          adm: 'This is an Ad#1',
+          crid: 'Creative#123',
+          exp: 50,
+          cur: 'GBP'
+        }, {
+          impid: ortbRequest.imp[1].id,
+          price: 1.25,
+          adm: 'This is an Ad#2',
+          crid: 'Creative#123'
         }]
       }]
     };
     const bids = spec.interpretResponse({ body: ortbResponse }, request);
-    expect(bids).to.have.lengthOf(1);
+    expect(bids).to.have.lengthOf(2);
     // verify first bid
     const bid = bids[0];
-    expect(bid.ttl).to.equal(30);
-    expect(bid.netRevenue).to.equal(false);
-    expect(bid.currency).to.equal('INR');
+    expect(bid.cpm).to.equal(1.25);
+    expect(bid.ad).to.equal('This is an Ad#1');
+    expect(bid.ttl).to.equal(50);
+    expect(bid.currency).to.equal('GBP');
+    const secondBid = bids[1];
+    expect(secondBid.cpm).to.equal(1.25);
+    expect(secondBid.ad).to.equal('This is an Ad#2');
+    expect(secondBid.ttl).to.equal(20);
+    expect(secondBid.currency).to.equal('USD');
   });
 
   it('Verify full passback', function () {