LG-11012: redo document capture bug fixes

app/controllers/idv/capture_doc_status_controller.rb

@@ -20,7 +20,8 @@ def status
           :too_many_requests
         elsif confirmed_barcode_attention_result? || user_has_establishing_in_person_enrollment?
           :ok
-        elsif session_result.blank? || pending_barcode_attention_confirmation?
+        elsif session_result.blank? || pending_barcode_attention_confirmation? ||
+              redo_document_capture_pending?
           :accepted
         elsif !session_result.success?
           :unauthorized
@@ -68,11 +69,13 @@ def user_has_establishing_in_person_enrollment?
     end
 
     def confirmed_barcode_attention_result?
-      had_barcode_attention_result? && !document_capture_session.ocr_confirmation_pending?
+      !redo_document_capture_pending? && had_barcode_attention_result? &&
+        !document_capture_session.ocr_confirmation_pending?
     end
 
     def pending_barcode_attention_confirmation?
-      had_barcode_attention_result? && document_capture_session.ocr_confirmation_pending?
+      !redo_document_capture_pending? && had_barcode_attention_result? &&
+        document_capture_session.ocr_confirmation_pending?
     end
 
     def had_barcode_attention_result?
@@ -90,5 +93,12 @@ def idv_session
         service_provider: current_sp,
       )
     end
+
+    def redo_document_capture_pending?
+      return unless session_result&.dig(:captured_at)
+      return unless document_capture_session.requested_at
+
+      document_capture_session.requested_at > session_result.captured_at
+    end
   end
 end

app/controllers/idv/document_capture_controller.rb

@@ -20,6 +20,9 @@ def show
 
     def update
       idv_session.redo_document_capture = nil # done with this redo
+      # Not used in standard flow, here for data consistency with hybrid flow.
+      document_capture_session.confirm_ocr
+
       result = handle_stored_result
       analytics.idv_doc_auth_document_capture_submitted(**result.to_h.merge(analytics_arguments))
 

app/controllers/idv/hybrid_mobile/document_capture_controller.rb

@@ -6,13 +6,9 @@ class DocumentCaptureController < ApplicationController
 
       before_action :check_valid_document_capture_session
       before_action :override_csp_to_allow_acuant
+      before_action :confirm_document_capture_needed, only: :show
 
       def show
-        if document_capture_session&.load_result&.success?
-          redirect_to idv_hybrid_mobile_capture_complete_url
-          return
-        end
-
         analytics.idv_doc_auth_document_capture_visited(**analytics_arguments)
 
         Funnel::DocAuth::RegisterStep.new(document_capture_user.id, sp_session[:issuer]).
@@ -22,6 +18,7 @@ def show
       end
 
       def update
+        document_capture_session.confirm_ocr
         result = handle_stored_result
 
         analytics.idv_doc_auth_document_capture_submitted(**result.to_h.merge(analytics_arguments))
@@ -69,6 +66,20 @@ def handle_stored_result
           failure(I18n.t('doc_auth.errors.general.network_error'), extra)
         end
       end
+
+      def confirm_document_capture_needed
+        return unless stored_result&.success?
+        return if redo_document_capture_pending?
+
+        redirect_to idv_hybrid_mobile_capture_complete_url
+      end
+
+      def redo_document_capture_pending?
+        return unless stored_result&.dig(:captured_at)
+        return unless document_capture_session.requested_at
+
+        document_capture_session.requested_at > stored_result.captured_at
+      end
     end
   end
 end

app/controllers/idv/link_sent_controller.rb

@@ -25,6 +25,7 @@ def update
       # The doc capture flow will have fetched the results already. We need
       # to fetch them again here to add the PII to this session
       handle_document_verification_success(document_capture_session_result)
+      idv_session.redo_document_capture = nil
 
       redirect_to idv_ssn_url
     end

app/models/document_capture_session.rb

@@ -14,6 +14,7 @@ def store_result_from_response(doc_auth_response)
     )
     session_result.success = doc_auth_response.success?
     session_result.pii = doc_auth_response.pii_from_doc
+    session_result.captured_at = Time.zone.now
     session_result.attention_with_barcode = doc_auth_response.attention_with_barcode?
     EncryptedRedisStructStorage.store(
       session_result,
@@ -28,6 +29,7 @@ def store_failed_auth_image_fingerprint(front_image_fingerprint, back_image_fing
       id: generate_result_id,
     )
     session_result.success = false
+    session_result.captured_at = Time.zone.now
     session_result.add_failed_front_image!(front_image_fingerprint) if front_image_fingerprint
     session_result.add_failed_back_image!(back_image_fingerprint) if back_image_fingerprint
     EncryptedRedisStructStorage.store(
@@ -52,20 +54,6 @@ def create_doc_auth_session
     save!
   end
 
-  def store_doc_auth_result(result:, pii:)
-    EncryptedRedisStructStorage.store(
-      DocumentCaptureSessionAsyncResult.new(
-        id: result_id,
-        pii: pii,
-        result: result,
-        status: DocumentCaptureSessionAsyncResult::DONE,
-      ),
-      expires_in: IdentityConfig.store.async_wait_timeout_seconds,
-    )
-    self.ocr_confirmation_pending = result[:attention_with_barcode]
-    save!
-  end
-
   def load_proofing_result
     EncryptedRedisStructStorage.load(result_id, type: ProofingSessionAsyncResult)
   end
@@ -99,6 +87,12 @@ def expired?
       Time.zone.now
   end
 
+  def confirm_ocr
+    return unless self.ocr_confirmation_pending
+
+    update!(ocr_confirmation_pending: false)
+  end
+
   private
 
   def generate_result_id

app/services/document_capture_session_result.rb

@@ -8,9 +8,10 @@
   :attention_with_barcode,
   :failed_front_image_fingerprints,
   :failed_back_image_fingerprints,
+  :captured_at,
   keyword_init: true,
   allowed_members: [:id, :success, :attention_with_barcode, :failed_front_image_fingerprints,
-                    :failed_back_image_fingerprints],
+                    :failed_back_image_fingerprints, :captured_at],
 ) do
   def self.redis_key_prefix
     'dcs:result'

