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

fix two issues related to hb_uuid and hb_cache_id targeting keys #3568

Merged
merged 4 commits into from
Feb 27, 2019
Merged

fix two issues related to hb_uuid and hb_cache_id targeting keys #3568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c83ac4d
move logic that assigns bid targeting params
jsnellbaker Feb 19, 2019
14ee9c0
switch order of targeting keys assignment in dfpAdServerVideo
jsnellbaker Feb 19, 2019
e09f0ef
remove redundant cache key assignment in dfp module and update unit t…
jsnellbaker Feb 19, 2019
cb0d06f
refactor logic when adding cache targeting keys
jsnellbaker Feb 19, 2019
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
3 changes: 0 additions & 3 deletions modules/dfpAdServerVideo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ function getCustParams(bid, options) {
let customParams = Object.assign({},
allTargetingData,
adserverTargeting,
{ hb_uuid: bid && bid.videoCacheKey },
// hb_uuid will be deprecated and replaced by hb_cache_id
{ hb_cache_id: bid && bid.videoCacheKey },
optCustParams,
);
return encodeURIComponent(formatQS(customParams));
Expand Down
20 changes: 15 additions & 5 deletions src/auction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ export function doCallbacksIfTimedout(auctionInstance, bidResponse) {

// Add a bid to the auction.
export function addBidToAuction(auctionInstance, bidResponse) {
setupBidTargeting(bidResponse);

events.emit(CONSTANTS.EVENTS.BID_RESPONSE, bidResponse);
auctionInstance.addBidReceived(bidResponse);

Expand Down Expand Up @@ -429,6 +431,7 @@ const callPrebidCache = hook('async', function(auctionInstance, bidResponse, aft
doCallbacksIfTimedout(auctionInstance, bidResponse);
} else {
bidResponse.videoCacheKey = cacheIds[0].uuid;

if (!bidResponse.vastUrl) {
bidResponse.vastUrl = getCacheUrl(bidResponse.videoCacheKey);
}
Expand Down Expand Up @@ -485,16 +488,23 @@ function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
bidObject.pbDg = priceStringsObj.dense;
bidObject.pbCg = priceStringsObj.custom;

// if there is any key value pairs to map do here
var keyValues;
return bidObject;
}

function setupBidTargeting(bidObject) {
let keyValues;
if (bidObject.bidderCode && (bidObject.cpm > 0 || bidObject.dealId)) {
keyValues = getKeyValueTargetingPairs(bidObject.bidderCode, bidObject);
}

// use any targeting provided as defaults, otherwise just set from getKeyValueTargetingPairs
bidObject.adserverTargeting = Object.assign(bidObject.adserverTargeting || {}, keyValues);
let cacheTargetKeys = {};
if (bidObject.videoCacheKey) {
cacheTargetKeys.hb_uuid = bidObject.videoCacheKey;
cacheTargetKeys.hb_cache_id = bidObject.videoCacheKey;
}

return bidObject;
// use any targeting provided as defaults, otherwise just set from getKeyValueTargetingPairs
bidObject.adserverTargeting = Object.assign(bidObject.adserverTargeting || {}, cacheTargetKeys, keyValues);
}

export function getStandardBidderSettings(mediaType) {
Expand Down
33 changes: 18 additions & 15 deletions test/spec/modules/dfpAdServerVideo_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { targeting } from 'src/targeting';

const bid = {
videoCacheKey: 'abc',
adserverTargeting: { },
adserverTargeting: {
hb_uuid: 'abc',
hb_cache_id: 'abc',
},
};

describe('The DFP video support module', function () {
Expand Down Expand Up @@ -40,7 +43,7 @@ describe('The DFP video support module', function () {
});

it('can take an adserver url as a parameter', function () {
const bidCopy = Object.assign({ }, bid);
const bidCopy = utils.deepClone(bid);
bidCopy.vastUrl = 'vastUrl.example';

const url = parse(buildDfpVideoUrl({
Expand Down Expand Up @@ -90,10 +93,10 @@ describe('The DFP video support module', function () {
});

it('should include the cache key and adserver targeting in cust_params', function () {
const bidCopy = Object.assign({ }, bid);
bidCopy.adserverTargeting = {
const bidCopy = utils.deepClone(bid);
bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
hb_adid: 'ad_id',
};
});

const url = parse(buildDfpVideoUrl({
adUnit: adUnit,
Expand Down Expand Up @@ -160,10 +163,10 @@ describe('The DFP video support module', function () {
}
});

const bidCopy = Object.assign({ }, bid);
bidCopy.adserverTargeting = {
const bidCopy = utils.deepClone(bid);
bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
hb_adid: 'ad_id',
};
});

const url = parse(buildDfpVideoUrl({
adUnit: adUnitsCopy,
Expand All @@ -184,10 +187,10 @@ describe('The DFP video support module', function () {
});

it('should merge the user-provided cust_params with the default ones', function () {
const bidCopy = Object.assign({ }, bid);
bidCopy.adserverTargeting = {
const bidCopy = utils.deepClone(bid);
bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
hb_adid: 'ad_id',
};
});

const url = parse(buildDfpVideoUrl({
adUnit: adUnit,
Expand All @@ -207,10 +210,10 @@ describe('The DFP video support module', function () {
});

it('should merge the user-provided cust-params with the default ones when using url object', function () {
const bidCopy = Object.assign({ }, bid);
bidCopy.adserverTargeting = {
const bidCopy = utils.deepClone(bid);
bidCopy.adserverTargeting = Object.assign(bidCopy.adserverTargeting, {
hb_adid: 'ad_id',
};
});

const url = parse(buildDfpVideoUrl({
adUnit: adUnit,
Expand All @@ -229,7 +232,7 @@ describe('The DFP video support module', function () {
});

it('should not overwrite an existing description_url for object input and cache disabled', function () {
const bidCopy = Object.assign({}, bid);
const bidCopy = utils.deepClone(bid);
bidCopy.vastUrl = 'vastUrl.example';

const url = parse(buildDfpVideoUrl({
Expand Down