Skip to content

Bust caches in User::active_profile and User::pending_profile #9760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthinz merged 9 commits into from
Dec 15, 2023
Merged

Bust caches in User::active_profile and User::pending_profile #9760

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8f61c1
Bust pending/active profile caches in User model
matthinz Dec 13, 2023
bb7eee4
Fix a couple of references to user.pending_profile in specs
matthinz Dec 14, 2023
ee70594
Update app/models/user.rb
matthinz Dec 14, 2023
f75bc01
Also bust cache on reload()
matthinz Dec 14, 2023
b99c948
Remove remove_instance_variable
matthinz Dec 14, 2023
ec1dc52
Add test for #pending_profile caching nil until reload
matthinz Dec 14, 2023
7ddfa41
Actually, let's maintain the behavior of not caching nil values
matthinz Dec 14, 2023
0909766
'be' -> 'eq' in dev_rake_spec
matthinz Dec 14, 2023
57117f9
Don't remove @active_profile since we don't need to
matthinz Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,15 @@ def active_identities
end

def active_profile
@active_profile ||= profiles.verified.find(&:active?)
if defined?(@active_profile)
if !@active_profile&.active
Comment thread
matthinz marked this conversation as resolved.
Outdated
remove_instance_variable(:@active_profile)
else
return @active_profile
end
end

@active_profile = profiles.verified.find(&:active?)
end

def pending_profile?
Expand Down Expand Up @@ -149,7 +157,13 @@ def reinstate!
end

def pending_profile
return @pending_profile if defined?(@pending_profile)
if defined?(@pending_profile)
if @pending_profile&.active
remove_instance_variable(:@pending_profile)
else
return @pending_profile
end
end

@pending_profile = begin
pending = profiles.in_person_verification_pending.or(
Expand Down
8 changes: 4 additions & 4 deletions spec/controllers/idv/by_mail/enter_code_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
end

let(:user) { create(:user, :with_pending_gpo_profile, created_at: 2.days.ago) }
let(:pending_profile) { user.gpo_verification_pending_profile }
let!(:pending_profile) { user.gpo_verification_pending_profile }
let(:success) { true }

it 'uses the PII from the pending profile' do
Expand All @@ -189,7 +189,7 @@
errors: {},
pending_in_person_enrollment: false,
fraud_check_failed: false,
enqueued_at: user.pending_profile.gpo_confirmation_codes.last.code_sent_at,
enqueued_at: pending_profile.gpo_confirmation_codes.last.code_sent_at,
Comment thread
matthinz marked this conversation as resolved.
which_letter: 1,
letter_count: 1,
attempts: 1,
Expand Down Expand Up @@ -234,7 +234,7 @@
errors: {},
pending_in_person_enrollment: true,
fraud_check_failed: false,
enqueued_at: user.pending_profile.gpo_confirmation_codes.last.code_sent_at,
enqueued_at: pending_profile.gpo_confirmation_codes.last.code_sent_at,
which_letter: 1,
letter_count: 1,
attempts: 1,
Expand Down Expand Up @@ -265,7 +265,7 @@
errors: {},
pending_in_person_enrollment: false,
fraud_check_failed: true,
enqueued_at: user.pending_profile.gpo_confirmation_codes.last.code_sent_at,
enqueued_at: pending_profile.gpo_confirmation_codes.last.code_sent_at,
which_letter: 1,
letter_count: 1,
attempts: 1,
Expand Down
21 changes: 21 additions & 0 deletions spec/models/user_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,17 @@

expect(user.active_profile).to eq profile1
end

context 'when the active profile is deactivated' do
it 'is no longer returned' do
user = create(:user, :fully_registered)
create(:profile, :active, :verified, user: user, pii: { first_name: 'Jane' })

expect(user.active_profile).not_to be_nil
user.active_profile.deactivate(:password_reset)
expect(user.active_profile).to be_nil
end
end
end
end

Expand Down Expand Up @@ -629,6 +640,16 @@

expect(user.pending_profile).to eq pending
end

it 'returns nil after the pending profile is activated' do
pending_profile = user.pending_profile
expect(pending_profile).not_to be_nil

pending_profile.remove_gpo_deactivation_reason
pending_profile.activate

expect(user.pending_profile).to be_nil
end
end

context 'when pending profile does not exist' do
Expand Down