-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Various bid adapters: Currency config cleanup #12102
Open
mkomorski
wants to merge
12
commits into
master
Choose a base branch
from
10656-currency-config-cleanup
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+454
−400
Open
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
c0cdd70
cleanup currency poc
f13208c
update
bd7070b
update
dff9021
update
12c916b
update
3d2f1b8
fix
6c905bc
investigation
cb790fb
review fixes
000d11c
Do not change ortbConverter priority
dgirardi 1eff842
Merge branch 'master' into 10656-currency-config-cleanup
dgirardi 72d3cb1
Merge branch 'master' into 10656-currency-config-cleanup
patmmccann 6f0ad56
Update admaticBidAdapter.js
patmmccann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
const additionalData = new WeakMap(); | ||
|
||
export function getCurrencyFromBidderRequest(bidderRequest) { | ||
return (bidderRequest?.ortb2?.ext?.cur || [])[0]; | ||
} | ||
|
||
export function setAdditionalData(obj, key, value) { | ||
const prevValue = additionalData.get(obj) || {}; | ||
additionalData.set(obj, { ...prevValue, [key]: value }); | ||
} | ||
|
||
export function getAdditionalData(obj, key) { | ||
const data = additionalData.get(obj) || {}; | ||
return data[key]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
import {logError, logInfo, logMessage, logWarn} from '../src/utils.js'; | ||
import {deepSetValue, logError, logInfo, logMessage, logWarn} from '../src/utils.js'; | ||
import {getGlobal} from '../src/prebidGlobal.js'; | ||
import { EVENTS, REJECTION_REASON } from '../src/constants.js'; | ||
import {ajax} from '../src/ajax.js'; | ||
|
@@ -8,6 +8,7 @@ import {defer} from '../src/utils/promise.js'; | |
import {registerOrtbProcessor, REQUEST} from '../src/pbjsORTB.js'; | ||
import {timedBidResponseHook} from '../src/utils/perfMetrics.js'; | ||
import {on as onEvent, off as offEvent} from '../src/events.js'; | ||
import { enrichFPD } from '../src/fpd/enrichment.js'; | ||
|
||
const DEFAULT_CURRENCY_RATE_URL = 'https://cdn.jsdelivr.net/gh/prebid/currency-file@1/latest.json?date=$$TODAY$$'; | ||
const CURRENCY_RATE_PRECISION = 4; | ||
|
@@ -162,16 +163,18 @@ function initCurrency() { | |
getGlobal().convertCurrency = (cpm, fromCurrency, toCurrency) => parseFloat(cpm) * getCurrencyConversion(fromCurrency, toCurrency); | ||
getHook('addBidResponse').before(addBidResponseHook, 100); | ||
getHook('responsesReady').before(responsesReadyHook); | ||
enrichFPD.before(enrichFPDHook); | ||
onEvent(EVENTS.AUCTION_TIMEOUT, rejectOnAuctionTimeout); | ||
onEvent(EVENTS.AUCTION_INIT, loadRates); | ||
loadRates(); | ||
} | ||
} | ||
|
||
function resetCurrency() { | ||
export function resetCurrency() { | ||
if (currencySupportEnabled) { | ||
getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove(); | ||
getHook('responsesReady').getHooks({hook: responsesReadyHook}).remove(); | ||
enrichFPD.getHooks({hook: enrichFPDHook}).remove(); | ||
offEvent(EVENTS.AUCTION_TIMEOUT, rejectOnAuctionTimeout); | ||
offEvent(EVENTS.AUCTION_INIT, loadRates); | ||
delete getGlobal().convertCurrency; | ||
|
@@ -334,4 +337,11 @@ export function setOrtbCurrency(ortbRequest, bidderRequest, context) { | |
} | ||
} | ||
|
||
registerOrtbProcessor({type: REQUEST, name: 'currency', fn: setOrtbCurrency}); | ||
registerOrtbProcessor({type: REQUEST, name: 'currency', fn: setOrtbCurrency, priority: 100}); | ||
|
||
function enrichFPDHook(next, fpd) { | ||
return next(fpd.then(ortb2 => { | ||
deepSetValue(ortb2, 'ext.cur', [adServerCurrency]); | ||
return ortb2; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
( |
||
})) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if these are only used for adserverCurrency, they'd be better as
set/getAdServerCurrency
(they are in a currency library after all, unlikely/unsuitable to be used for anything else).But if they are only used for one adapter, I don't think they're needed at all - the adapter itself can maintain the map.