Update pending in-person profile queries to consider enrollment expiration

app/models/profile.rb

@@ -63,7 +63,8 @@ def self.gpo_verification_pending
   end
 
   def self.in_person_verification_pending
-    where.not(in_person_verification_pending_at: nil)
+    where.not(in_person_verification_pending_at: nil).
+      left_outer_joins(:in_person_enrollment).where(in_person_enrollment: { status: :pending })
   end
 
   # Instance methods
@@ -184,7 +185,7 @@ def fraud_deactivation_reason?
   end
 
   def in_person_verification_pending?
-    in_person_verification_pending_at.present?
+    in_person_verification_pending_at.present? && in_person_enrollment&.pending? != false
   end
 
   def deactivate_due_to_gpo_expiration

spec/controllers/concerns/idv_step_concern_spec.rb

@@ -227,7 +227,7 @@ def show
     end
 
     context 'with pending in person enrollment' do
-      let(:user) { create(:user, :with_pending_in_person_enrollment, :fully_registered) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       before do
         allow(IdentityConfig.store).to receive(:in_person_proofing_enabled).and_return(true)

spec/controllers/idv/cancellations_controller_spec.rb

@@ -221,7 +221,7 @@
       end
 
       context 'with in person enrollment' do
-        let(:user) { build(:user, :with_pending_in_person_enrollment) }
+        let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
         before do
           allow(IdentityConfig.store).to receive(:in_person_proofing_enabled).and_return(true)

spec/controllers/idv/sessions_controller_spec.rb

@@ -52,7 +52,7 @@
     end
 
     context 'with in person enrollment' do
-      let(:user) { build(:user, :with_pending_in_person_enrollment) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       it 'logs idv_start_over event with extra analytics attributes for barcode step' do
         delete :destroy, params: { step: 'barcode', location: '' }
@@ -101,7 +101,7 @@
     end
 
     context 'with in person enrollment' do
-      let(:user) { build(:user, :with_pending_in_person_enrollment) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       before do
         allow(IdentityConfig.store).to receive(:in_person_proofing_enabled).and_return(true)

spec/factories/profiles.rb

@@ -38,6 +38,9 @@
     trait :in_person_verification_pending do
       in_person_verification_pending_at { 15.days.ago }
       idv_level { :legacy_in_person }
+      in_person_enrollment do
+        association(:in_person_enrollment, :pending, user:, profile: instance)
+      end
     end
 
     trait :fraud_pending_reason do

spec/factories/users.rb

@@ -214,9 +214,9 @@
     end
 
     trait :with_pending_in_person_enrollment do
-      after :build do |user|
-        profile = create(:profile, :with_pii, :in_person_verification_pending, user: user)
-        create(:in_person_enrollment, :pending, user: user, profile: profile)
+      fully_registered
+      profiles do
+        [association(:profile, :with_pii, :in_person_verification_pending, user: instance)]
       end
     end
 

spec/models/profile_spec.rb

@@ -47,13 +47,10 @@
   end
 
   describe '#in_person_verification_pending?' do
-    it 'returns true if the in_person_verification_pending_at is present' do
-      profile = create(
-        :profile,
-        :in_person_verification_pending,
-        user: user,
-      )
+    let(:profile) { create(:profile, :in_person_verification_pending, user:) }
+    subject(:result) { profile.in_person_verification_pending? }
 
+    it 'returns true if the in_person_verification_pending_at is present' do
       allow(profile).to receive(:update!).and_raise(RuntimeError)
 
       expect(profile.activated_at).to be_nil
@@ -66,6 +63,27 @@
       expect(profile.initiating_service_provider).to be_nil
       expect(profile.verified_at).to be_nil
     end
+
+    context 'with unlinked establishing enrollment' do
+      # When marking profile as pending in-person proofing, the enrollment hasn't yet been linked to
+      # the profile.
+      #
+      # See: Idv::Session#create_profile_from_applicant_with_password
+
+      before do
+        profile.in_person_enrollment.update(status: :establishing, profile: nil)
+      end
+
+      it { is_expected.to eq(true) }
+    end
+
+    context 'with expired enrollment' do
+      before do
+        profile.in_person_enrollment.update(status: :expired)
+      end
+
+      it { is_expected.to eq(false) }
+    end
   end
 
   describe '#encrypt_pii' do
@@ -1140,9 +1158,17 @@
     end
 
     describe '.in_person_verification_pending' do
-      it 'returns only in_person_verification_pending Profiles' do
-        user.profiles.create(in_person_verification_pending_at: Time.zone.now)
-        user.profiles.create(in_person_verification_pending_at: nil)
+      it 'returns only profiles pending in person verification with unexpired enrollment' do
+        user.profiles << [
+          create(:profile, :in_person_verification_pending),
+          create(:profile),
+          create(
+            :profile,
+            :in_person_verification_pending,
+            in_person_enrollment: create(:in_person_enrollment, :expired, user:),
+          ),
+        ]
+
         expect(user.profiles.in_person_verification_pending.count).to eq 1
       end
     end

spec/presenters/account_show_presenter_spec.rb

@@ -153,7 +153,7 @@
     it { is_expected.to eq(false) }
 
     context 'with user pending ipp verification' do
-      let(:user) { build(:user, :with_pending_in_person_enrollment) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       it { is_expected.to eq(true) }
     end
@@ -232,7 +232,7 @@
     end
 
     context 'with user pending ipp verification' do
-      let(:user) { build(:user, :with_pending_in_person_enrollment) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       it { is_expected.to eq(true) }
     end
@@ -245,7 +245,7 @@
   end
 
   describe '#formatted_ipp_due_date' do
-    let(:user) { build(:user, :with_pending_in_person_enrollment) }
+    let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
     subject(:formatted_ipp_due_date) { presenter.formatted_ipp_due_date }
 

spec/views/accounts/_identity_verification.html.erb_spec.rb

@@ -47,7 +47,7 @@
     let(:ipp_sp_name) { 'IPP SP' }
     let(:ipp_sp_issuer) { 'urn:gov:gsa:openidconnect:sp:ipp_sp' }
     let(:ipp_sp) { create(:service_provider, issuer: ipp_sp_issuer, friendly_name: ipp_sp_name) }
-    let(:user) { build(:user, :with_pending_in_person_enrollment) }
+    let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
     before do
       ipp_sp
@@ -82,7 +82,7 @@
     end
 
     context 'with user pending ipp verification' do
-      let(:user) { build(:user, :with_pending_in_person_enrollment) }
+      let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
       it 'shows pending badge' do
         expect(rendered).to have_content(t('account.index.verification.pending_badge'))

spec/views/accounts/show.html.erb_spec.rb

@@ -95,7 +95,7 @@
   end
 
   context 'when current user has ipp pending profile' do
-    let(:user) { build(:user, :with_pending_in_person_enrollment) }
+    let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
     it 'renders idv partial' do
       expect(render).to render_template(partial: 'accounts/_identity_verification')
@@ -111,10 +111,42 @@
     end
   end
 
+  context 'when current user has an in_person_enrollment that was failed' do
+    let(:vtr) { ['Pe'] }
+    let(:sp_name) { 'sinatra-test-app' }
+    let(:user) { create(:user, :with_pending_in_person_enrollment, :with_multiple_emails) }
+
+    before do
+      # Make the in_person_enrollment and associated profile failed
+      in_person_enrollment = user.in_person_enrollments.first
+      in_person_enrollment.update!(status: :failed, status_check_completed_at: Time.zone.now)
+    end
+
+    it 'renders the idv partial' do
+      expect(render).to render_template(partial: 'accounts/_identity_verification')
+    end
+  end
+
+  context 'when current user has an in_person_enrollment that was cancelled' do
+    let(:vtr) { ['Pe'] }
+    let(:sp_name) { 'sinatra-test-app' }
+    let(:user) { create(:user, :with_pending_in_person_enrollment) }
+
+    before do
+      # Make the in_person_enrollment and associated profile cancelled
+      in_person_enrollment = user.in_person_enrollments.first
+      in_person_enrollment.update!(status: :cancelled, status_check_completed_at: Time.zone.now)
+    end
+
+    it 'renders the idv partial' do
+      expect(render).to render_template(partial: 'accounts/_identity_verification')
+    end
+  end
+
   context 'when current user has an in_person_enrollment that expired' do
     let(:vtr) { ['Pe'] }
     let(:sp_name) { 'sinatra-test-app' }
-    let(:user) { build(:user, :with_pending_in_person_enrollment) }
+    let(:user) { create(:user, :with_pending_in_person_enrollment) }
 
     before do
       # Expire the in_person_enrollment and associated profile