Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support send multi request #2684

Merged
merged 48 commits into from
Jun 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1139ef1
commit gamma adapter
gammassp Feb 1, 2018
f0346d6
Fixed The Travis CI build failed
gammassp Feb 1, 2018
44cc909
fix interpretResponse return empty when server response empty
gammassp Feb 1, 2018
1f76f1d
removed mediaType
gammassp Feb 5, 2018
895d71e
fixed Travis CI build
gammassp Feb 5, 2018
8e3c38a
Travis CI build
gammassp Feb 5, 2018
e83dd68
add gamma spec
gammassp Feb 5, 2018
ffbfddb
fixed Travis CI build
gammassp Feb 5, 2018
57d241c
fix spec
gammassp Feb 5, 2018
ce3f6ea
fix spec
gammassp Feb 5, 2018
f63f0ec
Add files via upload
gammassp Feb 5, 2018
489a8f1
Add files via upload
gammassp Feb 5, 2018
718a4e7
fix spec
gammassp Feb 5, 2018
efba42f
fix Travis CI build
gammassp Feb 5, 2018
94e1f10
move to module
gammassp Feb 5, 2018
25e2520
remove gaxDomain param and move to adapter
gammassp Feb 12, 2018
b9889ad
remove check isBidRequestValid for gaxDomain
gammassp Feb 12, 2018
eca96a9
remove gaxDomain param
gammassp Feb 12, 2018
f5cf69e
remove gaxDomain param
gammassp Feb 12, 2018
a7bbbb2
remove gaxDomain param
gammassp Feb 12, 2018
81ed069
Delete gammaBidAdapter_spec.js
gammassp Feb 12, 2018
bb4169c
add usersync endpoid
gammassp Mar 5, 2018
29c0732
Merge branch 'master' into master
gammassp Mar 5, 2018
6ca18f4
add usersync
gammassp Mar 5, 2018
1548a0c
add vastUrl
gammassp Mar 14, 2018
7e5f905
add supportedMediaTypes to bidder spec
gammassp Mar 15, 2018
3163130
add Test Parameters: For Video
gammassp Mar 15, 2018
146f7e2
Add encodeURIComponent for referer url
gammassp May 24, 2018
d140fd4
support send multi request
gammassp Jun 6, 2018
c6e570a
support send multi request
gammassp Jun 6, 2018
2464c4a
fix confict
gammassp Jun 6, 2018
3375209
fix conflict
gammassp Jun 6, 2018
de6f3c2
Merge branch 'master' into master
gammassp Jun 6, 2018
6462bbd
support multi request
gammassp Jun 6, 2018
39d8286
fix indent
gammassp Jun 7, 2018
c597ce3
multi request
gammassp Jun 7, 2018
94650f0
fix indent
gammassp Jun 7, 2018
85fc8dd
Add files via upload
gammassp Jun 7, 2018
977ebda
Add files via upload
gammassp Jun 7, 2018
8a39e9a
Add files via upload
gammassp Jun 7, 2018
4afbf3a
Add files via upload
gammassp Jun 7, 2018
47240d9
Add files via upload
gammassp Jun 7, 2018
fbd887f
Add files via upload
gammassp Jun 7, 2018
920c2d4
Add files via upload
gammassp Jun 7, 2018
d17ed8f
Delete gammaBidAdapter_spec.js
gammassp Jun 7, 2018
09c970a
Delete gammaBidAdapter_spec.js
gammassp Jun 7, 2018
1d9002b
Add files via upload
gammassp Jun 7, 2018
8182460
Add files via upload
gammassp Jun 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions modules/gammaBidAdapter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as utils from 'src/utils';
import { registerBidder } from 'src/adapters/bidderFactory';
import find from 'core-js/library/fn/array/find';

