Relax configured currency checks

signalapp · Sep 17, 2024 · 8cb9c60 · 8cb9c60
1 parent dd7a20a
commit 8cb9c60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...c/main/java/org/whispersystems/textsecuregcm/configuration/SubscriptionConfiguration.java b/...c/main/java/org/whispersystems/textsecuregcm/configuration/SubscriptionConfiguration.java
@@ -104,11 +104,13 @@ public boolean areLevelConstraintsSatisfied() {
   @JsonIgnore
   @ValidationMethod(message = "has a mismatch between the levels supported currencies")
   public boolean isCurrencyListSameAcrossAllLevels() {
-    final Map<Long, SubscriptionLevelConfiguration> subscriptionLevels = Stream
-        .concat(donationLevels.entrySet().stream(), backupLevels.entrySet().stream())
-        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    return isCurrencyListSameAccrossLevelConfigurations(donationLevels)
+        && isCurrencyListSameAccrossLevelConfigurations(backupLevels);
+  }
 
-    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()) {
       return true;
     }

diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml
@@ -367,6 +367,10 @@ subscription: # configuration for Stripe subscriptions
   backupExpiration: P30D
   backupGracePeriod: P15D
   backupFreeTierMediaDuration: P30D
+  backupLevels:
+    201:
+      playProductId: EXAMPLE
+      prices: {}
   levels:
     500:
       badge: EXAMPLE