Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

95915 Add pega notification email workflow - IVC CHAMPVA forms #19795

Merged
merged 5 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,7 @@ vanotify:
ivc_champva:
api_key: fake_secret
failure_email_threshold_days: 7
pega_inbox_address: fake_email_address
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be populated with the current Pega email address via AWS param

template_id:
form_10_10d_email: form_10_10d_email
form_10_10d_failure_email: form_10_10d_failure_email
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def send_email(form_uuid, form)
form_number: form.form_number,
file_count: fetch_forms_by_uuid(form_uuid).where('file_name LIKE ?', '%supporting_doc%').count,
pega_status: form.pega_status,
created_at: form.created_at.strftime('%B %d, %Y')
created_at: form.created_at.strftime('%B %d, %Y'),
form_uuid: form.form_uuid
}

ActiveRecord::Base.transaction do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ def perform # rubocop:disable Metrics/MethodLength
template_id = "#{form[:form_number]}-FAILURE"
send_failure_email(form, template_id)
if Flipper.enabled?(:champva_enhanced_monitor_logging, @current_user)
additional_context = { form_id: form[:form_number] }
additional_context = { form_id: form[:form_number], form_uuid: form[:form_uuid] }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding additional context for logging

monitor.log_silent_failure_avoided(additional_context)
monitor.track_missing_status_email_sent(form[:form_number])
send_zsf_notification_to_pega(form)
end
end
end
Expand All @@ -44,33 +45,56 @@ def perform # rubocop:disable Metrics/MethodLength
Rails.logger.error e.backtrace.join("\n")
end

def fetch_forms_by_uuid(form_uuid)
@fetch_forms_by_uuid ||= IvcChampvaForm.where(form_uuid:)
def construct_email_payload(form, template_id)
{ email: form.email,
first_name: form.first_name,
last_name: form.last_name,
form_number: form.form_number,
file_count: nil,
pega_status: form.pega_status,
created_at: form.created_at.strftime('%B %d, %Y'),
template_id: template_id,
form_uuid: form.form_uuid }
end

# Sends an email to user notifying them of their submission's failure
#
# @param form [IvcChampvaForm] form object in question
# @param template_id [string] key for template to use in `IvcChampva::Email::EMAIL_TEMPLATE_MAP`
def send_failure_email(form, template_id)
form_data =
{
email: form.email,
first_name: form.first_name,
last_name: form.last_name,
form_number: form.form_number,
file_count: nil,
pega_status: form.pega_status,
created_at: form.created_at.strftime('%B %d, %Y'),
template_id: template_id
}
form_data = construct_email_payload(form, template_id)
ActiveRecord::Base.transaction do
if IvcChampva::Email.new(form_data).send_email
fetch_forms_by_uuid(form[:form_uuid]).update_all(email_sent: true) # rubocop:disable Rails/SkipsModelValidations
else
additional_context = { form_id: form[:form_number] }
additional_context = { form_id: form[:form_number], form_uuid: form[:form_uuid] }
monitor.log_silent_failure(additional_context)
raise ActiveRecord::Rollback, 'Pega Status Update/Action Required Email send failure'
end
end
end
Comment on lines -47 to 75
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulled the email payload construction out into its own function so it could be cleanly shared with the new send_zsf_notification_to_pega function.


# Fires off a notification email to Pega so they know a user has been
# notified of a failed submission.
#
# @param form_data [hash] hash of form details (see `send_failure_email`)
# @param form [IvcChampvaForm] form object in question
def send_zsf_notification_to_pega(form)
form_data = construct_email_payload(form, 'PEGA-TEAM-ZSF')
form_data = form_data.merge({
email: Settings.vanotify.services.ivc_champva.pega_inbox_address
})
if IvcChampva::Email.new(form_data).send_email
monitor.track_send_zsf_notification_to_pega(form_data[:form_uuid])
else
monitor.track_failed_send_zsf_notification_to_pega(form_data[:form_uuid])
end
end

def fetch_forms_by_uuid(form_uuid)
@fetch_forms_by_uuid ||= IvcChampvaForm.where(form_uuid:)
end

