Add before_action in IncomingEmail webhook controller

app/controllers/mailgun_webhooks_controller.rb

@@ -1,6 +1,7 @@
 class MailgunWebhooksController < ActionController::Base
   skip_before_action :verify_authenticity_token
   before_action :authenticate_mailgun_request
+  before_action :re_optin_when_client_replies, only: :create_incoming_email
 
   REGEX_FROM_ENVELOPE = /.*\<(?<address>(.*))>/.freeze
 
@@ -158,6 +159,16 @@ def update_outgoing_email_status
 
   private
 
+  def re_optin_when_client_replies
+    sender_email_address = parse_valid_email_address(from: params["from"], sender: params["sender"])
+    opted_out_state_intakes = StateFileBaseIntake.opted_out_state_file_intakes(sender_email_address)
+    unless opted_out_state_intakes.empty?
+      opted_out_state_intakes.each do |intake|
+        intake.update(unsubscribed_from_email: false)
+      end
+    end
+  end
+
   def parse_valid_email_address(from:, sender:)
     if REGEX_FROM_ENVELOPE.match?(from)
       provided_address = REGEX_FROM_ENVELOPE.match(from).named_captures["address"]

app/models/application_record.rb

@@ -1,6 +1,7 @@
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 
+  STATE_INTAKE_CLASS_NAMES = %w[StateFileAzIntake StateFileNyIntake].map(&:to_s).freeze
   # Allow counting up to a max number; see https://alexcastano.com/the-hidden-cost-of-the-invisible-queries-in-rails/#how-far-do-you-plan-to-count
   scope :count_greater_than?, ->(n) { limit(n + 1).count > n }
 

app/models/efile_submission.rb

@@ -33,8 +33,6 @@ class EfileSubmission < ApplicationRecord
   has_one_attached :submission_bundle
   validates :irs_submission_id, format: { with: /\A[0-9]{6}[0-9]{7}[0-9a-z]{7}\z/ }, presence: true, uniqueness: true, allow_nil: true
 
-  STATE_INTAKE_CLASS_NAMES = [StateFileAzIntake, StateFileNyIntake].map(&:to_s).freeze
-
   include Statesman::Adapters::ActiveRecordQueries[
     transition_class: EfileSubmissionTransition,
     initial_state: EfileSubmissionStateMachine.initial_state,

app/models/incoming_email.rb

@@ -34,7 +34,6 @@ class IncomingEmail < ApplicationRecord
   has_many :documents, as: :contact_record
 
   after_create { InteractionTrackingService.record_incoming_interaction(client) }
-  after_create { enable_email_opt_in }
 
   def body
     stripped_text.present? ? [stripped_text, stripped_signature].map(&:presence).compact.join("\n") : body_plain
@@ -43,10 +42,4 @@ def body
   def datetime
     received_at
   end
-
-  def enable_email_opt_in
-    if to == 'hello@getyourrefund.org' || to == 'support@getyourrefund.org'
-      self.client.intake.update(email_notification_opt_in: "yes")
-    end
-  end
 end

app/models/state_file_base_intake.rb

@@ -267,4 +267,13 @@ def controller_for_current_step
       end
     end
   end
+
+  def self.opted_out_state_file_intakes(email)
+    state_intakes = []
+    STATE_INTAKE_CLASS_NAMES.each do |state|
+      class_object = state.constantize
+      state_intakes += class_object.where(email_address: email).where(unsubscribed_from_email: true)
+    end
+    state_intakes
+  end
 end

spec/models/efile_submission_spec.rb

@@ -706,4 +706,17 @@
       end
     end
   end
+
+  describe '#is_for_state_filing?' do
+    let(:state_efile_submission) { create :efile_submission, :for_state }
+    let(:non_state_efile_submission) { create :efile_submission }
+
+    it 'returns true for state submission' do
+      expect(state_efile_submission.is_for_state_filing?).to eq true
+    end
+
+    it 'returns false for non-state submission' do
+      expect(non_state_efile_submission.is_for_state_filing?).to eq false
+    end
+  end
 end

spec/models/incoming_email_spec.rb

@@ -75,24 +75,4 @@
       let(:subject) { build(:incoming_email) }
     end
   end
-
-  context "enable_email_opt_in" do
-    let(:intake) { create :intake, email_notification_opt_in: "no" }
-    let(:client) { intake.client }
-    let(:subject) { build(
-        :incoming_email,
-        stripped_text: nil,
-        stripped_signature: nil,
-        body_plain: "I love sending emails to websites",
-        client_id: client.id,
-        to: 'hello@getyourrefund.org',
-      )
-    }
-
-    it 'updates email_notification_opt_in to yes with correct incoming_email' do
-      expect(intake.email_notification_opt_in).to eq('no')
-      subject.save
-      expect(intake.reload.email_notification_opt_in).to eq('yes')
-    end
-  end
 end

spec/models/state_file_base_intake_spec.rb

@@ -27,4 +27,21 @@
       end
     end
   end
+
+  describe '.opted_out_state_file_intakes' do
+    let!(:email) { 'email@test.com' }
+    let!(:intake) { create :state_file_az_intake, email_address: email, unsubscribed_from_email: true }
+
+    context 'when is a FYST email' do
+      it 'returns the intakes' do
+        expect(StateFileBaseIntake.opted_out_state_file_intakes(email).length).to eq 1
+      end
+    end
+
+    context 'when is NOT a FYST email' do
+      it 'returns empty' do
+        expect(StateFileBaseIntake.opted_out_state_file_intakes('another_email@test.com')).to be_empty
+      end
+    end
+  end
 end