rename cache db column with `_cached` suffix

app/controllers/concerns/enforces_two_factor_authentication.rb

@@ -21,7 +21,7 @@ module EnforcesTwoFactorAuthentication
 
   def two_factor_authentication_required?
     current_application_settings.require_two_factor_authentication? ||
-      current_user.try(:require_two_factor_authentication?)
+      current_user.try(:require_two_factor_authentication_from_group?)
   end
 
   def two_factor_authentication_reason(global: -> {}, group: -> {})
@@ -37,7 +37,7 @@ module EnforcesTwoFactorAuthentication
 
   def two_factor_grace_period
     periods = [current_application_settings.two_factor_grace_period]
-    periods << current_user.two_factor_grace_period if current_user.try(:require_two_factor_authentication?)
+    periods << current_user.two_factor_grace_period if current_user.try(:require_two_factor_authentication_from_group?)
     periods.min
   end
 

app/models/user.rb

@@ -974,7 +974,7 @@ class User < ActiveRecord::Base
   def update_two_factor_requirement
     periods = expanded_groups_requiring_two_factor_authentication.pluck(:two_factor_grace_period)
 
-    self.require_two_factor_authentication = periods.any?
+    self.require_two_factor_authentication_from_group = periods.any?
     self.two_factor_grace_period = periods.min || User.column_defaults['two_factor_grace_period']
 
     save

db/migrate/20170124193205_add_two_factor_columns_to_users.rb

@@ -6,12 +6,12 @@ class AddTwoFactorColumnsToUsers < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    add_column_with_default(:users, :require_two_factor_authentication, :boolean, default: false)
+    add_column_with_default(:users, :require_two_factor_authentication_from_group, :boolean, default: false)
     add_column_with_default(:users, :two_factor_grace_period, :integer, default: 48)
   end
 
   def down
-    remove_column(:users, :require_two_factor_authentication)
+    remove_column(:users, :require_two_factor_authentication_from_group)
     remove_column(:users, :two_factor_grace_period)
   end
 end

db/schema.rb

@@ -1249,7 +1249,7 @@ ActiveRecord::Schema.define(version: 20170402231018) do
     t.boolean "authorized_projects_populated"
     t.boolean "ghost"
     t.boolean "notified_of_own_activity"
-    t.boolean "require_two_factor_authentication", default: false, null: false
+    t.boolean "require_two_factor_authentication_from_group", default: false, null: false
     t.integer "two_factor_grace_period", default: 48, null: false
   end
 

spec/controllers/application_controller_spec.rb

@@ -183,7 +183,7 @@ describe ApplicationController do
       end
 
       it 'returns true if a 2FA requirement is set on the user' do
-        user.require_two_factor_authentication = true
+        user.require_two_factor_authentication_from_group = true
         allow(controller).to receive(:current_user).and_return(user)
 
         expect(subject).to be_truthy
@@ -201,7 +201,7 @@ describe ApplicationController do
       end
 
       context 'with a 2FA requirement set on the user' do
-        let(:user) { create :user, require_two_factor_authentication: true, two_factor_grace_period: 23 }
+        let(:user) { create :user, require_two_factor_authentication_from_group: true, two_factor_grace_period: 23 }
 
         it 'returns the user grace period if lower than the application grace period' do
           stub_application_setting two_factor_grace_period: 24

spec/models/user_spec.rb

@@ -1548,7 +1548,7 @@ describe User, models: true do
       end
 
       it 'requires 2FA' do
-        expect(user.require_two_factor_authentication).to be true
+        expect(user.require_two_factor_authentication_from_group).to be true
       end
 
       it 'uses the shortest grace period' do
@@ -1567,7 +1567,7 @@ describe User, models: true do
       end
 
       it 'requires 2FA' do
-        expect(user.require_two_factor_authentication).to be true
+        expect(user.require_two_factor_authentication_from_group).to be true
       end
     end
 
@@ -1582,7 +1582,7 @@ describe User, models: true do
       end
 
       it 'requires 2FA' do
-        expect(user.require_two_factor_authentication).to be true
+        expect(user.require_two_factor_authentication_from_group).to be true
       end
     end
 
@@ -1596,7 +1596,7 @@ describe User, models: true do
       end
 
       it 'does not require 2FA' do
-        expect(user.require_two_factor_authentication).to be false
+        expect(user.require_two_factor_authentication_from_group).to be false
       end
 
       it 'falls back to the default grace period' do