Delete conflicting redirects

2 files changed, 16 insertions, 7 deletions

diff --git a/app/models/redirect_route.rb b/app/models/redirect_route.rb
index e36ca988701..99812bcde53 100644
--- a/app/models/redirect_route.rb
+++ b/app/models/redirect_route.rb
@@ -7,4 +7,6 @@ class RedirectRoute < ActiveRecord::Base
     length: { within: 1..255 },
     presence: true,
     uniqueness: { case_sensitive: false }
+
+  scope :matching_path_and_descendants, -> (path) { where('redirect_routes.path = ? OR redirect_routes.path LIKE ?', path, "#{sanitize_sql_like(path)}/%") }
 end
diff --git a/app/models/route.rb b/app/models/route.rb
index df801714b5f..e0d85ff7db7 100644
--- a/app/models/route.rb
+++ b/app/models/route.rb
@@ -8,7 +8,8 @@ class Route < ActiveRecord::Base
     presence: true,
     uniqueness: { case_sensitive: false }
 
-  after_update :create_redirect_if_path_changed
+  after_save :delete_conflicting_redirects
+  after_update :create_redirect_for_old_path
   after_update :rename_direct_descendant_routes
 
   scope :inside_path, -> (path) { where('routes.path LIKE ?', "#{sanitize_sql_like(path)}/%") }
@@ -34,13 +35,19 @@ class Route < ActiveRecord::Base
     end
   end
 
-  def create_redirect_if_path_changed
-    if path_changed?
-      create_redirect(path_was)
-    end
+  def delete_conflicting_redirects
+    conflicting_redirects.delete_all
+  end
+
+  def conflicting_redirects
+    RedirectRoute.matching_path_and_descendants(path)
+  end
+
+  def create_redirect_for_old_path
+    create_redirect(path_was) if path_changed?
   end
 
-  def create_redirect(old_path)
-    source.redirect_routes.create(path: old_path)
+  def create_redirect(path)
+    RedirectRoute.create(source: source, path: path)
   end
 end