Skip to content

Functional tests/currency mock #3982

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

Merged
osulzhenko merged 2 commits into from
Jun 3, 2025
Merged

Functional tests/currency mock #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c05d6a
Rebuild currency mock for functional tests
osulzhenko Jun 2, 2025
bab48aa
update functional tests
osulzhenko Jun 3, 2025
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
8 changes: 7 additions & 1 deletion src/test/groovy/org/prebid/server/functional/service/PrebidServerService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.prebid.server.functional.model.response.setuid.SetuidResponse
import org.prebid.server.functional.model.response.status.StatusResponse
import org.prebid.server.functional.testcontainers.container.PrebidServerContainer
import org.prebid.server.functional.util.ObjectMapperWrapper
import org.prebid.server.functional.util.PBSUtils
import org.slf4j.Logger
import org.slf4j.LoggerFactory

Expand Down Expand Up @@ -412,7 +413,12 @@ class PrebidServerService implements ObjectMapperWrapper {
}

Boolean isContainLogsByValue(String value) {
getPbsLogsByValue(value) != null
try {
PBSUtils.waitUntil({ getPbsLogsByValue(value) != null })
true
} catch (IllegalStateException ignored) {
false
}
}

private String getPbsLogsByValue(String value) {
Expand Down
11 changes: 10 additions & 1 deletion src/test/groovy/org/prebid/server/functional/testcontainers/PbsConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.testcontainers.containers.PostgreSQLContainer
import static org.prebid.server.functional.testcontainers.Dependencies.networkServiceContainer
import static org.prebid.server.functional.testcontainers.container.PrebidServerContainer.ADMIN_ENDPOINT_PASSWORD
import static org.prebid.server.functional.testcontainers.container.PrebidServerContainer.ADMIN_ENDPOINT_USERNAME
import static org.prebid.server.functional.util.CurrencyUtil.DEFAULT_CURRENCY

final class PbsConfig {

Expand All @@ -29,7 +30,7 @@ LIMIT 1

static final Map<String, String> DEFAULT_ENV = [
"logging.sampling-rate" : "1.0",
"auction.ad-server-currency" : "USD",
"auction.ad-server-currency" : DEFAULT_CURRENCY.value,
"auction.stored-requests-timeout-ms" : "1000",
"metrics.prefix" : "prebid",
"status-response" : "ok",
Expand Down Expand Up @@ -136,5 +137,13 @@ LIMIT 1
"adapters.generic.aliases.adrino.meta-info.site-media-types" : ""]
}

static Map<String, String> getCurrencyConverterConfig() {
["auction.ad-server-currency" : DEFAULT_CURRENCY.value,
"currency-converter.external-rates.enabled" : "true",
"currency-converter.external-rates.url" : "$networkServiceContainer.rootUri/currency".toString(),
"currency-converter.external-rates.default-timeout-ms": "4000",
"currency-converter.external-rates.refresh-period-ms" : "900000"]
}

private PbsConfig() {}
}
4 changes: 3 additions & 1 deletion .../groovy/org/prebid/server/functional/testcontainers/scaffolding/CurrencyConversion.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@ import org.testcontainers.containers.MockServerContainer
import static org.mockserver.model.HttpRequest.request
import static org.mockserver.model.HttpResponse.response
import static org.mockserver.model.HttpStatusCode.OK_200
import static org.prebid.server.functional.util.CurrencyUtil.DEFAULT_CURRENCY_RATES

