Bugfix/microstream persistence error leads to unscheduled imports (#204)

vitrum-connect · May 16, 2024 · 65fe3ab · 65fe3ab
1 parent 0b3213d
commit 65fe3ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/src/main/java/de/app/fivegla/persistence/TenantRepository.java b/src/main/java/de/app/fivegla/persistence/TenantRepository.java
@@ -26,17 +26,24 @@ public class TenantRepository {
      * @return The updated tenant.
      */
     public Tenant updateTenant(String tenantId, String name, String description) {
-        var tenant = applicationData.getTenants().stream()
-                .filter(t -> t.getTenantId().equals(tenantId))
-                .findFirst()
-                .orElseThrow(() -> new BusinessException(ErrorMessage.builder()
-                        .error(Error.TENANT_NOT_FOUND)
-                        .message("Could not update tenant, since the tenant was not found.")
-                        .build()));
-        tenant.setName(name);
-        tenant.setDescription(description);
-        applicationData.persist();
-        return tenant;
+        if (null != applicationData.getTenants()) {
+            var tenant = applicationData.getTenants().stream()
+                    .filter(t -> t.getTenantId().equals(tenantId))
+                    .findFirst()
+                    .orElseThrow(() -> new BusinessException(ErrorMessage.builder()
+                            .error(Error.TENANT_NOT_FOUND)
+                            .message("Could not update tenant, since the tenant was not found.")
+                            .build()));
+            tenant.setName(name);
+            tenant.setDescription(description);
+            applicationData.persist();
+            return tenant;
+        } else {
+            throw new BusinessException(ErrorMessage.builder()
+                    .error(Error.TENANT_NOT_FOUND)
+                    .message("Could not update tenant, since the tenant was not found.")
+                    .build());
+        }
     }
 
     /**

diff --git a/src/main/java/de/app/fivegla/persistence/ThirdPartyApiConfigurationRepository.java b/src/main/java/de/app/fivegla/persistence/ThirdPartyApiConfigurationRepository.java
@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -20,10 +21,9 @@ public class ThirdPartyApiConfigurationRepository {
      */
     public void addThirdPartyApiConfiguration(ThirdPartyApiConfiguration configuration) {
         if (applicationData.getThirdPartyApiConfigurations() == null) {
-            applicationData.setThirdPartyApiConfigurations(List.of(configuration));
-        } else {
-            applicationData.getThirdPartyApiConfigurations().add(configuration);
+            applicationData.setThirdPartyApiConfigurations(new ArrayList<>());
         }
+        applicationData.getThirdPartyApiConfigurations().add(configuration);
         applicationData.persist();
     }