Merge branch 'bvl-rename-routes-after-user-rename' into 'master'

Set the name of a user-namespace to the user name

See merge request gitlab-org/gitlab-ce!23272

3 files changed, 106 insertions, 8 deletions

diff --git a/lib/gitlab/background_migration/fix_user_namespace_names.rb b/lib/gitlab/background_migration/fix_user_namespace_names.rb
new file mode 100644
index 00000000000..1a207121be0
--- /dev/null
+++ b/lib/gitlab/background_migration/fix_user_namespace_names.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # This migration fixes the namespaces.name for all user-namespaces that have names
+    # that aren't equal to the users name.
+    # Then it uses the updated names of the namespaces to update the associated routes
+    # For more info see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
+    class FixUserNamespaceNames
+      def perform(from_id, to_id)
+        fix_namespace_names(from_id, to_id)
+        fix_namespace_route_names(from_id, to_id)
+      end
+
+      def fix_namespace_names(from_id, to_id)
+        ActiveRecord::Base.connection.execute <<~UPDATE_NAMESPACES
+          WITH namespaces_to_update AS (
+              SELECT
+                  namespaces.id,
+                  users.name AS correct_name
+              FROM
+                  namespaces
+                  INNER JOIN users ON namespaces.owner_id = users.id
+              WHERE
+                  namespaces.type IS NULL
+                  AND namespaces.id BETWEEN #{from_id} AND #{to_id}
+                  AND namespaces.name != users.name
+          )
+          UPDATE
+              namespaces
+          SET
+              name = correct_name
+          FROM
+              namespaces_to_update
+          WHERE
+              namespaces.id = namespaces_to_update.id
+        UPDATE_NAMESPACES
+      end
+
+      def fix_namespace_route_names(from_id, to_id)
+        ActiveRecord::Base.connection.execute <<~ROUTES_UPDATE
+          WITH routes_to_update AS (
+              SELECT
+                  routes.id,
+                  users.name AS correct_name
+              FROM
+                  routes
+                  INNER JOIN namespaces ON routes.source_id = namespaces.id
+                  INNER JOIN users ON namespaces.owner_id = users.id
+              WHERE
+                  namespaces.type IS NULL
+                  AND routes.source_type = 'Namespace'
+                  AND namespaces.id BETWEEN #{from_id} AND #{to_id}
+                  AND (routes.name != users.name OR routes.name IS NULL)
+          )
+          UPDATE
+              routes
+          SET
+              name = correct_name
+          FROM
+              routes_to_update
+          WHERE
+              routes_to_update.id = routes.id
+        ROUTES_UPDATE
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/background_migration/fix_user_project_route_names.rb b/lib/gitlab/background_migration/fix_user_project_route_names.rb
new file mode 100644
index 00000000000..b84ff32e712
--- /dev/null
+++ b/lib/gitlab/background_migration/fix_user_project_route_names.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # This migration fixes the routes.name for all user-projects that have names
+    # that don't start with the users name.
+    # For more info see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23272
+    class FixUserProjectRouteNames
+      def perform(from_id, to_id)
+        ActiveRecord::Base.connection.execute <<~ROUTES_UPDATE
+          WITH routes_to_update AS (
+            SELECT
+                routes.id,
+                users.name || ' / ' || projects.name AS correct_name
+            FROM
+                routes
+                INNER JOIN projects ON routes.source_id = projects.id
+                INNER JOIN namespaces ON projects.namespace_id = namespaces.id
+                INNER JOIN users ON namespaces.owner_id = users.id
+            WHERE
+                routes.source_type = 'Project'
+                AND routes.id BETWEEN #{from_id} AND #{to_id}
+                AND namespaces.type IS NULL
+                AND (routes.name NOT LIKE users.name || '%' OR routes.name IS NULL)
+          )
+          UPDATE
+              routes
+          SET
+              name = routes_to_update.correct_name
+          FROM
+              routes_to_update
+          WHERE
+              routes_to_update.id = routes.id
+        ROUTES_UPDATE
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 7a1a2eaf6c0..e43147a3f37 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -4,14 +4,6 @@ module Gitlab
   module Regex
     extend self
 
-    def namespace_name_regex
-      @namespace_name_regex ||= /\A[\p{Alnum}\p{Pd}_\. ]*\z/.freeze
-    end
-
-    def namespace_name_regex_message
-      "can contain only letters, digits, '_', '.', dash and space."
-    end
-
     def project_name_regex
       @project_name_regex ||= /\A[\p{Alnum}\u{00A9}-\u{1f9c0}_][\p{Alnum}\p{Pd}\u{00A9}-\u{1f9c0}_\. ]*\z/.freeze
     end