Merge branch 'release2.0.4'

TIER · Oct 15, 2024 · 4dd085c · 4dd085c
2 parents de4fb24 + 2ff4027
commit 4dd085c
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/...internet2/tier/shibboleth/admin/ui/configuration/MigrationTasksContextLoadedListener.java b/...internet2/tier/shibboleth/admin/ui/configuration/MigrationTasksContextLoadedListener.java
@@ -9,6 +9,8 @@
 import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.IGroupService;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -23,6 +25,7 @@
  */
 @Component
 public class MigrationTasksContextLoadedListener implements ApplicationListener<ContextRefreshedEvent> {
+    private static final Logger log = LoggerFactory.getLogger(MigrationTasksContextLoadedListener.class);
     private static boolean attrBundleMigrated = false;
 
     @Autowired
@@ -81,20 +84,27 @@ void doshibui_1740_migration() {
 
     @Transactional
     void doAttributeBundleMigration() {
-        attributeBundleRepository.migrateData();
-        attributeBundleRepository.findAll().forEach(attrBundleEntry -> {
-            try {
-                Set<String> names = new HashSet<String>();
-                attrBundleEntry.getAttributeNames().forEach(value -> {
-                    names.add(BundleableAttributeType.values()[Integer.parseInt(value)].label());
-                });
-                attrBundleEntry.setAttributeNames(names);
-                attributeBundleRepository.save(attrBundleEntry);
-            }
-            catch (NumberFormatException ignore) {
-            }
-        });
-        attrBundleMigrated = true;
-        attributeBundleRepository.clearMigratedValues();
+        try {
+            attributeBundleRepository.migrateData();
+            attributeBundleRepository.findAll().forEach(attrBundleEntry -> {
+                try {
+                    Set<String> names = new HashSet<String>();
+                    attrBundleEntry.getAttributeNames().forEach(value -> {
+                        names.add(BundleableAttributeType.values()[Integer.parseInt(value)].label());
+                    });
+                    attrBundleEntry.setAttributeNames(names);
+                    attributeBundleRepository.save(attrBundleEntry);
+                }
+                catch (NumberFormatException ignore) {
+                }
+            });
+            attrBundleMigrated = true;
+            attributeBundleRepository.clearMigratedValues();
+        }
+        catch (Throwable e){
+            // can happen if the db is new, skip trying to do this
+            log.error("You may safely ignore: *** ERROR: relation \"attribute_bundle_definition_attributes\" does not exist ***");
+            attrBundleMigrated = true;
+        }
     }
 }