##
# retreive a monitor for tracking
#
Expand Down
3 changes: 2 additions & 1 deletion modules/ivc_champva/app/services/ivc_champva/email.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ def send_email
'last_name' => data[:last_name],
'file_count' => data[:file_count],
'pega_status' => data[:pega_status],
'date_submitted' => data[:created_at]
'date_submitted' => data[:created_at],
'form_uuid' => data[:form_uuid]
},
Settings.vanotify.services.ivc_champva.api_key
)
Expand Down
18 changes: 18 additions & 0 deletions modules/ivc_champva/lib/ivc_champva/monitor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,23 @@ def track_missing_status_email_sent(form_id)
"#{STATS_KEY}.form_missing_status_email_sent",
call_location: caller_locations.first, **additional_context)
end

def track_send_zsf_notification_to_pega(form_uuid)
additional_context = {
form_uuid:
}
track_request('info', "IVC ChampVA Forms - alerted Pega of ZSF email sent for submission #{form_uuid}",
"#{STATS_KEY}.send_zsf_notification_to_pega",
call_location: caller_locations.first, **additional_context)
end

def track_failed_send_zsf_notification_to_pega(form_uuid)
additional_context = {
form_uuid:
}
track_request('warn', "IVC ChampVA Forms - could not alert Pega of ZSF email sent for submission #{form_uuid}",
"#{STATS_KEY}.failed_send_zsf_notification_to_pega",
call_location: caller_locations.first, **additional_context)
end
Comment on lines +45 to +62
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additional logging in the IVC monitor class

end
end
28 changes: 28 additions & 0 deletions modules/ivc_champva/spec/jobs/missing_form_status_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
RSpec.describe 'IvcChampva::MissingFormStatusJob', type: :job do
let!(:one_week_ago) { 1.week.ago.utc }
let!(:forms) { create_list(:ivc_champva_form, 3, pega_status: nil, created_at: one_week_ago) }
let!(:job) { IvcChampva::MissingFormStatusJob.new }

before do
allow(Settings.ivc_forms.sidekiq.missing_form_status_job).to receive(:enabled).and_return(true)
allow(StatsD).to receive(:gauge)
allow(StatsD).to receive(:increment)

allow(IvcChampva::Email).to receive(:new).and_return(double(send_email: true))
allow(job).to receive(:monitor).and_return(double(track_send_zsf_notification_to_pega: nil,
track_failed_send_zsf_notification_to_pega: nil))
end

it 'sends the count of forms to DataDog' do
Expand All @@ -25,4 +30,27 @@

IvcChampva::MissingFormStatusJob.new.perform
end

context 'when send_zsf_notification_to_pega is successful' do
it 'logs a successful notification send to Pega' do
job.send_zsf_notification_to_pega(forms[0])

# Expect our monitor to track the successful send
expect(job.monitor).to have_received(:track_send_zsf_notification_to_pega).with(forms[0].form_uuid)
end
end

context 'when send_zsf_notification_to_pega fails' do
before do
# Sending the email should fail in this case
allow(IvcChampva::Email).to receive(:new).and_return(double(send_email: false))
end

it 'logs a failed notification send to Pega' do
job.send_zsf_notification_to_pega(forms[0])

# Expect our monitor to track the failed send
expect(job.monitor).to have_received(:track_failed_send_zsf_notification_to_pega).with(forms[0].form_uuid)
end
end
end
3 changes: 2 additions & 1 deletion modules/ivc_champva/spec/services/email_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
'last_name' => data[:last_name],
'file_count' => data[:file_count],
'pega_status' => data[:pega_status],
'date_submitted' => data[:created_at]
'date_submitted' => data[:created_at],
'form_uuid' => data[:form_uuid]
},
Settings.vanotify.services.ivc_champva.api_key
)
Expand Down
26 changes: 26 additions & 0 deletions modules/ivc_champva/spec/services/monitor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,31 @@
monitor.track_missing_status_email_sent(payload[:form_id])
end
end

describe '#track_send_zsf_notification_to_pega' do
it 'logs sidekiq success' do
payload = {
form_uuid: '12345678-1234-5678-1234-567812345678'
}

expect(monitor).to receive(:track_send_zsf_notification_to_pega).with(
payload[:form_uuid]
)
monitor.track_send_zsf_notification_to_pega(payload[:form_uuid])
end
end

describe '#track_failed_send_zsf_notification_to_pega' do
it 'logs sidekiq success' do
payload = {
form_uuid: '12345678-1234-5678-1234-567812345678'
}

expect(monitor).to receive(:track_failed_send_zsf_notification_to_pega).with(
payload[:form_uuid]
)
monitor.track_failed_send_zsf_notification_to_pega(payload[:form_uuid])
end
end
end
end
Loading