From 7fc3e46f43e97d89d206fc9a5843b483985b305a Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Mon, 16 Oct 2017 08:25:23 +0200
Subject: [PATCH 01/14] Initial revision of adocean bid adapter (ADOCEAN-13634,
 ADOCEAN-13635)

---
 modules/adoceanBidAdapter.js | 104 +++++++++++++++++++++++++++++++++++
 modules/adoceanBidAdapter.md |  30 ++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 modules/adoceanBidAdapter.js
 create mode 100644 modules/adoceanBidAdapter.md

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
new file mode 100644
index 00000000000..35b89fdb4c6
--- /dev/null
+++ b/modules/adoceanBidAdapter.js
@@ -0,0 +1,104 @@
+import * as utils from 'src/utils';
+import { registerBidder } from 'src/adapters/bidderFactory';
+import { config } from 'src/config';
+
+const BIDDER_CODE = 'adocean';
+
+function buildEndpointUrl(emiter, payload) {
+    let payloadString = "";
+    utils._each(payload, function(v, k) {
+        if (payloadString.length) {
+            payloadString += "&";
+        }
+        payloadString += k + "=" + encodeURIComponent(v);
+    });
+
+    return 'https://' + emiter + '/ad.json?' + payloadString;
+}
+
+function buildRequest(masterBidRequests, masterId) {
+    const firstBid = masterBidRequests[0];
+    const payload = {
+        id: masterId,
+    };
+
+    const bidIdMap = {};
+
+    utils._each(masterBidRequests, function(v) {
+        bidIdMap[v.slaveId] = v.bidId;
+    });
+
+    return {
+        method: 'GET',
+        url: buildEndpointUrl(firstBid.emiter, payload),
+        data: {},
+        bidIdMap: bidIdMap
+    };
+}
+
+function assignToMaster(bidRequest, bidRequestsByMaster) {
+    const masterId = bidRequest.masterId || bidRequest.slaveId;
+    bidRequestsByMaster[masterId] = bidRequestsByMaster[masterId] || [];
+    bidRequestsByMaster[masterId].push(bidRequest);
+}
+
+function interpretRespons(placementResponse, bidRequest, bids) {
+    if (!placementResponse.error) {
+        let adCode = "<script type=\"application/javascript\">(function(){var wu='" + (placementResponse.winUrl || '') + "',su='" + (placementResponse.statsUrl || '') + "'.replace(/\\[TIMESTAMP\\]/,(new Date()).getTime());";
+        adCode += "if(navigator.sendBeacon){if(wu){navigator.sendBeacon(wu)||((new Image(1,1)).src=wu)};if(su){navigator.sendBeacon(su)||((new Image(1,1)).src=su)}}";
+        adCode += "else{if(wu){(new Image(1,1)).src=wu;}if(su){(new Image(1,1)).src=su;}}";
+        adCode += "})();<\/script>";
+        adCode += decodeURIComponent(placementResponse.code);
+
+        const bid = {
+            ad: adCode,
+            bidderCode: BIDDER_CODE,
+            cpm: parseFloat(placementResponse.price),
+            currency: placementResponse.currency,
+            height: parseInt(placementResponse.height, 10),
+            requestId: bidRequest.bidIdMap[placementResponse.id],
+            width: parseInt(placementResponse.width, 10),
+        };
+
+        bids.push(bid);
+    }
+}
+
+export const spec = {
+    code: BIDDER_CODE,
+
+    isBidRequestValid: function(bid) {
+        return !!(bid.slaveId && bid.masterId && bid.emiter);
+    },
+
+    buildRequests: function(validBidRequests) {
+        let bidRequestsByMaster = {},
+            requests = [];
+
+        utils._each(validBidRequests, function(v) {
+            assignToMaster(v, bidRequestsByMaster);
+        });
+        requests = utils._map(bidRequestsByMaster, function(v, k) {
+            return buildRequest(v, k);
+        });
+
+        return requests;
+    },
+
+    interpretResponse: function(serverResponse, bidRequest) {
+        let bids = [];
+
+        if (utils.isArray(serverResponse)) {
+            utils._each(serverResponse, function(placementResponse) {
+                interpretRespons(placementResponse, bidRequest, bids);
+            });
+        }
+
+        return bids;
+    },
+
+    getUserSyncs: function(syncOptions) {
+        // empty
+    }
+}
+registerBidder(spec);
diff --git a/modules/adoceanBidAdapter.md b/modules/adoceanBidAdapter.md
new file mode 100644
index 00000000000..6f0f2f59eb9
--- /dev/null
+++ b/modules/adoceanBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+Module Name: AdOcean Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@gemius.com
+
+# Description
+
+Module that connects to AdOcean demand sources.
+Banner formats are supported.
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'test-div',
+               sizes: [[300, 250]],
+               bids: [
+                   {
+                       bidder: "adocean",
+                       params: {
+                           slaveId: 'adoceanmyaoujfrkmihdi',
+                           masterId: 'TjoArMYvNzznfyIiD2MuWOGqz0N3gY_GbGvRX5rucGH.W7',
+                           emiter: 'myao.adocean.pl'
+                       }
+                   }
+               ]
+           }
+       ];
+```

From 967093b5037eb3b37c5e66f11b208bff9b351940 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Mon, 16 Oct 2017 14:28:10 +0200
Subject: [PATCH 02/14] Minor fixes

---
 modules/adoceanBidAdapter.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 35b89fdb4c6..7847571e916 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -37,12 +37,12 @@ function buildRequest(masterBidRequests, masterId) {
 }
 
 function assignToMaster(bidRequest, bidRequestsByMaster) {
-    const masterId = bidRequest.masterId || bidRequest.slaveId;
+    const masterId = bidRequest.masterId;
     bidRequestsByMaster[masterId] = bidRequestsByMaster[masterId] || [];
     bidRequestsByMaster[masterId].push(bidRequest);
 }
 
-function interpretRespons(placementResponse, bidRequest, bids) {
+function interpretResponse(placementResponse, bidRequest, bids) {
     if (!placementResponse.error) {
         let adCode = "<script type=\"application/javascript\">(function(){var wu='" + (placementResponse.winUrl || '') + "',su='" + (placementResponse.statsUrl || '') + "'.replace(/\\[TIMESTAMP\\]/,(new Date()).getTime());";
         adCode += "if(navigator.sendBeacon){if(wu){navigator.sendBeacon(wu)||((new Image(1,1)).src=wu)};if(su){navigator.sendBeacon(su)||((new Image(1,1)).src=su)}}";
@@ -72,8 +72,8 @@ export const spec = {
     },
 
     buildRequests: function(validBidRequests) {
-        let bidRequestsByMaster = {},
-            requests = [];
+        const bidRequestsByMaster = {},
+	      requests = [];
 
         utils._each(validBidRequests, function(v) {
             assignToMaster(v, bidRequestsByMaster);
@@ -90,7 +90,7 @@ export const spec = {
 
         if (utils.isArray(serverResponse)) {
             utils._each(serverResponse, function(placementResponse) {
-                interpretRespons(placementResponse, bidRequest, bids);
+                interpretResponse(placementResponse, bidRequest, bids);
             });
         }
 
@@ -100,5 +100,5 @@ export const spec = {
     getUserSyncs: function(syncOptions) {
         // empty
     }
-}
+};
 registerBidder(spec);

From 90a2cd88ffccf49e2ba9bf9089eb8a30ab28b91b Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Tue, 17 Oct 2017 08:09:15 +0200
Subject: [PATCH 03/14] new demo placement

---
 modules/adoceanBidAdapter.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/adoceanBidAdapter.md b/modules/adoceanBidAdapter.md
index 6f0f2f59eb9..748c4567fe2 100644
--- a/modules/adoceanBidAdapter.md
+++ b/modules/adoceanBidAdapter.md
@@ -19,8 +19,8 @@ Banner formats are supported.
                    {
                        bidder: "adocean",
                        params: {
-                           slaveId: 'adoceanmyaoujfrkmihdi',
-                           masterId: 'TjoArMYvNzznfyIiD2MuWOGqz0N3gY_GbGvRX5rucGH.W7',
+                           slaveId: 'adoceanmyaozpniqismex',
+                           masterId: 'tmYF.DMl7ZBq.Nqt2Bq4FutQTJfTpxCOmtNPZoQUDcL.G7',
                            emiter: 'myao.adocean.pl'
                        }
                    }

From 15c6a0236f8b974eedf58c8d800253b45b7671e0 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Tue, 17 Oct 2017 13:15:49 +0200
Subject: [PATCH 04/14] formating after lint

---
 modules/adoceanBidAdapter.js | 149 +++++++++++++++++------------------
 1 file changed, 74 insertions(+), 75 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 7847571e916..6e5fd9e5e9c 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -1,104 +1,103 @@
 import * as utils from 'src/utils';
 import { registerBidder } from 'src/adapters/bidderFactory';
-import { config } from 'src/config';
 
 const BIDDER_CODE = 'adocean';
 
 function buildEndpointUrl(emiter, payload) {
-    let payloadString = "";
-    utils._each(payload, function(v, k) {
-        if (payloadString.length) {
-            payloadString += "&";
-        }
-        payloadString += k + "=" + encodeURIComponent(v);
-    });
+  let payloadString = '';
+  utils._each(payload, function(v, k) {
+    if (payloadString.length) {
+      payloadString += '&';
+    }
+    payloadString += k + '=' + encodeURIComponent(v);
+  });
 
-    return 'https://' + emiter + '/ad.json?' + payloadString;
+  return 'https://' + emiter + '/ad.json?' + payloadString;
 }
 
 function buildRequest(masterBidRequests, masterId) {
-    const firstBid = masterBidRequests[0];
-    const payload = {
-        id: masterId,
-    };
-
-    const bidIdMap = {};
-
-    utils._each(masterBidRequests, function(v) {
-        bidIdMap[v.slaveId] = v.bidId;
-    });
-
-    return {
-        method: 'GET',
-        url: buildEndpointUrl(firstBid.emiter, payload),
-        data: {},
-        bidIdMap: bidIdMap
-    };
+  const firstBid = masterBidRequests[0];
+  const payload = {
+    id: masterId,
+  };
+
+  const bidIdMap = {};
+
+  utils._each(masterBidRequests, function(v) {
+    bidIdMap[v.slaveId] = v.bidId;
+  });
+
+  return {
+    method: 'GET',
+    url: buildEndpointUrl(firstBid.emiter, payload),
+    data: {},
+    bidIdMap: bidIdMap
+  };
 }
 
 function assignToMaster(bidRequest, bidRequestsByMaster) {
-    const masterId = bidRequest.masterId;
-    bidRequestsByMaster[masterId] = bidRequestsByMaster[masterId] || [];
-    bidRequestsByMaster[masterId].push(bidRequest);
+  const masterId = bidRequest.masterId;
+  bidRequestsByMaster[masterId] = bidRequestsByMaster[masterId] || [];
+  bidRequestsByMaster[masterId].push(bidRequest);
 }
 
 function interpretResponse(placementResponse, bidRequest, bids) {
-    if (!placementResponse.error) {
-        let adCode = "<script type=\"application/javascript\">(function(){var wu='" + (placementResponse.winUrl || '') + "',su='" + (placementResponse.statsUrl || '') + "'.replace(/\\[TIMESTAMP\\]/,(new Date()).getTime());";
-        adCode += "if(navigator.sendBeacon){if(wu){navigator.sendBeacon(wu)||((new Image(1,1)).src=wu)};if(su){navigator.sendBeacon(su)||((new Image(1,1)).src=su)}}";
-        adCode += "else{if(wu){(new Image(1,1)).src=wu;}if(su){(new Image(1,1)).src=su;}}";
-        adCode += "})();<\/script>";
-        adCode += decodeURIComponent(placementResponse.code);
-
-        const bid = {
-            ad: adCode,
-            bidderCode: BIDDER_CODE,
-            cpm: parseFloat(placementResponse.price),
-            currency: placementResponse.currency,
-            height: parseInt(placementResponse.height, 10),
-            requestId: bidRequest.bidIdMap[placementResponse.id],
-            width: parseInt(placementResponse.width, 10),
-        };
-
-        bids.push(bid);
-    }
+  if (!placementResponse.error) {
+    let adCode = '<script type="application/javascript">(function(){var wu="' + (placementResponse.winUrl || '') + '",su="' + (placementResponse.statsUrl || '') + '".replace(/\\[TIMESTAMP\\]/,(new Date()).getTime());';
+    adCode += 'if(navigator.sendBeacon){if(wu){navigator.sendBeacon(wu)||((new Image(1,1)).src=wu)};if(su){navigator.sendBeacon(su)||((new Image(1,1)).src=su)}}';
+    adCode += 'else{if(wu){(new Image(1,1)).src=wu;}if(su){(new Image(1,1)).src=su;}}';
+    adCode += '})();<\/script>';
+    adCode += decodeURIComponent(placementResponse.code);
+
+    const bid = {
+      ad: adCode,
+      bidderCode: BIDDER_CODE,
+      cpm: parseFloat(placementResponse.price),
+      currency: placementResponse.currency,
+      height: parseInt(placementResponse.height, 10),
+      requestId: bidRequest.bidIdMap[placementResponse.id],
+      width: parseInt(placementResponse.width, 10),
+    };
+
+    bids.push(bid);
+  }
 }
 
 export const spec = {
-    code: BIDDER_CODE,
+  code: BIDDER_CODE,
 
-    isBidRequestValid: function(bid) {
-        return !!(bid.slaveId && bid.masterId && bid.emiter);
-    },
+  isBidRequestValid: function(bid) {
+    return !!(bid.slaveId && bid.masterId && bid.emiter);
+  },
 
-    buildRequests: function(validBidRequests) {
-        const bidRequestsByMaster = {},
-	      requests = [];
+  buildRequests: function(validBidRequests) {
+    const bidRequestsByMaster = {};
+    let requests = [];
 
-        utils._each(validBidRequests, function(v) {
-            assignToMaster(v, bidRequestsByMaster);
-        });
-        requests = utils._map(bidRequestsByMaster, function(v, k) {
-            return buildRequest(v, k);
-        });
+    utils._each(validBidRequests, function(v) {
+      assignToMaster(v, bidRequestsByMaster);
+    });
+    requests = utils._map(bidRequestsByMaster, function(v, k) {
+      return buildRequest(v, k);
+    });
 
-        return requests;
-    },
+    return requests;
+  },
 
-    interpretResponse: function(serverResponse, bidRequest) {
-        let bids = [];
+  interpretResponse: function(serverResponse, bidRequest) {
+    let bids = [];
 
-        if (utils.isArray(serverResponse)) {
-            utils._each(serverResponse, function(placementResponse) {
-                interpretResponse(placementResponse, bidRequest, bids);
-            });
-        }
+    if (utils.isArray(serverResponse)) {
+      utils._each(serverResponse, function(placementResponse) {
+        interpretResponse(placementResponse, bidRequest, bids);
+      });
+    }
 
-        return bids;
-    },
+    return bids;
+  },
 
-    getUserSyncs: function(syncOptions) {
-        // empty
-    }
+  getUserSyncs: function(syncOptions) {
+    // empty
+  }
 };
 registerBidder(spec);

From f16c555cc5d8bb66f109bc3ceb8862e280f8e9a7 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Wed, 18 Oct 2017 15:00:32 +0200
Subject: [PATCH 05/14] move request parameters to params

---
 modules/adoceanBidAdapter.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 6e5fd9e5e9c..5c751c8524e 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -24,19 +24,19 @@ function buildRequest(masterBidRequests, masterId) {
   const bidIdMap = {};
 
   utils._each(masterBidRequests, function(v) {
-    bidIdMap[v.slaveId] = v.bidId;
+    bidIdMap[v.params.slaveId] = v.bidId;
   });
 
   return {
     method: 'GET',
-    url: buildEndpointUrl(firstBid.emiter, payload),
+    url: buildEndpointUrl(firstBid.params.emiter, payload),
     data: {},
     bidIdMap: bidIdMap
   };
 }
 
 function assignToMaster(bidRequest, bidRequestsByMaster) {
-  const masterId = bidRequest.masterId;
+  const masterId = bidRequest.params.masterId;
   bidRequestsByMaster[masterId] = bidRequestsByMaster[masterId] || [];
   bidRequestsByMaster[masterId].push(bidRequest);
 }
@@ -67,7 +67,7 @@ export const spec = {
   code: BIDDER_CODE,
 
   isBidRequestValid: function(bid) {
-    return !!(bid.slaveId && bid.masterId && bid.emiter);
+    return !!(bid.params.slaveId && bid.params.masterId && bid.params.emiter);
   },
 
   buildRequests: function(validBidRequests) {

From a085f6f7cdad0f94a275c73b137f1fae32564dd4 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Wed, 18 Oct 2017 15:32:28 +0200
Subject: [PATCH 06/14] adocean adpater tests

---
 test/spec/modules/adoceanBidAdapter_spec.js | 147 ++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 test/spec/modules/adoceanBidAdapter_spec.js

diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
new file mode 100644
index 00000000000..fbdfbd63af0
--- /dev/null
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -0,0 +1,147 @@
+import { expect, use } from 'chai';
+import { spec } from 'modules/adoceanBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+
+describe('AdoceanAdapter', () => {
+  const adapter = newBidder(spec);
+
+  describe('inherited functions', () => {
+    it('exists and is a function', () => {
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', () => {
+    let bid = {
+      'bidder': 'adocean',
+      'params': {
+        'masterId': 'tmYF.DMl7ZBq.Nqt2Bq4FutQTJfTpxCOmtNPZoQUDcL.G7',
+        'slaveId': 'adoceanmyaozpniqismex',
+        'emiter': 'myao.adocean.pl'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', () => {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'masterId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    let bidRequests = [
+      {
+        'bidder': 'adocean',
+        'params': {
+          'masterId': 'tmYF.DMl7ZBq.Nqt2Bq4FutQTJfTpxCOmtNPZoQUDcL.G7',
+          'slaveId': 'adoceanmyaozpniqismex',
+          'emiter': 'myao.adocean.pl'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+
+    it('should add bidIdMap with slaveId => bidId mapping', () => {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.bidIdMap).to.exists;
+      const bidIdMap = request.bidIdMap;
+      expect(bidIdMap[bidRequests[0].params.slaveId]).to.equal(bidRequests[0].bidId);
+    });
+
+    it('sends bid request to url via GET', () => {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.method).to.equal('GET');
+      expect(request.url).to.match(new RegExp('^https://' + bidRequests[0].params.emiter + '/ad.json'));
+    });
+
+    it('should attach id to url', () => {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include('id=' + bidRequests[0].params.masterId);
+    });
+  })
+
+  describe('interpretResponse', () => {
+    const response = [
+      {
+        'id': 'adoceanmyaozpniqismex',
+        'price': '0.019000',
+        'winurl': '',
+        'statsUrl': '',
+        'code': '%3C!--%20Creative%20--%3E',
+        'currency': 'EUR',
+        'minFloorPrice': '0.01',
+        'width': '300',
+        'height': '250'
+      }
+    ];
+
+    const bidRequest = {
+      'bidder': 'adocean',
+      'params': {
+        'masterId': 'tmYF.DMl7ZBq.Nqt2Bq4FutQTJfTpxCOmtNPZoQUDcL.G7',
+        'slaveId': 'adoceanmyaozpniqismex',
+        'emiter': 'myao.adocean.pl'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250]],
+      'bidIdMap': {
+        'adoceanmyaozpniqismex': '30b31c1838de1e'
+      },
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should get correct bid response', () => {
+      const expectedResponse = [
+        {
+          'bidderCode': 'adocean',
+          'requestId': '30b31c1838de1e',
+          'cpm': 0.019000,
+          'currency': 'EUR',
+          'width': 300,
+          'height': 250,
+          'ad': '<!-- Creative -->'
+        }
+      ];
+
+      const result = spec.interpretResponse(response, bidRequest);
+      expect(result).to.have.lengthOf(1);
+      let resultKeys = Object.keys(result[0]);
+      expect(resultKeys.sort()).to.deep.equal(Object.keys(expectedResponse[0]).sort());
+      resultKeys.forEach(function(k) {
+        if (k === 'ad') {
+          expect(result[0][k]).to.match(/<!-- Creative -->$/);
+        } else {
+          expect(result[0][k]).to.equal(expectedResponse[0][k]);
+        }
+      });
+    });
+
+    it('handles nobid responses', () => {
+      const response = {
+        'id': 'adoceanmyaolafpjwftbz',
+        'error': 'true'
+      };
+
+      const result = spec.interpretResponse(response, bidRequest);
+      expect(result).to.have.lengthOf(0);
+    });
+  });
+});

From d18ccfec7c89c329e92bc9629a7ee0613acfba04 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@gemius.com>
Date: Thu, 19 Oct 2017 09:31:33 +0200
Subject: [PATCH 07/14] minor fixes

---
 test/spec/modules/adoceanBidAdapter_spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index fbdfbd63af0..a6990922427 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -12,7 +12,7 @@ describe('AdoceanAdapter', () => {
   });
 
   describe('isBidRequestValid', () => {
-    let bid = {
+    const bid = {
       'bidder': 'adocean',
       'params': {
         'masterId': 'tmYF.DMl7ZBq.Nqt2Bq4FutQTJfTpxCOmtNPZoQUDcL.G7',
@@ -31,7 +31,7 @@ describe('AdoceanAdapter', () => {
     });
 
     it('should return false when required params are not passed', () => {
-      let bid = Object.assign({}, bid);
+      const bid = Object.assign({}, bid);
       delete bid.params;
       bid.params = {
         'masterId': 0
@@ -41,7 +41,7 @@ describe('AdoceanAdapter', () => {
   });
 
   describe('buildRequests', () => {
-    let bidRequests = [
+    const bidRequests = [
       {
         'bidder': 'adocean',
         'params': {
@@ -67,7 +67,7 @@ describe('AdoceanAdapter', () => {
     it('sends bid request to url via GET', () => {
       const request = spec.buildRequests(bidRequests)[0];
       expect(request.method).to.equal('GET');
-      expect(request.url).to.match(new RegExp('^https://' + bidRequests[0].params.emiter + '/ad.json'));
+      expect(request.url).to.match(new RegExp(`^https://${bidRequests[0].params.emiter}/ad.json`));
     });
 
     it('should attach id to url', () => {

From 9711ee211ed0d709b324a61241e47cef2bf7ba11 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Wed, 25 Oct 2017 11:02:18 +0200
Subject: [PATCH 08/14] added ttl, netRevenue nad creativeId. merged with
 upstream

---
 modules/adoceanBidAdapter.js                | 12 +++--
 test/spec/modules/adoceanBidAdapter_spec.js | 49 +++++++++++++--------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 5c751c8524e..1949e0414a7 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -51,12 +51,14 @@ function interpretResponse(placementResponse, bidRequest, bids) {
 
     const bid = {
       ad: adCode,
-      bidderCode: BIDDER_CODE,
       cpm: parseFloat(placementResponse.price),
       currency: placementResponse.currency,
       height: parseInt(placementResponse.height, 10),
       requestId: bidRequest.bidIdMap[placementResponse.id],
       width: parseInt(placementResponse.width, 10),
+      netRevenue: false,
+      ttl: parseInt(placementResponse.ttl),
+      creativeId: placementResponse.crid
     };
 
     bids.push(bid);
@@ -87,17 +89,13 @@ export const spec = {
   interpretResponse: function(serverResponse, bidRequest) {
     let bids = [];
 
-    if (utils.isArray(serverResponse)) {
-      utils._each(serverResponse, function(placementResponse) {
+    if (utils.isArray(serverResponse.body)) {
+      utils._each(serverResponse.body, function(placementResponse) {
         interpretResponse(placementResponse, bidRequest, bids);
       });
     }
 
     return bids;
-  },
-
-  getUserSyncs: function(syncOptions) {
-    // empty
   }
 };
 registerBidder(spec);
diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index a6990922427..149b9eb4d53 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -1,4 +1,4 @@
-import { expect, use } from 'chai';
+import { expect } from 'chai';
 import { spec } from 'modules/adoceanBidAdapter';
 import { newBidder } from 'src/adapters/bidderFactory';
 
@@ -77,19 +77,26 @@ describe('AdoceanAdapter', () => {
   })
 
   describe('interpretResponse', () => {
-    const response = [
-      {
-        'id': 'adoceanmyaozpniqismex',
-        'price': '0.019000',
-        'winurl': '',
-        'statsUrl': '',
-        'code': '%3C!--%20Creative%20--%3E',
-        'currency': 'EUR',
-        'minFloorPrice': '0.01',
-        'width': '300',
-        'height': '250'
+    const response = {
+      'body': [
+        {
+          'id': 'adoceanmyaozpniqismex',
+          'price': '0.019000',
+          'winurl': '',
+          'statsUrl': '',
+          'code': '%3C!--%20Creative%20--%3E',
+          'currency': 'EUR',
+          'minFloorPrice': '0.01',
+          'width': '300',
+          'height': '250',
+          'crid': '0af345b42983cc4bc0',
+          'ttl': '300'
+        }
+      ],
+      'headers': {
+        'get': function() {}
       }
-    ];
+    };
 
     const bidRequest = {
       'bidder': 'adocean',
@@ -111,13 +118,15 @@ describe('AdoceanAdapter', () => {
     it('should get correct bid response', () => {
       const expectedResponse = [
         {
-          'bidderCode': 'adocean',
           'requestId': '30b31c1838de1e',
           'cpm': 0.019000,
           'currency': 'EUR',
           'width': 300,
           'height': 250,
-          'ad': '<!-- Creative -->'
+          'ad': '<!-- Creative -->',
+          'creativeId': '0af345b42983cc4bc0',
+          'ttl': 300,
+          'netRevenue': false
         }
       ];
 
@@ -135,10 +144,12 @@ describe('AdoceanAdapter', () => {
     });
 
     it('handles nobid responses', () => {
-      const response = {
-        'id': 'adoceanmyaolafpjwftbz',
-        'error': 'true'
-      };
+      response.body = [
+        {
+          'id': 'adoceanmyaolafpjwftbz',
+          'error': 'true'
+        }
+      ];
 
       const result = spec.interpretResponse(response, bidRequest);
       expect(result).to.have.lengthOf(0);

From eb8335545c82a2f16dcea1d835cd845ed2f237b1 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Thu, 16 Aug 2018 08:47:33 +0200
Subject: [PATCH 09/14] GDPR support

---
 modules/adoceanBidAdapter.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 1949e0414a7..fd005501060 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -15,11 +15,16 @@ function buildEndpointUrl(emiter, payload) {
   return 'https://' + emiter + '/ad.json?' + payloadString;
 }
 
-function buildRequest(masterBidRequests, masterId) {
+// FIXME: ADOCEAN-15635 - duplikacja slaveow
+function buildRequest(masterBidRequests, masterId, gdprConsent) {
   const firstBid = masterBidRequests[0];
   const payload = {
     id: masterId,
   };
+  if (gdprConsent) {
+    payload.gdpr_consent = gdprConsent.consentString;
+    payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
+  }
 
   const bidIdMap = {};
 
@@ -72,15 +77,15 @@ export const spec = {
     return !!(bid.params.slaveId && bid.params.masterId && bid.params.emiter);
   },
 
-  buildRequests: function(validBidRequests) {
+  buildRequests: function(validBidRequests, bidderRequest) {
     const bidRequestsByMaster = {};
     let requests = [];
 
-    utils._each(validBidRequests, function(v) {
-      assignToMaster(v, bidRequestsByMaster);
+    utils._each(validBidRequests, function(bidRequest) {
+      assignToMaster(bidRequest, bidRequestsByMaster);
     });
-    requests = utils._map(bidRequestsByMaster, function(v, k) {
-      return buildRequest(v, k);
+    requests = utils._map(bidRequestsByMaster, function(requests, masterId) {
+      return buildRequest(requests, masterId, bidderRequest.gdprConsent);
     });
 
     return requests;

From 94eaf1419b0e80ca164502b6136f223d15b3291f Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Thu, 16 Aug 2018 09:25:44 +0200
Subject: [PATCH 10/14] do not send empty gdpr_consent

---
 modules/adoceanBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index fd005501060..227ac443596 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -22,7 +22,7 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
     id: masterId,
   };
   if (gdprConsent) {
-    payload.gdpr_consent = gdprConsent.consentString;
+    payload.gdpr_consent = gdprConsent.consentString || undefined;
     payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
   }
 

From f93aa6d4f1f99b06dc6c6f172b102966e599c81c Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Thu, 16 Aug 2018 08:47:33 +0200
Subject: [PATCH 11/14] GDPR support

---
 modules/adoceanBidAdapter.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 1949e0414a7..fd005501060 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -15,11 +15,16 @@ function buildEndpointUrl(emiter, payload) {
   return 'https://' + emiter + '/ad.json?' + payloadString;
 }
 
-function buildRequest(masterBidRequests, masterId) {
+// FIXME: ADOCEAN-15635 - duplikacja slaveow
+function buildRequest(masterBidRequests, masterId, gdprConsent) {
   const firstBid = masterBidRequests[0];
   const payload = {
     id: masterId,
   };
+  if (gdprConsent) {
+    payload.gdpr_consent = gdprConsent.consentString;
+    payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
+  }
 
   const bidIdMap = {};
 
@@ -72,15 +77,15 @@ export const spec = {
     return !!(bid.params.slaveId && bid.params.masterId && bid.params.emiter);
   },
 
-  buildRequests: function(validBidRequests) {
+  buildRequests: function(validBidRequests, bidderRequest) {
     const bidRequestsByMaster = {};
     let requests = [];
 
-    utils._each(validBidRequests, function(v) {
-      assignToMaster(v, bidRequestsByMaster);
+    utils._each(validBidRequests, function(bidRequest) {
+      assignToMaster(bidRequest, bidRequestsByMaster);
     });
-    requests = utils._map(bidRequestsByMaster, function(v, k) {
-      return buildRequest(v, k);
+    requests = utils._map(bidRequestsByMaster, function(requests, masterId) {
+      return buildRequest(requests, masterId, bidderRequest.gdprConsent);
     });
 
     return requests;

From c4863afbdfd73ac207a0975828fc014ca9f4b4af Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Thu, 16 Aug 2018 09:25:44 +0200
Subject: [PATCH 12/14] do not send empty gdpr_consent

---
 modules/adoceanBidAdapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index fd005501060..227ac443596 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -22,7 +22,7 @@ function buildRequest(masterBidRequests, masterId, gdprConsent) {
     id: masterId,
   };
   if (gdprConsent) {
-    payload.gdpr_consent = gdprConsent.consentString;
+    payload.gdpr_consent = gdprConsent.consentString || undefined;
     payload.gdpr = gdprConsent.gdprApplies ? 1 : 0;
   }
 

From 3d1c423ff0df906f35fddb0827365bcd5f450ded Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Fri, 17 Aug 2018 08:51:56 +0200
Subject: [PATCH 13/14] AdOcean adapter: tests for gdpr_support

---
 test/spec/modules/adoceanBidAdapter_spec.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index 149b9eb4d53..39eb514752a 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -57,23 +57,36 @@ describe('AdoceanAdapter', () => {
       }
     ];
 
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: 'BOQHk-4OSlWKFBoABBPLBd-AAAAgWAHAACAAsAPQBSACmgFTAOkA',
+        gdprApplies: true
+      }
+    };
+
     it('should add bidIdMap with slaveId => bidId mapping', () => {
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.bidIdMap).to.exists;
       const bidIdMap = request.bidIdMap;
       expect(bidIdMap[bidRequests[0].params.slaveId]).to.equal(bidRequests[0].bidId);
     });
 
     it('sends bid request to url via GET', () => {
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.method).to.equal('GET');
       expect(request.url).to.match(new RegExp(`^https://${bidRequests[0].params.emiter}/ad.json`));
     });
 
     it('should attach id to url', () => {
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.url).to.include('id=' + bidRequests[0].params.masterId);
     });
+
+    it('should attach consent information to url', () => {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.url).to.include('gdpr=1');
+      expect(request.url).to.include('gdpr_consent=' + bidderRequest.gdprConsent.consentString);
+    });
   })
 
   describe('interpretResponse', () => {

From 5ed796df2be800a64e83919f64c6401db8866074 Mon Sep 17 00:00:00 2001
From: Jacek Drobiecki <jacek.drobiecki@adocean-global.com>
Date: Fri, 17 Aug 2018 09:02:19 +0200
Subject: [PATCH 14/14] remove old comment

---
 modules/adoceanBidAdapter.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/adoceanBidAdapter.js b/modules/adoceanBidAdapter.js
index 227ac443596..21e13e77a0a 100644
--- a/modules/adoceanBidAdapter.js
+++ b/modules/adoceanBidAdapter.js
@@ -15,7 +15,6 @@ function buildEndpointUrl(emiter, payload) {
   return 'https://' + emiter + '/ad.json?' + payloadString;
 }
 
-// FIXME: ADOCEAN-15635 - duplikacja slaveow
 function buildRequest(masterBidRequests, masterId, gdprConsent) {
   const firstBid = masterBidRequests[0];
   const payload = {