fix: use correct environment when cache query is executed

telekom · Apr 29, 2024 · b3ce5d8 · b3ce5d8
1 parent d8016e9
commit b3ce5d8
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/src/main/java/de/telekom/horizon/starlight/cache/PublisherCache.java b/src/main/java/de/telekom/horizon/starlight/cache/PublisherCache.java
@@ -8,30 +8,39 @@
 import de.telekom.eni.pandora.horizon.cache.util.Query;
 import de.telekom.eni.pandora.horizon.exception.JsonCacheException;
 import de.telekom.eni.pandora.horizon.kubernetes.resource.SubscriptionResource;
+import de.telekom.horizon.starlight.config.StarlightConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 @Slf4j
 @Component
 public class PublisherCache {
 
+    private final StarlightConfig starlightConfig;
+
     private final JsonCacheService<SubscriptionResource> subscriptionCache;
 
-    public PublisherCache(JsonCacheService<SubscriptionResource> subscriptionCache) {
+    public PublisherCache(StarlightConfig starlightConfig, JsonCacheService<SubscriptionResource> subscriptionCache) {
+        this.starlightConfig = starlightConfig;
         this.subscriptionCache = subscriptionCache;
     }
 
     public Set<String> findPublisherIds(String environment, String eventType) {
+        var env = environment;
+        if (Objects.equals(starlightConfig.getDefaultEnvironment(), environment)) {
+            env = "default";
+        }
+
         var builder = Query.builder(SubscriptionResource.class)
-                .addMatcher("spec.environment", environment)
+                .addMatcher("spec.environment", env)
                 .addMatcher("spec.subscription.type", eventType);
 
         List<SubscriptionResource> list;
-
         try {
             list = subscriptionCache.getQuery(builder.build());
         } catch (JsonCacheException e) {
@@ -44,7 +53,11 @@ public Set<String> findPublisherIds(String environment, String eventType) {
 
         list.forEach(a -> {
             publisherIds.add(a.getSpec().getSubscription().getPublisherId());
-            publisherIds.addAll(a.getSpec().getSubscription().getAdditionalPublisherIds());
+
+            var additionalPublisherIds = a.getSpec().getSubscription().getAdditionalPublisherIds();
+            if (additionalPublisherIds != null) {
+                publisherIds.addAll(additionalPublisherIds);
+            }
         });
 
         return publisherIds;