Merge pull request #717 from amvanbaren/bugfix/issue-716

Need to deal with collisions when renaming and merging namespaces

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/AdminService.java

@@ -31,6 +31,7 @@
 import java.time.DateTimeException;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
@@ -218,6 +219,31 @@ public void changeNamespace(ChangeNamespaceJson json) {
         if (newNamespace != null && !json.mergeIfNewNamespaceAlreadyExists) {
             throw new ErrorResultException("New namespace already exists: " + json.newNamespace);
         }
+        if (newNamespace != null) {
+            var newExtensions = repositories.findExtensions(newNamespace).stream()
+                    .collect(Collectors.toMap(Extension::getName, e -> e));
+            var oldExtensions = repositories.findExtensions(oldNamespace).stream()
+                    .collect(Collectors.toMap(Extension::getName, e -> e));
+
+            var duplicateExtensions = oldExtensions.keySet().stream()
+                    .filter(newExtensions::containsKey)
+                    .collect(Collectors.joining("','"));
+            if(!duplicateExtensions.isEmpty()) {
+                var message = "Can't merge namespaces, because new namespace '" +
+                        json.newNamespace +
+                        "' and old namespace '" +
+                        json.oldNamespace +
+                        "' have " +
+                        (duplicateExtensions.indexOf(',') == -1 ? "a " : "") +
+                        "duplicate extension" +
+                        (duplicateExtensions.indexOf(',') == -1 ? "" : "s") +
+                        ": '" +
+                        duplicateExtensions +
+                        "'.";
+
+                throw new ErrorResultException(message);
+            }
+        }
 
         scheduler.enqueue(new ChangeNamespaceJobRequest(json));
     }

server/src/main/java/org/eclipse/openvsx/ChangeNamespaceService.java

@@ -22,6 +22,7 @@
 import javax.persistence.EntityManager;
 import javax.transaction.Transactional;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 public class ChangeNamespaceService {
@@ -59,7 +60,7 @@ public void changeNamespaceInDatabase(
         }
 
         changeExtensionNamespace(extensions, newNamespace);
-        changeMembershipNamespace(oldNamespace, newNamespace);
+        changeMembershipNamespace(oldNamespace, newNamespace, removeOldNamespace);
         updatedResources.forEach(entityManager::merge);
 
         if(removeOldNamespace) {
@@ -77,10 +78,18 @@ private void changeExtensionNamespace(Streamable<Extension> extensions, Namespac
         }
     }
 
-    private void changeMembershipNamespace(Namespace oldNamespace, Namespace newNamespace) {
-        var memberships = repositories.findMemberships(oldNamespace);
-        for(var membership : memberships) {
-            membership.setNamespace(newNamespace);
+    private void changeMembershipNamespace(Namespace oldNamespace, Namespace newNamespace, boolean removeOldNamespace) {
+        var oldMemberships = repositories.findMemberships(oldNamespace).stream()
+                .collect(Collectors.toMap(m -> m.getUser().getId(), m -> m));
+        var newMemberships = repositories.findMemberships(newNamespace).stream()
+                .collect(Collectors.toMap(m -> m.getUser().getId(), m -> m));
+
+        for(var entry : oldMemberships.entrySet()) {
+            if(!newMemberships.containsKey(entry.getKey())) {
+                entry.getValue().setNamespace(newNamespace);
+            } else if (removeOldNamespace) {
+                entityManager.remove(entry.getValue());
+            }
         }
     }
 }