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

Rise Bid Adapter : support currency #10790

Merged
merged 72 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
3cfdf9d
add Rise adapter
noamtzuberi Jan 3, 2021
923e646
fixes
noamtzuberi Jan 3, 2021
499f36f
change param isOrg to org
noamtzuberi Jan 5, 2021
d33a8af
Rise adapter
noamtzuberi Jan 5, 2021
b2cdd97
change email for rise
noamtzuberi Jan 5, 2021
b8a140c
change email for rise
noamtzuberi Jan 5, 2021
3ce6a3b
fix circle failed
noamtzuberi Jan 5, 2021
dd10c25
bump
noamtzuberi Jan 5, 2021
464d2b7
bump
noamtzuberi Jan 5, 2021
1c52066
bump
noamtzuberi Jan 5, 2021
2b1fad5
remove space
noamtzuberi Jan 6, 2021
b08dd59
Merge branch 'master' of https://github.com/streamrail/Prebid.js
noamtzu Jul 6, 2021
924bb15
Upgrade Rise adapter to 5.0
noamtzu Jul 6, 2021
0f9e730
Merge branch 'prebid:master' into master
noamtzu Jul 13, 2021
87c6a56
Merge branch 'prebid:master' into master
noamtzu Jul 20, 2021
e8e613b
Merge branch 'master' of https://github.com/streamrail/Prebid.js
noamtzu Aug 18, 2021
1ba7048
Merge branch 'master' of github.com:prebid/Prebid.js
Aug 23, 2021
a032702
Merge branch 'prebid:master' into master
noamtzu Aug 27, 2021
a5e5954
Merge branch 'prebid:master' into master
noamtzu Sep 5, 2021
bc2dafd
Merge branch 'prebid:master' into master
noamtzu Sep 12, 2021
75344c1
Merge branch 'prebid:master' into master
noamtzu Sep 19, 2021
2e17e14
Merge branch 'prebid:master' into master
noamtzu Nov 21, 2021
03099f3
Merge branch 'prebid:master' into master
noamtzu Jan 13, 2022
5c30696
Merge branch 'prebid:master' into master
noamtzu Jan 17, 2022
bc1d897
Merge branch 'prebid:master' into master
noamtzu Jan 23, 2022
3ed7867
Merge branch 'prebid:master' into master
noamtzu Jan 27, 2022
9d8d6af
Merge branch 'prebid:master' into master
noamtzu Jan 30, 2022
12ef7fb
Merge branch 'prebid:master' into master
noamtzu Feb 10, 2022
a4bfb4f
Merge branch 'prebid:master' into master
OronW Feb 17, 2022
901d081
Merge branch 'prebid:master' into master
noamtzu Feb 21, 2022
33be3da
Merge branch 'prebid:master' into master
noamtzu Mar 7, 2022
0305688
Merge branch 'prebid:master' into master
noamtzu Mar 29, 2022
968253b
Merge branch 'prebid:master' into master
noamtzu Apr 3, 2022
208a3ef
Merge branch 'prebid:master' into master
noamtzu Apr 17, 2022
756ccf3
Merge branch 'prebid:master' into master
noamtzu May 12, 2022
dc33d03
Merge branch 'prebid:master' into master
noamtzu May 22, 2022
e27c291
Merge branch 'prebid:master' into master
noamtzu May 25, 2022
4fc0639
Merge branch 'prebid:master' into master
noamtzu Jun 8, 2022
4bbbbb3
Merge branch 'prebid:master' into master
noamtzu Jun 9, 2022
8e9318d
Merge branch 'prebid:master' into master
lasloche Jun 14, 2022
27e9a02
Merge branch 'prebid:master' into master
noamtzu Aug 3, 2022
a6489ff
Merge branch 'prebid:master' into master
innay Dec 12, 2022
7cdb4e5
added isWrapper param
innay Dec 12, 2022
ed9a426
Merge pull request #20 from streamrail/IVP-3999
innay Dec 12, 2022
79acf21
addes is_wrapper parameter to documentation
innay Dec 28, 2022
36d0c50
added is_wrapper to test
innay Dec 28, 2022
3b8885e
removed isWrapper
innay Dec 28, 2022
4c4b4f9
Merge pull request #21 from streamrail/IVP-3999
innay Dec 28, 2022
53db894
Merge branch 'prebid:master' into master
noamtzu Apr 17, 2023
c25259c
Merge branch 'prebid:master' into master
YakirLavi Apr 20, 2023
63bfe48
Rise Bid Adapter: support Coppa param (#24)
YakirLavi Apr 20, 2023
66c4e7b
MinuteMedia Bid Adapter: support Coppa param (#25)
YakirLavi Apr 20, 2023
6079b08
Revert "MinuteMedia Bid Adapter: support Coppa param (#25)" (#26)
YakirLavi Apr 20, 2023
4ba6846
bump
Apr 20, 2023
c354d7f
Merge branch 'prebid:master' into master
OronW Apr 30, 2023
b42186b
update coppa fetch
May 2, 2023
db9ede3
setting coppa param update
May 2, 2023
c587ad6
update Coppa tests
May 4, 2023
55f35f7
update test naming
May 4, 2023
8c70c21
Merge branch 'prebid:master' into master
YakirLavi May 22, 2023
efe1ede
Merge branch 'prebid:master' into master
YakirLavi May 24, 2023
589f0ec
Rise Bid Adapter: support plcmt and sua (#27)
YakirLavi May 24, 2023
6e03ea0
Merge branch 'prebid:master' into master
YakirLavi Jun 26, 2023
ac59f24
Merge branch 'prebid:master' into master
YakirLavi Jul 2, 2023
cab1f79
Merge branch 'prebid:master' into master
YakirLavi Jul 10, 2023
b8b69f8
update minuteMediaBidAdapter - support missing params (#29)
YakirLavi Jul 10, 2023
fe6030b
Merge branch 'prebid:master' into master
YakirLavi Aug 8, 2023
7e6e17d
Merge branch 'prebid:master' into master
YakirLavi Nov 1, 2023
0a36c16
Merge branch 'prebid:master' into master
YakirLavi Nov 14, 2023
843dd8a
Merge branch 'prebid:master' into master
noamtzu Nov 29, 2023
0fe9729
Merge branch 'prebid:master' into master
YakirLavi Dec 4, 2023
11d9373
RIseBidAdapter: support currency (#35)
YakirLavi Dec 4, 2023
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: 11 additions & 8 deletions modules/riseBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
const BIDDER_CODE = 'rise';
const ADAPTER_VERSION = '6.0.0';
const TTL = 360;
const CURRENCY = 'USD';
const DEFAULT_CURRENCY = 'USD';
const DEFAULT_SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
const MODES = {
PRODUCTION: 'hb-multi',
Expand Down Expand Up @@ -73,7 +73,7 @@ export const spec = {
const bidResponse = {
requestId: adUnit.requestId,
cpm: adUnit.cpm,
currency: adUnit.currency || CURRENCY,
currency: adUnit.currency || DEFAULT_CURRENCY,
width: adUnit.width,
height: adUnit.height,
ttl: adUnit.ttl || TTL,
Expand Down Expand Up @@ -140,18 +140,20 @@ registerBidder(spec);
/**
* Get floor price
* @param bid {bid}
* @param mediaType {string}
* @param currency {string}
* @returns {Number}
*/
function getFloor(bid, mediaType) {
function getFloor(bid, mediaType, currency) {
if (!isFn(bid.getFloor)) {
return 0;
}
let floorResult = bid.getFloor({
currency: CURRENCY,
currency: currency,
mediaType: mediaType,
size: '*'
});
return floorResult.currency === CURRENCY && floorResult.floor ? floorResult.floor : 0;
return floorResult.currency === currency && floorResult.floor ? floorResult.floor : 0;
}

/**
Expand Down Expand Up @@ -289,7 +291,7 @@ function generateBidParameters(bid, bidderRequest) {
const {params} = bid;
const mediaType = isBanner(bid) ? BANNER : VIDEO;
const sizesArray = getSizesArray(bid, mediaType);

const currency = params.currency || config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
// fix floor price in case of NAN
if (isNaN(params.floorPrice)) {
params.floorPrice = 0;
Expand All @@ -299,12 +301,13 @@ function generateBidParameters(bid, bidderRequest) {
mediaType,
adUnitCode: getBidIdParameter('adUnitCode', bid),
sizes: sizesArray,
floorPrice: Math.max(getFloor(bid, mediaType), params.floorPrice),
currency: currency,
floorPrice: Math.max(getFloor(bid, mediaType, currency), params.floorPrice),
bidId: getBidIdParameter('bidId', bid),
bidderRequestId: getBidIdParameter('bidderRequestId', bid),
loop: getBidIdParameter('bidderRequestsCount', bid),
transactionId: bid.ortb2Imp?.ext?.tid,
coppa: 0
coppa: 0,
};

const pos = deepAccess(bid, `mediaTypes.${mediaType}.pos`);
Expand Down
1 change: 1 addition & 0 deletions modules/riseBidAdapter.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The adapter supports Video(instream).
| `testMode` | optional | Boolean | This activates the test mode | false
| `rtbDomain` | optional | String | Sets the seller end point | "www.test.com"
| `is_wrapper` | private | Boolean | Please don't use unless your account manager asked you to | false
| `currency` | optional | String | 3 letters currency | "EUR"


# Test Parameters
Expand Down
12 changes: 11 additions & 1 deletion test/spec/modules/riseBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('riseAdapter', function () {
'adUnitCode': 'adunit-code',
'sizes': [[640, 480]],
'params': {
'org': 'jdye8weeyirk00000001'
'org': 'jdye8weeyirk00000001',
},
'bidId': '299ffc8cca0b87',
'loop': 1,
Expand Down Expand Up @@ -195,6 +195,16 @@ describe('riseAdapter', function () {
expect(request.data.bids[1].mediaType).to.equal(BANNER)
});

it('should send the correct currency in bid request', function () {
const bid = utils.deepClone(bidRequests[0]);
bid.params = {
'currency': 'EUR'
};
const expectedCurrency = bid.params.currency;
const request = spec.buildRequests([bid], bidderRequest);
expect(request.data.bids[0].currency).to.equal(expectedCurrency);
});

it('should respect syncEnabled option', function() {
config.setConfig({
userSync: {
Expand Down