From ab6cd0e89c7c17ed1ac43d44cf7cc20a66d94f42 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 28 Jan 2025 18:32:32 +0200 Subject: [PATCH] adjust send email job --- app/jobs/send_submitter_invitation_email_job.rb | 8 +++++++- lib/accounts.rb | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/jobs/send_submitter_invitation_email_job.rb b/app/jobs/send_submitter_invitation_email_job.rb index 22616c09..31f4af2b 100644 --- a/app/jobs/send_submitter_invitation_email_job.rb +++ b/app/jobs/send_submitter_invitation_email_job.rb @@ -8,6 +8,12 @@ class SendSubmitterInvitationEmailJob return if submitter.submission.source == 'invite' && !Accounts.can_send_emails?(submitter.account, on_events: true) + unless Accounts.can_send_invitation_emails?(submitter.account) + Rollbar.warning("Skip email: #{submitter.account.id}") if defined?(Rollbar) + + return + end + mail = SubmitterMailer.invitation_email(submitter) Submitters::ValidateSending.call(submitter, mail) @@ -17,6 +23,6 @@ class SendSubmitterInvitationEmailJob SubmissionEvent.create!(submitter:, event_type: 'send_email') submitter.sent_at ||= Time.current - submitter.save + submitter.save! end end diff --git a/lib/accounts.rb b/lib/accounts.rb index 67427cf6..f3dd639b 100644 --- a/lib/accounts.rb +++ b/lib/accounts.rb @@ -153,6 +153,10 @@ module Accounts EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY) end + def can_send_invitation_emails?(_account) + true + end + def normalize_timezone(timezone) tzinfo = TZInfo::Timezone.get(ActiveSupport::TimeZone::MAPPING[timezone] || timezone)