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.

Sign up for GitHub

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

Adhese Bid Adapter: Per adunit targets #6256

Merged
merged 7 commits into from
Feb 3, 2021
Merged

Adhese Bid Adapter: Per adunit targets #6256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70a3cf2
adpod category support test
Oct 26, 2020
5bd77d1
Revert "adpod category support test"
Oct 26, 2020
90efe5e
adpod category support test
Oct 26, 2020
159fd92
Revert "adpod category support test"
Oct 26, 2020
62d811f
Merge branch 'master' of github.com:adhese/Prebid.js
mefjush Jan 28, 2021
7d40e30
Make bid params apply to individual slots only
mefjush Jan 28, 2021
d57131f
Keep common parameters in global field
mefjush Jan 29, 2021
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
13 changes: 9 additions & 4 deletions modules/adheseBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,19 @@ export const spec = {
}
const { gdprConsent, refererInfo } = bidderRequest;

const targets = validBidRequests.map(bid => bid.params.data).reduce(mergeTargets, {});
const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
const refererParams = (refererInfo && refererInfo.referer) ? { xf: [base64urlEncode(refererInfo.referer)] } : {};
const id5Params = (getId5Id(validBidRequests)) ? { x5: [getId5Id(validBidRequests)] } : {};
const slots = validBidRequests.map(bid => ({ slotname: bidToSlotName(bid) }));
const commonParams = { ...gdprParams, ...refererParams, ...id5Params };

const slots = validBidRequests.map(bid => ({
slotname: bidToSlotName(bid),
parameters: cleanTargets(bid.params.data)
}));

const payload = {
slots: slots,
parameters: { ...targets, ...gdprParams, ...refererParams, ...id5Params }
parameters: commonParams
}

const account = getAccount(validBidRequests);
Expand Down Expand Up @@ -110,7 +114,8 @@ function adResponse(bid, ad) {
return bidResponse;
}

function mergeTargets(targets, target) {
function cleanTargets(target) {
const targets = {};
if (target) {
Object.keys(target).forEach(function (key) {
const val = target[key];
Expand Down
14 changes: 8 additions & 6 deletions test/spec/modules/adheseBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,31 +74,33 @@ describe('AdheseAdapter', function () {
it('should include requested slots', function () {
let req = spec.buildRequests([ minimalBid() ], bidderRequest);

expect(JSON.parse(req.data).slots).to.deep.include({ 'slotname': '_main_page_-leaderboard' });
expect(JSON.parse(req.data).slots[0].slotname).to.equal('_main_page_-leaderboard');
});

it('should include all extra bid params', function () {
let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }) ], bidderRequest);

expect(JSON.parse(req.data).parameters).to.deep.include({ 'ag': [ '25' ] });
expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] });
});

it('should include duplicate bid params once', function () {
it('should assign bid params per slot', function () {
let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }), bidWithParams({ 'ag': '25', 'ci': 'gent' }) ], bidderRequest);

expect(JSON.parse(req.data).parameters).to.deep.include({'ag': ['25']}).and.to.deep.include({ 'ci': [ 'gent' ] });
expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] }).and.not.to.deep.include({ 'ci': [ 'gent' ] });
expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ag': [ '25' ] }).and.to.deep.include({ 'ci': [ 'gent' ] });
});

it('should split multiple target values', function () {
let req = spec.buildRequests([ bidWithParams({ 'ci': 'london' }), bidWithParams({ 'ci': 'gent' }) ], bidderRequest);

expect(JSON.parse(req.data).parameters).to.deep.include({ 'ci': [ 'london', 'gent' ] });
expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ci': [ 'london' ] });
expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ci': [ 'gent' ] });
});

it('should filter out empty params', function () {
let req = spec.buildRequests([ bidWithParams({ 'aa': [], 'bb': null, 'cc': '', 'dd': [ '', '' ], 'ee': [ 0, 1, null ], 'ff': 0, 'gg': [ 'x', 'y', '' ] }) ], bidderRequest);

let params = JSON.parse(req.data).parameters;
let params = JSON.parse(req.data).slots[0].parameters;
expect(params).to.not.have.any.keys('aa', 'bb', 'cc', 'dd');
expect(params).to.deep.include({ 'ee': [ 0, 1 ], 'ff': [ 0 ], 'gg': [ 'x', 'y' ] });
});
Expand Down