class CurrencyConversion extends NetworkScaffolding {

static final String CURRENCY_ENDPOINT_PATH = "/currency"
private static final CurrencyConversionRatesResponse DEFAULT_RATES_RESPONSE = CurrencyConversionRatesResponse.getDefaultCurrencyConversionRatesResponse(DEFAULT_CURRENCY_RATES)

CurrencyConversion(MockServerContainer mockServerContainer) {
super(mockServerContainer, CURRENCY_ENDPOINT_PATH)
}

void setCurrencyConversionRatesResponse(CurrencyConversionRatesResponse conversionRatesResponse) {
void setCurrencyConversionRatesResponse(CurrencyConversionRatesResponse conversionRatesResponse = DEFAULT_RATES_RESPONSE) {
setResponse(request, conversionRatesResponse)
}

Expand Down
97 changes: 20 additions & 77 deletions src/test/groovy/org/prebid/server/functional/tests/BidAdjustmentSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.prebid.server.functional.tests

import org.prebid.server.functional.model.Currency

import org.prebid.server.functional.model.bidder.Generic
import org.prebid.server.functional.model.config.AccountAuctionConfig
import org.prebid.server.functional.model.config.AccountConfig
import org.prebid.server.functional.model.config.AlternateBidderCodes
import org.prebid.server.functional.model.config.BidderConfig
import org.prebid.server.functional.model.db.Account
import org.prebid.server.functional.model.mock.services.currencyconversion.CurrencyConversionRatesResponse
import org.prebid.server.functional.model.request.auction.AdjustmentRule
import org.prebid.server.functional.model.request.auction.AdjustmentType
import org.prebid.server.functional.model.request.auction.Amx
Expand All @@ -22,12 +21,11 @@ import org.prebid.server.functional.model.response.auction.BidExt
import org.prebid.server.functional.model.response.auction.BidResponse
import org.prebid.server.functional.service.PrebidServerException
import org.prebid.server.functional.service.PrebidServerService
import org.prebid.server.functional.testcontainers.PbsConfig
import org.prebid.server.functional.testcontainers.scaffolding.CurrencyConversion
import org.prebid.server.functional.util.CurrencyUtil
import org.prebid.server.functional.util.PBSUtils

import java.math.RoundingMode
import java.time.Instant

import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST
import static org.prebid.server.functional.model.Currency.EUR
import static org.prebid.server.functional.model.Currency.GBP
Expand Down Expand Up @@ -62,25 +60,21 @@ class BidAdjustmentSpec extends BaseSpec {
private static final BigDecimal MAX_MULTIPLIER_ADJUST_VALUE = 99
private static final BigDecimal MAX_CPM_ADJUST_VALUE = Integer.MAX_VALUE
private static final BigDecimal MAX_STATIC_ADJUST_VALUE = Integer.MAX_VALUE
private static final Currency DEFAULT_CURRENCY = USD
private static final int BID_ADJUST_PRECISION = 4
private static final int PRICE_PRECISION = 3
private static final VideoPlacementSubtypes RANDOM_VIDEO_PLACEMENT_EXCEPT_IN_STREAM = PBSUtils.getRandomEnum(VideoPlacementSubtypes, [IN_PLACEMENT_STREAM])
private static final VideoPlcmtSubtype RANDOM_VIDEO_PLCMT_EXCEPT_IN_STREAM = PBSUtils.getRandomEnum(VideoPlcmtSubtype, [IN_PLCMT_STREAM])
private static final Map<Currency, Map<Currency, BigDecimal>> DEFAULT_CURRENCY_RATES = [(USD): [(EUR): 0.9124920156948626,
(GBP): 0.793776804452961],
(GBP): [(USD): 1.2597999770088517,
(EUR): 1.1495574203931487],
(EUR): [(USD): 1.3429368029739777]]
private static final CurrencyConversion currencyConversion = new CurrencyConversion(networkServiceContainer).tap {
setCurrencyConversionRatesResponse(CurrencyConversionRatesResponse.getDefaultCurrencyConversionRatesResponse(DEFAULT_CURRENCY_RATES))
}
private static final CurrencyConversion currencyConversion = new CurrencyConversion(networkServiceContainer)
private static final Map AMX_CONFIG = ["adapters.amx.enabled" : "true",
"adapters.amx.endpoint": "$networkServiceContainer.rootUri/auction".toString()]
private static final PrebidServerService pbsService = pbsServiceFactory.getService(externalCurrencyConverterConfig + AMX_CONFIG)
private static PrebidServerService pbsService

def setupSpec() {
currencyConversion.setCurrencyConversionRatesResponse()
pbsService = pbsServiceFactory.getService(PbsConfig.currencyConverterConfig + AMX_CONFIG)
}

def cleanupSpec() {
pbsServiceFactory.removeContainer(externalCurrencyConverterConfig + AMX_CONFIG)
pbsServiceFactory.removeContainer(PbsConfig.currencyConverterConfig + AMX_CONFIG)
}

def "PBS should adjust bid price for matching bidder when request has per-bidder bid adjustment factors"() {
Expand Down Expand Up @@ -757,9 +751,9 @@ class BidAdjustmentSpec extends BaseSpec {
def response = pbsService.sendAuctionRequest(bidRequest)

then: "Final bid price should be adjusted"
def convertedAdjustment = convertCurrency(adjustmentRule.value, adjustmentRule.currency, bidResponse.cur)
def convertedAdjustment = CurrencyUtil.convertCurrency(adjustmentRule.value, adjustmentRule.currency, bidResponse.cur)
def adjustedBidPrice = getAdjustedPrice(originalPrice, convertedAdjustment, adjustmentRule.adjustmentType)
assert response.seatbid.first.bid.first.price == convertCurrency(adjustedBidPrice, bidResponse.cur, currency)
assert response.seatbid.first.bid.first.price == CurrencyUtil.convertCurrency(adjustedBidPrice, bidResponse.cur, currency)

and: "Original bid price and currency should be presented in bid.ext"
verifyAll(response.seatbid.first.bid.first.ext) {
Expand Down Expand Up @@ -799,7 +793,7 @@ class BidAdjustmentSpec extends BaseSpec {
def response = pbsService.sendAuctionRequest(bidRequest)

then: "Final bid price should be adjusted and converted to original request cur"
assert response.seatbid.first.bid.first.price == convertCurrency(adjustmentRule.value, adjustmentRule.currency, currency)
assert response.seatbid.first.bid.first.price == CurrencyUtil.convertCurrency(adjustmentRule.value, adjustmentRule.currency, currency)
assert response.cur == bidRequest.cur.first

and: "Original bid price and currency should be presented in bid.ext"
Expand Down Expand Up @@ -863,10 +857,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

def "PBS shouldn't adjust bid price for matching bidder when request has invalid value bidAdjustments config"() {
given: "Start time"
def startTime = Instant.now()

and: "Default BidRequest with ext.prebid.bidAdjustments"
given: "Default BidRequest with ext.prebid.bidAdjustments"
def currency = USD
def impPrice = PBSUtils.randomPrice
def rule = new BidAdjustmentRule(generic: [(WILDCARD): [new AdjustmentRule(adjustmentType: adjustmentType, value: ruleValue, currency: currency)]])
Expand Down Expand Up @@ -903,8 +894,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

and: "PBS log should contain error"
def logs = pbsService.getLogsByTime(startTime)
assert getLogsByText(logs, errorMessage)
assert pbsService.isContainLogsByValue(errorMessage)

and: "Bidder request should contain original imp.floors"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
Expand Down Expand Up @@ -1043,10 +1033,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

def "PBS shouldn't adjust bid price for matching bidder when cpm or static bidAdjustments doesn't have currency value"() {
given: "Start time"
def startTime = Instant.now()

and: "Default BidRequest with ext.prebid.bidAdjustments"
given: "Default BidRequest with ext.prebid.bidAdjustments"
def currency = USD
def impPrice = PBSUtils.randomPrice
def adjustmentPrice = PBSUtils.randomPrice.toDouble()
Expand Down Expand Up @@ -1086,8 +1073,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

and: "PBS log should contain error"
def logs = pbsService.getLogsByTime(startTime)
assert getLogsByText(logs, errorMessage)
assert pbsService.isContainLogsByValue(errorMessage)

and: "Bidder request should contain original imp.floors"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
Expand Down Expand Up @@ -1147,10 +1133,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

def "PBS shouldn't adjust bid price for matching bidder when bidAdjustments have unknown adjustmentType"() {
given: "Start time"
def startTime = Instant.now()

and: "Default BidRequest with ext.prebid.bidAdjustments"
given: "Default BidRequest with ext.prebid.bidAdjustments"
def currency = USD
def impPrice = PBSUtils.randomPrice
def adjustmentPrice = PBSUtils.randomPrice.toDouble()
Expand Down Expand Up @@ -1190,8 +1173,7 @@ class BidAdjustmentSpec extends BaseSpec {
}

and: "PBS log should contain error"
def logs = pbsService.getLogsByTime(startTime)
assert getLogsByText(logs, errorMessage)
assert pbsService.isContainLogsByValue(errorMessage)

and: "Bidder request should contain currency from request"
def bidderRequest = bidder.getBidderRequest(bidRequest.id)
Expand Down Expand Up @@ -1363,45 +1345,6 @@ class BidAdjustmentSpec extends BaseSpec {
bidAdjustmentFactor << [0.9, 1.1]
}

private static Map<String, String> getExternalCurrencyConverterConfig() {
["auction.ad-server-currency" : DEFAULT_CURRENCY as String,
"currency-converter.external-rates.enabled" : "true",
"currency-converter.external-rates.url" : "$networkServiceContainer.rootUri/currency".toString(),
"currency-converter.external-rates.default-timeout-ms": "4000",
"currency-converter.external-rates.refresh-period-ms" : "900000"]
}

private static BigDecimal convertCurrency(BigDecimal price, Currency fromCurrency, Currency toCurrency) {
return (price * getConversionRate(fromCurrency, toCurrency)).setScale(PRICE_PRECISION, RoundingMode.HALF_EVEN)
}

private static BigDecimal getConversionRate(Currency fromCurrency, Currency toCurrency) {
def conversionRate
if (fromCurrency == toCurrency) {
conversionRate = 1
} else if (toCurrency in DEFAULT_CURRENCY_RATES?[fromCurrency]) {
conversionRate = DEFAULT_CURRENCY_RATES[fromCurrency][toCurrency]
} else if (fromCurrency in DEFAULT_CURRENCY_RATES?[toCurrency]) {
conversionRate = 1 / DEFAULT_CURRENCY_RATES[toCurrency][fromCurrency]
} else {
conversionRate = getCrossConversionRate(fromCurrency, toCurrency)
}
conversionRate
}

private static BigDecimal getCrossConversionRate(Currency fromCurrency, Currency toCurrency) {
for (Map<Currency, BigDecimal> rates : DEFAULT_CURRENCY_RATES.values()) {
def fromRate = rates?[fromCurrency]
def toRate = rates?[toCurrency]

if (fromRate && toRate) {
return toRate / fromRate
}
}

null
}

private static BigDecimal getAdjustedPrice(BigDecimal originalPrice,
BigDecimal adjustedValue,
AdjustmentType adjustmentType) {
Expand Down
Loading
Loading