Further refactor submission processing concern with smaller, focused methods

Author: stefan-burke

app/controllers/concerns/submission_processing.rb

@@ -1,64 +1,77 @@
 module SubmissionProcessing
   extend ActiveSupport::Concern
 
-  # Common method to process a submission for either form or code
   def process_submission
-    # Initialize a new submission, handling the case where no fields are enabled
-    @submission = @form.submissions.new
-    @submission.device = @device
+    build_submission
 
-    # Only attempt to update with submission params if they exist in the request
-    # This handles forms that have no enabled fields
-    @submission.assign_attributes(submission_params) if params[:submission].present?
+    return handle_already_claimed_code if code_already_claimed?
+
+    if @submission.save
+      handle_successful_submission
+    else
+      render "public_forms/show", status: :unprocessable_entity
+    end
+  end
 
-    # Associate the submission with the current user if logged in
+  private
+
+  def build_submission
+    @submission = @form.submissions.new(device: @device)
+    @submission.assign_attributes(submission_params) if params[:submission].present?
     @submission.user = current_user if current_user
+  end
 
-    # Check if this is a code submission and if the code has already been claimed
-    if defined?(@code) && @code && @code.claimed?
-      @submission.errors.add(:base, "This code has already been used")
-      return render "public_forms/show", status: :unprocessable_entity
-    end
+  def code?
+    defined?(@code) && @code
+  end
 
-    if @submission.save
-      # Mark the code as claimed if this is a code submission
-      @code.claim! if defined?(@code) && @code
-
-      # Send the submission email only if target_email_address is present
-      send_submission_email
-
-      # Redirect to thanks page instead of rendering
-      # This prevents form resubmission on refresh
-      if defined?(@code) && @code
-        redirect_to code_thanks_path(@code)
-      else
-        redirect_to form_thanks_path(@form.code, @device)
-      end
+  def code_already_claimed?
+    code? && @code.claimed?
+  end
+
+  def handle_already_claimed_code
+    @submission.errors.add(:base, "This code has already been used")
+    render "public_forms/show", status: :unprocessable_entity
+  end
+
+  def handle_successful_submission
+    claim_code_if_present
+    send_submission_email
+    redirect_to_thanks_page
+  end
+
+  def claim_code_if_present
+    @code.claim! if code?
+  end
+
+  def redirect_to_thanks_page
+    if code?
+      redirect_to code_thanks_path(@code)
     else
-      render "public_forms/show", status: :unprocessable_entity
+      redirect_to form_thanks_path(@form.code, @device)
     end
   end
 
   def send_submission_email
-    if @form.target_email_address.present?
-      begin
-        SubmissionMailer.new_submission(@submission).deliver_later
-        # Email will be sent asynchronously, so we mark it as pending
-        # It will be updated when the job completes
-      rescue => e
-        # Log the error but continue with the form submission
-        Rails.logger.error "Failed to queue submission email: #{e.message}"
-        @submission.mark_as_failed! if @submission.respond_to?(:mark_as_failed!)
-      end
+    return unless @form.target_email_address.present?
+
+    begin
+      SubmissionMailer.new_submission(@submission).deliver_later
+    rescue => e
+      log_email_error(e)
     end
   end
 
+  def log_email_error(error)
+    Rails.logger.error "Failed to queue submission email: #{error.message}"
+    @submission.mark_as_failed! if @submission.respond_to?(:mark_as_failed!)
+  end
+
   def check_form_access
-    # Redirect to login if the form requires login and user is not logged in
-    if @form.require_login && !logged_in?
-      store_location # Store the current URL to redirect back after login
-      redirect_to login_path, alert: "You need to log in to access this form"
-    end
+    return unless @form.require_login && !logged_in?
+
+    store_location
+    redirect_to login_path, alert: "You need to log in to access this form"
   end
 
   def submission_params
@@ -71,7 +84,6 @@ def submission_params
         :postcode
       )
     else
-      # Return an empty hash if there are no submission parameters
       {}
     end
   end