diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 4c4b94ba..a0ef06f5 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -2,6 +2,7 @@
class ApplicationMailer < ActionMailer::Base
prepend_view_path 'app/views/mailers'
- default from: Rails.application.credentials.dig(:devise, :mailer_sender)
+ default from: Rails.application.credentials.dig(:sendgrid, :mailer_sender),
+ reply_to: 'lsa-evaluate-support@umich.edu'
layout 'mailer'
end
diff --git a/app/mailers/results_mailer.rb b/app/mailers/results_mailer.rb
index 797e0b7d..91680d92 100644
--- a/app/mailers/results_mailer.rb
+++ b/app/mailers/results_mailer.rb
@@ -36,9 +36,15 @@ def entry_evaluation_notification(entry, round)
subject = "Evaluation Results for \"#{@entry.title}\" - #{@contest_description.name}"
- mail(
+ # Set mail options - override reply_to if container has a contact email
+ mail_options = {
to: @user.email,
subject: subject
- )
+ }
+
+ # Override reply_to with container's contact_email if present
+ mail_options[:reply_to] = @contact_email if @container.contact_email.present?
+
+ mail(mail_options)
end
end
diff --git a/app/mailers/test_mailer.rb b/app/mailers/test_mailer.rb
index 7c471b73..43d5075b 100644
--- a/app/mailers/test_mailer.rb
+++ b/app/mailers/test_mailer.rb
@@ -1,7 +1,11 @@
class TestMailer < ApplicationMailer
- def test_email
+ def test_email(recipient_email = nil)
+ @message = 'This is a test email from LSA Evaluate to verify email configuration.'
+ @sender = Rails.application.credentials.dig(:sendgrid, :mailer_sender)
+ @reply_to = 'lsa-wads-rails-email-test@umich.edu'
+
mail(
- to: 'test-t68vvtnfc@srv1.mail-tester.com',
+ to: recipient_email || 'lsa-wads-rails-email-test@umich.edu',
subject: 'Test Email from LSA Evaluate'
)
end
diff --git a/app/views/test_mailer/test_email.html.erb b/app/views/test_mailer/test_email.html.erb
index ed843f9d..f14272dd 100644
--- a/app/views/test_mailer/test_email.html.erb
+++ b/app/views/test_mailer/test_email.html.erb
@@ -4,8 +4,19 @@
- Test Email from LSA Evaluate
- This is a test email to verify email authentication settings.
- Sent at: <%= Time.current %>
+ Email Configuration Test
+
+ <%= @message %>
+
+ This message confirms your email settings are working correctly.
+
+ Email Configuration:
+
+ - From: <%= @sender %>
+ - Reply-To: <%= @reply_to %>
+
+
+ This is a system-generated email. Please do not reply directly to this message.
+ If you need assistance, please contact <%= @reply_to %>.