Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions modules/adgenerationBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const adgLogger = prefixLog('Adgeneration: ');
*/

const ADG_BIDDER_CODE = 'adgeneration';
const ADGENE_PREBID_VERSION = '1.6.4';
const ADGENE_PREBID_VERSION = '1.6.5';
const DEBUG_URL = 'https://api-test.scaleout.jp/adgen/prebid';
const URL = 'https://d.socdm.com/adgen/prebid';

Expand All @@ -30,7 +30,6 @@ const converter = ortbConverter({
const imp = buildImp(bidRequest, context);
deepSetValue(imp, 'ext.params', bidRequest.params);
deepSetValue(imp, 'ext.mediaTypes', bidRequest.mediaTypes);
deepSetValue(imp, 'ext.novatiqSyncResponse', bidRequest?.userId?.novatiq?.snowflake?.syncResponse);
return imp;
},
request(buildRequest, imps, bidderRequest, context) {
Expand Down Expand Up @@ -70,13 +69,6 @@ export const spec = {
const id = getBidIdParameter('id', customParams);
const additionalParams = JSON.parse(JSON.stringify(rest));

// hyperIDが有効ではない場合、パラメータから削除する
if (!impObj?.ext?.novatiqSyncResponse || impObj?.ext?.novatiqSyncResponse !== 1) {
if (additionalParams?.user?.ext?.eids && Array.isArray(additionalParams?.user?.ext?.eids)) {
additionalParams.user.ext.eids = additionalParams?.user?.ext?.eids.filter((eid) => eid?.source !== 'novatiq.com');
}
}

let urlParams = ``;
urlParams = tryAppendQueryString(urlParams, 'id', id);
urlParams = tryAppendQueryString(urlParams, 'posall', 'SSPLOC');// not reaquired
Expand Down Expand Up @@ -147,7 +139,7 @@ export const spec = {
height: adResult.h ? adResult.h : 1,
creativeId: adResult.creativeid || '',
dealId: adResult.dealid || '',
currency: getCurrencyType(bidRequests.bidderRequest),
currency: bidRequests?.data?.currency || 'JPY',
netRevenue: true,
ttl: adResult.ttl || 10,
};
Expand Down
175 changes: 126 additions & 49 deletions test/spec/modules/adgenerationBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { addFPDToBidderRequest } from '../../helpers/fpd.js';

describe('AdgenerationAdapter', function () {
const adapter = newBidder(spec);
const ADGENE_PREBID_VERSION = '1.6.4';
const ADGENE_PREBID_VERSION = '1.6.5';
const ENDPOINT_STG = 'https://api-test.scaleout.jp/adgen/prebid';
const ENDPOINT_RELEASE = 'https://d.socdm.com/adgen/prebid';

Expand Down Expand Up @@ -117,23 +117,6 @@ describe('AdgenerationAdapter', function () {
auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a'
},
{ // bannerWithHyperId
bidder: 'adg',
params: {
id: '58278', // banner
},
adUnitCode: 'adunit-code',
sizes: [[320, 100]],
bidId: '2f6ac468a9c15e',
bidderRequestId: '14a9f773e30243',
auctionId: '4aae9f05-18c6-4fcd-80cf-282708cd584a',
transactionTd: 'f76f6dfd-d64f-4645-a29f-682bac7f431a',
userId: {
novatiq: {
snowflake: {'id': 'novatiqId', syncResponse: 1}
}
}
},
{ // bannerWithAdgextCriteoId
bidder: 'adg',
params: {
Expand Down Expand Up @@ -296,34 +279,10 @@ describe('AdgenerationAdapter', function () {
expect(request.data.sdkname).to.equal('prebidjs');
expect(request.data.adapterver).to.equal(ADGENE_PREBID_VERSION);
expect(request.data.ortb.imp[0].id).to.equal('2f6ac468a9c15e');
expect(request.data.ortb.imp[0].ext.novatiqSyncResponse).to.equal(undefined);
expect(request.data.ortb.imp[0].ext.params.id).to.equal('58278');
expect(request.data.ortb.imp[0].ext.mediaTypes).to.deep.equal(expectedMediaTypes);
});

it('should attache params to the bannerWithHyperId request', function () {
const hyperIdParams = {
user: {
ext: {
eids: [
{
source: 'novatiq.com',
uids: [
{
'id': 'xxxxxx'
}
]
},
]
}
}
}
const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: hyperIdParams})[2];

expect(request.data.ortb.imp[0].ext.novatiqSyncResponse).to.equal(1);
expect(request.data.ortb.user).to.deep.equal(hyperIdParams.user);
});

it('should attache params to the bannerWithAdgextCriteoId request', function () {
const criteoParams = {
user: {
Expand Down Expand Up @@ -395,7 +354,7 @@ describe('AdgenerationAdapter', function () {
}
},
}
const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: idparams})[4];
const request = spec.buildRequests(bidRequests, {...bidderRequest, ortb2: idparams})[3];
expect(request.data.ortb.user).to.deep.equal(idparams.user);

// gpid
Expand Down Expand Up @@ -668,8 +627,7 @@ describe('AdgenerationAdapter', function () {
'sendId': false
}
}
},
'novatiqSyncResponse': 2
}
},
'id': '2f6ac468a9c15e',
'native': {
Expand Down Expand Up @@ -791,7 +749,7 @@ describe('AdgenerationAdapter', function () {
method: 'POST',
url: 'https://api-test.scaleout.jp/adgen/prebid?id=15410&posall=SSPLOC&sdktype=0',
data: {
'currency': 'JPY',
'currency': 'USD',
'pbver': prebid.version,
'sdkname': 'prebidjs',
'adapterver': ADGENE_PREBID_VERSION,
Expand Down Expand Up @@ -833,8 +791,7 @@ describe('AdgenerationAdapter', function () {
]
]
}
},
'novatiqSyncResponse': 2
}
},
'id': '2f6ac468a9c15e',
'banner': {
Expand Down Expand Up @@ -1235,7 +1192,10 @@ describe('AdgenerationAdapter', function () {
}
};
return addFPDToBidderRequest(bidderRequest).then(res => {
const result = spec.interpretResponse({body: serverResponse.normal.upperBillboard}, { ...bidRequests.upperBillboard, bidderRequest: res })[0];
const sr = {body: serverResponse.normal.upperBillboard};
const br = { bidderRequest: res, ...bidRequests.upperBillboard };

const result = spec.interpretResponse(sr, br)[0];
expect(result.requestId).to.equal(bidResponses.normal.upperBillboard.requestId);
expect(result.width).to.equal(bidResponses.normal.upperBillboard.width);
expect(result.height).to.equal(bidResponses.normal.upperBillboard.height);
Expand Down Expand Up @@ -1340,5 +1300,122 @@ describe('AdgenerationAdapter', function () {
expect(result).to.not.have.any.keys('meta');
expect(result).to.not.have.any.keys('advertiserDomains');
});

describe('currency handling', function () {
const bidRequest = {
method: 'POST',
url: 'https://d.socdm.com/adgen/prebid',
data: {
currency: 'USD',
pbver: prebid.version,
sdkname: 'prebidjs',
adapterver: ADGENE_PREBID_VERSION,
ortb: {
imp: [{
id: 'test-imp-id',
ext: {
params: { id: '58278' },
mediaTypes: { banner: { sizes: [[300, 250]] } }
}
}]
}
}
};

it('uses currency from data when available', function () {
const serverResponse = {
body: {
results: [{
cpm: 100,
w: 300,
h: 250,
creativeid: 'test-creative-id',
dealid: 'test-deal-id',
ad: '<div>Test Ad</div>'
}]
}
};

const result = spec.interpretResponse(serverResponse, bidRequest)[0];
expect(result.currency).to.equal('USD');
expect(result.cpm).to.equal(100);
});

it('defaults to JPY when no currency information available', function () {
const requestWithoutCurrency = {
method: 'POST',
url: 'https://d.socdm.com/adgen/prebid',
data: {
pbver: prebid.version,
sdkname: 'prebidjs',
adapterver: ADGENE_PREBID_VERSION,
ortb: {
imp: [{
id: 'test-imp-id',
ext: {
params: { id: '58278' },
mediaTypes: { banner: { sizes: [[300, 250]] } }
}
}]
}
}
};

const serverResponse = {
body: {
results: [{
cpm: 300,
w: 300,
h: 250,
creativeid: 'test-creative-id',
dealid: 'test-deal-id',
ad: '<div>Test Ad</div>'
}]
}
};

const result = spec.interpretResponse(serverResponse, requestWithoutCurrency)[0];
expect(result.currency).to.equal('JPY');
});

it('handles currency correctly with getCurrencyType function logic', function () {
// Test the current implementation which uses bidRequests?.data?.currency || 'JPY'
const bidRequestWithJPY = {
method: 'POST',
url: 'https://d.socdm.com/adgen/prebid',
data: {
currency: 'JPY',
pbver: prebid.version,
sdkname: 'prebidjs',
adapterver: ADGENE_PREBID_VERSION,
ortb: {
imp: [{
id: 'test-imp-id',
ext: {
params: { id: '58278' },
mediaTypes: { banner: { sizes: [[300, 250]] } }
}
}]
}
}
};

const serverResponse = {
body: {
results: [{
cpm: 150,
w: 300,
h: 250,
creativeid: 'test-creative-id',
dealid: 'test-deal-id',
ad: '<div>Test Ad</div>'
}]
}
};

const result = spec.interpretResponse(serverResponse, bidRequestWithJPY)[0];
expect(result.currency).to.equal('JPY');
});
});
});
});
Loading