const ENDPOINT = 'hb.gammaplatform.com';
const BIDDER_CODE = 'gamma';
Expand All @@ -27,11 +26,15 @@ export const spec = {
* @return ServerRequest Info describing the request to the server.
*/
buildRequests: function(bidRequests) {
const gaxObjParams = find(bidRequests, hasParamInfo);
return {
method: 'GET',
url: '//' + ENDPOINT + '/adx/request?wid=' + gaxObjParams.params.siteId + '&zid=' + gaxObjParams.params.zoneId + '&hb=pbjs&bidid=' + gaxObjParams.bidId + '&urf=' + encodeURIComponent(utils.getTopWindowUrl())
};
const serverRequests = [];
for (var i = 0, len = bidRequests.length; i < len; i++) {
const gaxObjParams = bidRequests[i];
serverRequests.push({
method: 'GET',
url: '//' + ENDPOINT + '/adx/request?wid=' + gaxObjParams.params.siteId + '&zid=' + gaxObjParams.params.zoneId + '&hb=pbjs&bidid=' + gaxObjParams.bidId + '&urf=' + encodeURIComponent(utils.getTopWindowUrl())
});
}
return serverRequests;
},

/**
Expand Down Expand Up @@ -94,8 +97,4 @@ function newBid(serverBid) {
return bid;
}

function hasParamInfo(bid) {
return !!bid.params;
}

registerBidder(spec);
106 changes: 46 additions & 60 deletions test/spec/modules/gammaBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@ import { newBidder } from 'src/adapters/bidderFactory';
describe('gammaBidAdapter', function() {
const adapter = newBidder(spec);

describe('isBidRequestValid', () => {
let bid = {
'bidder': 'gamma',
'params': {
siteId: '1465446377',
zoneId: '1515999290'
},
'adUnitCode': 'adunit-code',
'sizes': [
[300, 250]
],
'bidId': '23beaa6af6cdde',
'bidderRequestId': '19c0c1efdf37e7',
'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
};
let bid = {
'bidder': 'gamma',
'params': {
siteId: '1465446377',
zoneId: '1515999290'
},
'adUnitCode': 'adunit-code',
'sizes': [
[300, 250]
],
'bidId': '23beaa6af6cdde',
'bidderRequestId': '19c0c1efdf37e7',
'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
};
let bidArray = [bid];

describe('isBidRequestValid', () => {
it('should return true when required params found', () => {
expect(spec.isBidRequestValid(bid)).to.equal(true);
});
Expand All @@ -40,56 +41,41 @@ describe('gammaBidAdapter', function() {
});

describe('buildRequests', () => {
let bidRequests = [
{
'bidder': 'gamma',
'params': {
siteId: '1465446377',
zoneId: '1515999290'
},
'adUnitCode': 'adunit-code',
'sizes': [
[300, 250]
],
'bidId': '23beaa6af6cdde',
'bidderRequestId': '19c0c1efdf37e7',
'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1'
}
];

const request = spec.buildRequests(bidRequests);

it('sends bid request to our endpoint via GET', () => {
expect(request.method).to.equal('GET');
});

it('bidRequest url', () => {
expect(request.url).to.match(new RegExp(`hb.gammaplatform.com`));
it('should attempt to send bid requests to the endpoint via GET', () => {
const requests = spec.buildRequests(bidArray);
requests.forEach(function(requestItem) {
expect(requestItem.method).to.equal('GET');
expect(requestItem.url).to.match(new RegExp(`hb.gammaplatform.com`));
});
});
});

describe('interpretResponse', () => {
let serverResponse = {
body: {
'id': '23beaa6af6cdde',
'bid': '5611802021800040585',
'type': 'banner',
'cur': 'USD',
'seatbid': [{
'seat': '5611802021800040585',
'bid': [{
'id': '1515999070',
'impid': '1',
'price': 0.45,
'adm': '<!-- Creative -->',
'adid': '1515999070',
'dealid': 'gax-paj2qarjf2g',
'h': 250,
'w': 300
let serverResponse;

beforeEach(() => {
serverResponse = {
body: {
'id': '23beaa6af6cdde',
'bid': '5611802021800040585',
'type': 'banner',
'cur': 'USD',
'seatbid': [{
'seat': '5611802021800040585',
'bid': [{
'id': '1515999070',
'impid': '1',
'price': 0.45,
'adm': '<!-- Creative -->',
'adid': '1515999070',
'dealid': 'gax-paj2qarjf2g',
'h': 250,
'w': 300
}]
}]
}]
}
};
}
};
})

it('should get the correct bid response', () => {
let expectedResponse = [{
Expand Down