MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relax configured currency checks

This commit is contained in:
Ravi Khadiwala 2024-09-17 13:02:22 -05:00 committed by ravi-signal
parent dd7a20a774
commit 8cb9c60a3c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/main/java/org/whispersystems/textsecuregcm/configuration/SubscriptionConfiguration.java
View File

@ -104,11 +104,13 @@ public class SubscriptionConfiguration {
@JsonIgnore @JsonIgnore
@ValidationMethod(message = "has a mismatch between the levels supported currencies") @ValidationMethod(message = "has a mismatch between the levels supported currencies")
public boolean isCurrencyListSameAcrossAllLevels() { public boolean isCurrencyListSameAcrossAllLevels() {
final Map<Long, SubscriptionLevelConfiguration> subscriptionLevels = Stream return isCurrencyListSameAccrossLevelConfigurations(donationLevels)
.concat(donationLevels.entrySet().stream(), backupLevels.entrySet().stream()) && isCurrencyListSameAccrossLevelConfigurations(backupLevels);
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); }
Optional<SubscriptionLevelConfiguration> any = subscriptionLevels.values().stream().findAny(); private static boolean isCurrencyListSameAccrossLevelConfigurations(
Map<Long, ? extends SubscriptionLevelConfiguration> subscriptionLevels) {
Optional<? extends SubscriptionLevelConfiguration> any = subscriptionLevels.values().stream().findAny();
if (any.isEmpty()) { if (any.isEmpty()) {
return true; return true;
} }

4
service/src/test/resources/config/test.yml
View File

@ -367,6 +367,10 @@ subscription: # configuration for Stripe subscriptions
backupExpiration: P30D backupExpiration: P30D
backupGracePeriod: P15D backupGracePeriod: P15D
backupFreeTierMediaDuration: P30D backupFreeTierMediaDuration: P30D
backupLevels:
201:
playProductId: EXAMPLE
prices: {}
levels: levels:
500: 500:
badge: EXAMPLE badge: EXAMPLE