spec/controllers/idv/document_capture_controller_spec.rb

@@ -3,7 +3,16 @@
 RSpec.describe Idv::DocumentCaptureController do
   include IdvHelper
 
-  let(:document_capture_session_uuid) { 'fd14e181-6fb1-4cdc-92e0-ef66dad0df4e' }
+  let(:document_capture_session_requested_at) { Time.zone.now }
+
+  let!(:document_capture_session) do
+    DocumentCaptureSession.create!(
+      user: user,
+      requested_at: document_capture_session_requested_at,
+    )
+  end
+
+  let(:document_capture_session_uuid) { document_capture_session&.uuid }
 
   let(:user) { create(:user) }
 
@@ -184,5 +193,16 @@
         expect(user.reload.establishing_in_person_enrollment).to be_nil
       end
     end
+
+    context 'ocr confirmation pending' do
+      before do
+        subject.document_capture_session.ocr_confirmation_pending = true
+      end
+
+      it 'confirms ocr' do
+        put :update
+        expect(subject.document_capture_session.ocr_confirmation_pending).to be_falsey
+      end
+    end
   end
 end

spec/controllers/idv/hybrid_mobile/document_capture_controller_spec.rb

@@ -15,6 +15,8 @@
   let(:document_capture_session_uuid) { document_capture_session&.uuid }
 
   let(:document_capture_session_requested_at) { Time.zone.now }
+  let(:document_capture_session_result_captured_at) { Time.zone.now + 1.second }
+  let(:document_capture_session_result_success) { true }
 
   let(:ab_test_args) do
     { sample_bucket1: :sample_value1, sample_bucket2: :sample_value2 }
@@ -102,20 +104,42 @@
         end
       end
     end
+
+    context 'stored_result already exists' do
+      before do
+        stub_document_capture_session_result
+      end
+
+      it 'redirects to document capture complete' do
+        get :show
+        expect(response).to redirect_to idv_hybrid_mobile_capture_complete_url
+      end
+
+      context 'document capture re-requested' do
+        let(:document_capture_session_result_captured_at) do
+          document_capture_session_requested_at - 5.minutes
+        end
+        context 'with successful stored_result' do
+          it 'renders the show template' do
+            get :show
+            expect(response).to render_template :show
+          end
+        end
+
+        context 'with failed stored_result' do
+          let(:document_capture_session_result_success) { false }
+          it 'renders the show template' do
+            get :show
+            expect(response).to render_template :show
+          end
+        end
+      end
+    end
   end
 
   describe '#update' do
     before do
-      allow_any_instance_of(DocumentCaptureSession).to receive(:load_result).and_return(
-        DocumentCaptureSessionResult.new(
-          id: 1234,
-          success: true,
-          pii: {
-            state: 'WA',
-          },
-          attention_with_barcode: true,
-        ),
-      )
+      stub_document_capture_session_result
     end
 
     context 'with no user id in session' do
@@ -161,6 +185,17 @@
         put :update
         expect(response).to redirect_to idv_hybrid_mobile_capture_complete_url
       end
+
+      context 'ocr confirmation pending' do
+        before do
+          subject.document_capture_session.ocr_confirmation_pending = true
+        end
+
+        it 'confirms ocr' do
+          put :update
+          expect(subject.document_capture_session.ocr_confirmation_pending).to be_falsey
+        end
+      end
     end
   end
 
@@ -172,4 +207,18 @@
       controller.extra_view_variables
     end
   end
+
+  def stub_document_capture_session_result
+    allow_any_instance_of(DocumentCaptureSession).to receive(:load_result).and_return(
+      DocumentCaptureSessionResult.new(
+        id: 1234,
+        success: document_capture_session_result_success,
+        pii: {
+          state: 'WA',
+        },
+        attention_with_barcode: true,
+        captured_at: document_capture_session_result_captured_at,
+      ),
+    )
+  end
 end

spec/controllers/idv/link_sent_controller_spec.rb

@@ -140,14 +140,26 @@
         allow(subject).to receive(:document_capture_session).and_return(document_capture_session)
       end
 
-      it 'redirects to ssn page when successful' do
-        put :update
+      context 'document capture session successful' do
+        it 'redirects to ssn page' do
+          put :update
 
-        expect(response).to redirect_to(idv_ssn_url)
+          expect(response).to redirect_to(idv_ssn_url)
 
-        pc = ProofingComponent.find_by(user_id: user.id)
-        expect(pc.document_check).to eq('mock')
-        expect(pc.document_type).to eq('state_id')
+          pc = ProofingComponent.find_by(user_id: user.id)
+          expect(pc.document_check).to eq('mock')
+          expect(pc.document_type).to eq('state_id')
+        end
+
+        context 'redo document capture' do
+          before do
+            subject.idv_session.redo_document_capture = true
+          end
+          it 'resets redo_document capture to nil in idv_session' do
+            put :update
+            expect(subject.idv_session.redo_document_capture).to be_nil
+          end
+        end
       end
 
       context 'document capture session canceled' do