Skip to content

Commit

Permalink
add reply to param
Browse files Browse the repository at this point in the history
  • Loading branch information
omohokcoj committed Mar 24, 2024
1 parent 8bef75e commit 80d882c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/controllers/api/submissions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ def serialize_params

def submissions_params
permitted_attrs = [
:send_email, :send_sms, :bcc_completed, :completed_redirect_url,
:send_email, :send_sms, :bcc_completed, :completed_redirect_url, :reply_to,
{
message: %i[subject body],
submitters: [[:send_email, :send_sms, :completed_redirect_url, :uuid, :name, :email, :role,
:completed, :phone, :application_key, :external_id,
:completed, :phone, :application_key, :external_id, :reply_to,
{ metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
fields: [%i[name default_value title description
readonly validation_pattern invalid_message]] }]]
Expand Down
6 changes: 5 additions & 1 deletion app/mailers/submitter_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def invitation_email(submitter)
to: @submitter.friendly_name,
from: from_address_for_submitter(submitter),
subject:,
reply_to: (submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
reply_to: submitter.preferences['reply_to'].presence ||
(submitter.submission.created_by_user || submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@')
)
end

Expand Down Expand Up @@ -84,6 +85,9 @@ def documents_copy_email(submitter, to: nil, sig: false)

mail(from: from_address_for_submitter(submitter),
to: to || @submitter.friendly_name,
reply_to: @submitter.preferences['reply_to'].presence ||
(@submitter.submission.created_by_user ||
@submitter.template.author)&.friendly_name&.sub(/\+\w+@/, '@'),
subject:)
end

Expand Down
2 changes: 2 additions & 0 deletions lib/params/submission_create_validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def validate_creation_from_submitters(params)
type(params, :order, String)
type(params, :completed_redirect_url, String)
type(params, :bcc_completed, String)
type(params, :reply_to, String)
type(params, :message, Hash)
type(params, :submitters, Array)

Expand Down Expand Up @@ -69,6 +70,7 @@ def validate_submitter(submitter_params)
required(submitter_params, %i[email phone name])

type(submitter_params, :name, String)
type(submitter_params, :reply_to, String)
type(submitter_params, :email, String)
format(submitter_params, :email, /@/, message: 'email is invalid')
type(submitter_params, :phone, String)
Expand Down
1 change: 1 addition & 0 deletions lib/submitters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def normalize_preferences(account, user, params)
preferences['send_email'] = params['send_email'].in?(TRUE_VALUES) if params.key?('send_email')
preferences['send_sms'] = params['send_sms'].in?(TRUE_VALUES) if params.key?('send_sms')
preferences['bcc_completed'] = params['bcc_completed'] if params.key?('bcc_completed')
preferences['reply_to'] = params['reply_to'] if params.key?('reply_to')
preferences['completed_redirect_url'] = params['completed_redirect_url'] if params.key?('completed_redirect_url')

preferences
Expand Down

0 comments on commit 80d882c

Please sign in to comment.