Improve alias deletion

Now we display message count for each alias, and we only let users
remove aliases that have no messages associated with them.

Author: dutow

app/controllers/settings/accounts_controller.rb

@@ -9,6 +9,10 @@ def show
       ) || []
       @identities = current_user.identities.order(:provider, :email, :uid)
       @default_alias_id = current_user.person&.default_alias_id
+
+      # Preload mention counts (CC/TO) for all aliases
+      alias_ids = @aliases.map(&:id)
+      @mention_counts = alias_ids.any? ? Mention.where(alias_id: alias_ids).group(:alias_id).count : {}
     end
 
     private

app/controllers/settings/emails_controller.rb

@@ -37,13 +37,18 @@ def create
 
     def destroy
       al = current_user.person.aliases.find(params[:id])
+
       if current_user.person&.default_alias_id == al.id
-        redirect_to settings_account_path, alert: 'Cannot remove primary alias.'
-      else
-        new_person = Person.create!(default_alias_id: al.id)
-        al.update!(user_id: nil, verified_at: nil, person_id: new_person.id)
-        redirect_to settings_account_path, notice: 'Email removed.'
+        return redirect_to settings_account_path, alert: 'Cannot remove primary alias.'
+      end
+
+      mention_count = Mention.where(alias_id: al.id).count
+      if al.sender_count > 0 || mention_count > 0
+        return redirect_to settings_account_path, alert: 'Cannot remove alias with message history.'
       end
+
+      al.destroy!
+      redirect_to settings_account_path, notice: 'Alias removed.'
     end
 
     def primary

app/views/settings/accounts/show.html.slim

@@ -46,6 +46,7 @@
           tr
             th Name
             th Email
+            th Messages
             th Verified
             th Primary
             th Actions
@@ -57,12 +58,15 @@
                 = al.email
                 - if al.mention_only?
                   span.alias-badge.mention-only (mention only)
+              td.message-counts title="Sent / CC'd"
+                = "#{al.sender_count} / #{@mention_counts[al.id] || 0}"
               td = al.verified_at ? "Yes" : "No"
               td = (al.id == @default_alias_id) ? "Yes" : "No"
               td
                 - unless al.id == @default_alias_id
                   = button_to "Make primary", primary_settings_email_path(al), method: :post, class: "button-secondary"
-                - unless al.id == @default_alias_id
+                - has_messages = al.sender_count > 0 || (@mention_counts[al.id] || 0) > 0
+                - if al.id != @default_alias_id && !has_messages
                   = button_to "Remove", settings_email_path(al), method: :delete, data: { turbo_confirm: "Remove this email?" }, class: "button-danger"
     - else
       p No emails yet.

spec/requests/emails_management_spec.rb

@@ -201,6 +201,73 @@ def attach_verified_alias(user, email:, primary: true)
     expect(aliases.first.name).to eq('Existing Name')
   end
 
+  describe 'alias removal' do
+    it 'allows removing alias with no messages' do
+      user = create(:user, password: 'secret', password_confirmation: 'secret')
+      primary = attach_verified_alias(user, email: 'me@example.com')
+      secondary = create(:alias, user: user, person: user.person, email: 'other@example.com', name: 'Other', verified_at: Time.current, sender_count: 0)
+
+      sign_in(email: 'me@example.com')
+
+      expect {
+        delete settings_email_path(secondary)
+      }.to change { Alias.count }.by(-1)
+
+      expect(response).to redirect_to(settings_account_path)
+      expect(flash[:notice]).to eq('Alias removed.')
+      expect(Alias.find_by(id: secondary.id)).to be_nil
+    end
+
+    it 'blocks removing alias with sent messages' do
+      user = create(:user, password: 'secret', password_confirmation: 'secret')
+      primary = attach_verified_alias(user, email: 'me@example.com')
+      secondary = create(:alias, user: user, person: user.person, email: 'other@example.com', name: 'Other', verified_at: Time.current, sender_count: 5)
+
+      sign_in(email: 'me@example.com')
+
+      expect {
+        delete settings_email_path(secondary)
+      }.not_to change { user.person.aliases.count }
+
+      expect(response).to redirect_to(settings_account_path)
+      expect(flash[:alert]).to match(/message history/)
+    end
+
+    it 'blocks removing alias with CC mentions' do
+      user = create(:user, password: 'secret', password_confirmation: 'secret')
+      primary = attach_verified_alias(user, email: 'me@example.com')
+      secondary = create(:alias, user: user, person: user.person, email: 'other@example.com', name: 'Other', verified_at: Time.current, sender_count: 0)
+
+      # Create a mention for this alias
+      topic = create(:topic)
+      message = create(:message, topic: topic)
+      create(:mention, message: message, alias: secondary, person: user.person)
+
+      sign_in(email: 'me@example.com')
+
+      expect {
+        delete settings_email_path(secondary)
+      }.not_to change { user.person.aliases.count }
+
+      expect(response).to redirect_to(settings_account_path)
+      expect(flash[:alert]).to match(/message history/)
+    end
+
+    it 'blocks removing primary alias' do
+      user = create(:user, password: 'secret', password_confirmation: 'secret')
+      primary = attach_verified_alias(user, email: 'me@example.com')
+
+      sign_in(email: 'me@example.com')
+
+      expect {
+        delete settings_email_path(primary)
+      }.not_to change { user.person.aliases.count }
+
+      expect(response).to redirect_to(settings_account_path)
+      expect(flash[:alert]).to match(/primary alias/)
+    end
+  end
+
   def extract_raw_token_from_mailer
     mail = ActionMailer::Base.deliveries.last
     expect(mail).to be_present