Add a method to enable a badge for all accounts

service/config/sample.yml

@@ -264,3 +264,5 @@ badges:
     - id: TEST
       imageUrl: https://example.com/test-badge
       category: other
+  badgeIdsEnabledForAll:
+    - TEST

service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java

@@ -8,6 +8,7 @@ package org.whispersystems.textsecuregcm.badges;
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Clock;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -29,6 +30,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
 
   private final Clock clock;
   private final Map<String, BadgeConfiguration> knownBadges;
+  private final List<String> forcedOnBadges;
   private final ResourceBundleFactory resourceBundleFactory;
 
   public ConfiguredProfileBadgeConverter(
@@ -45,6 +47,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
     this.clock = clock;
     this.knownBadges = badgesConfiguration.getBadges().stream()
         .collect(Collectors.toMap(BadgeConfiguration::getId, Function.identity()));
+    this.forcedOnBadges = badgesConfiguration.getBadgeIdsEnabledForAll();
     this.resourceBundleFactory = resourceBundleFactory;
   }
 
@@ -52,7 +55,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
   public List<Badge> convert(
       final List<Locale> acceptableLanguages,
       final List<AccountBadge> accountBadges) {
-    if (accountBadges.isEmpty()) {
+    if (accountBadges.isEmpty() && forcedOnBadges.isEmpty()) {
       return List.of();
     }
 
@@ -86,7 +89,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
     };
 
     final ResourceBundle resourceBundle = resourceBundleFactory.createBundle(BASE_NAME, desiredLocale, control);
-    return accountBadges.stream()
+    List<Badge> badges = accountBadges.stream()
         .filter(accountBadge -> accountBadge.isVisible()
             && now.isBefore(accountBadge.getExpiration())
             && knownBadges.containsKey(accountBadge.getId()))
@@ -99,6 +102,16 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
               resourceBundle.getString(accountBadge.getId() + "_name"),
               resourceBundle.getString(accountBadge.getId() + "_description"));
         })
-        .collect(Collectors.toList());
+        .collect(Collectors.toCollection(ArrayList::new));
+    badges.addAll(forcedOnBadges.stream().filter(knownBadges::containsKey).map(id -> {
+      BadgeConfiguration configuration = knownBadges.get(id);
+      return new Badge(
+          id,
+          configuration.getCategory(),
+          configuration.getImageUrl(),
+          resourceBundle.getString(id + "_name"),
+          resourceBundle.getString(id + "_description"));
+    }).collect(Collectors.toList()));
+    return badges;
   }
 }

service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgesConfiguration.java

@@ -16,11 +16,14 @@ import javax.validation.constraints.NotNull;
 
 public class BadgesConfiguration {
   private final List<BadgeConfiguration> badges;
+  private final List<String> badgeIdsEnabledForAll;
 
   @JsonCreator
   public BadgesConfiguration(
-      @JsonProperty("badges") @JsonSetter(nulls = Nulls.AS_EMPTY) final List<BadgeConfiguration> badges) {
+      @JsonProperty("badges") @JsonSetter(nulls = Nulls.AS_EMPTY) final List<BadgeConfiguration> badges,
+      @JsonProperty("badgeIdsEnabledForAll") @JsonSetter(nulls = Nulls.AS_EMPTY) final List<String> badgeIdsEnabledForAll) {
     this.badges = Objects.requireNonNull(badges);
+    this.badgeIdsEnabledForAll = Objects.requireNonNull(badgeIdsEnabledForAll);
   }
 
   @Valid
@@ -28,4 +31,10 @@ public class BadgesConfiguration {
   public List<BadgeConfiguration> getBadges() {
     return badges;
   }
+
+  @Valid
+  @NotNull
+  public List<String> getBadgeIdsEnabledForAll() {
+    return badgeIdsEnabledForAll;
+  }
 }

service/src/test/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverterTest.java

@@ -89,7 +89,7 @@ public class ConfiguredProfileBadgeConverterTest {
         return objects;
       }
     };
-    return new BadgesConfiguration(badges);
+    return new BadgesConfiguration(badges, List.of());
   }
 
   private BadgeConfiguration getBadge(BadgesConfiguration badgesConfiguration, int i) {