Skip to content

Commit

Permalink
Merge from docusealco/wip
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexBTurchyn authored Feb 17, 2025
2 parents 33cc0a8 + f5facfa commit 1b52a99
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
runs-on: ubuntu-24.04-arm
runs-on: ubuntu-latest

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/submission_documents_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def index
last_submitter = @submission.submitters.max_by(&:completed_at)

if last_submitter.documents_attachments.blank?
last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(submitter)
last_submitter.documents_attachments = Submissions::EnsureResultGenerated.call(last_submitter)
end

last_submitter.documents_attachments
Expand Down
5 changes: 4 additions & 1 deletion app/controllers/start_form_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ def update
assign_submission_attributes(@submitter, @template)

Submissions::AssignDefinedSubmitters.call(@submitter.submission)
else
@submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
end

if @submitter.save
Expand Down Expand Up @@ -65,8 +67,9 @@ def find_or_initialize_submitter(template, submitter_params)
.order(id: :desc)
.where(declined_at: nil)
.where(external_id: nil)
.where(ip: [nil, request.remote_ip])
.then { |rel| params[:resubmit].present? ? rel.where(completed_at: nil) : rel }
.find_or_initialize_by(**submitter_params.compact_blank)
.find_or_initialize_by(email: submitter_params[:email], **submitter_params.compact_blank)
end

def assign_submission_attributes(submitter, template)
Expand Down

0 comments on commit 1b52a99

Please sign in to comment.