Skip to content

Compare currencies ignoring case #3932

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
CTMBNara merged 3 commits into from
Apr 29, 2025
Merged

Compare currencies ignoring case #3932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2539301
Use `equalsIgnoreCase` instead of `equals`
CTMBNara Apr 24, 2025
3972277
Merge remote-tracking branch 'origin/master' into fix-currencies-copm…
CTMBNara Apr 28, 2025
000c954
Fix checkstyle and move test to a proper package
CTMBNara Apr 28, 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
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/util/BidderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static boolean isValidPrice(Price price) {

public static boolean shouldConvertBidFloor(Price price, String bidderCurrency) {
return isValidPrice(price)
&& !StringUtils.equals(price.getCurrency(), bidderCurrency);
&& !StringUtils.equalsIgnoreCase(price.getCurrency(), bidderCurrency);
}

public static PriceFloorInfo resolvePriceFloor(Bid bid, BidRequest bidRequest) {
Expand Down
3 changes: 1 addition & 2 deletions ...rg/prebid/server/adtgorg/AdtgorgTest.java → ...ava/org/prebid/server/it/AdtgorgTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.prebid.server.adtgorg;
package org.prebid.server.it;

import io.restassured.response.Response;
import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.prebid.server.it.IntegrationTest;
import org.prebid.server.model.Endpoint;

import java.io.IOException;
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/prebid/server/util/BidderUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.iab.openrtb.request.Video;
import com.iab.openrtb.response.Bid;
import org.junit.jupiter.api.Test;
import org.prebid.server.bidder.model.Price;
import org.prebid.server.bidder.model.PriceFloorInfo;
import org.prebid.server.proto.openrtb.ext.response.BidType;

Expand Down Expand Up @@ -48,6 +49,18 @@ public void isValidPriceShouldReturnTrueIfPriceIsGreaterThenZero() {
assertThat(BidderUtil.isValidPrice(BigDecimal.ONE)).isTrue();
}

@Test
public void shouldConvertBidFloorShouldReturnTrueIfCurrenciesAreDifferent() {
// when and then
assertThat(BidderUtil.shouldConvertBidFloor(Price.of("USD", BigDecimal.ONE), "EUR")).isTrue();
}

@Test
public void shouldConvertBidFloorShouldReturnFalseIfCurrenciesAreSameIgnoringCase() {
// when and then
assertThat(BidderUtil.shouldConvertBidFloor(Price.of("uSd", BigDecimal.ONE), "UsD")).isFalse();
}

@Test
public void resolvePriceFloorShouldReturnNullIfBidIsMissing() {
// when
Expand Down
Loading