use global account ids when invalidating cached settings

test plan:
* with caching and sharding enabled, should be able to
 change the inheritable account settings
 "Restrict students from viewing courses before/after date"
 and have the changes persist / show up in sub-accounts

closes #CNVS-23134

Change-Id: I93b39d96e36040cbc522a21f05cf105128354065
Reviewed-on: https://gerrit.instructure.com/63880
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Tested-by: Jenkins
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>

Author: maneframe

app/models/account.rb

@@ -533,7 +533,7 @@ def invalidate_caches_if_changed
     if @invalidations.present?
       shard.activate do
         @invalidations.each do |key|
-          Rails.cache.delete([key, id].cache_key)
+          Rails.cache.delete([key, self.global_id].cache_key)
         end
         Account.send_later_if_production(:invalidate_inherited_caches, self, @invalidations)
       end
@@ -544,8 +544,9 @@ def self.invalidate_inherited_caches(parent_account, keys)
     parent_account.shard.activate do
       account_ids = Account.sub_account_ids_recursive(parent_account.id)
       account_ids.each do |id|
+        global_id = Shard.global_id_for(id)
         keys.each do |key|
-          Rails.cache.delete([key, id].cache_key)
+          Rails.cache.delete([key, global_id].cache_key)
         end
       end
     end
@@ -560,7 +561,7 @@ def quota
     return self.class.default_storage_quota if root_account?
 
     shard.activate do
-      Rails.cache.fetch(['current_quota', id].cache_key) do
+      Rails.cache.fetch(['current_quota', self.global_id].cache_key) do
         self.parent_account.default_storage_quota
       end
     end
@@ -571,7 +572,7 @@ def default_storage_quota
     return self.class.default_storage_quota if root_account?
 
     shard.activate do
-      @default_storage_quota ||= Rails.cache.fetch(['default_storage_quota', id].cache_key) do
+      @default_storage_quota ||= Rails.cache.fetch(['default_storage_quota', self.global_id].cache_key) do
         parent_account.default_storage_quota
       end
     end
@@ -620,7 +621,7 @@ def default_group_storage_quota
     return Group.default_storage_quota if root_account?
 
     shard.activate do
-      Rails.cache.fetch(['default_group_storage_quota', self.id].cache_key) do
+      Rails.cache.fetch(['default_group_storage_quota', self.global_id].cache_key) do
         self.parent_account.default_group_storage_quota
       end
     end

app/models/account/settings.rb

@@ -32,8 +32,10 @@ def self.included(klass)
   end
 
   def cached_inherited_setting(setting)
-    Rails.cache.fetch([setting, self.global_id].cache_key) do
-      calculate_inherited_setting(setting)
+    self.shard.activate do
+      Rails.cache.fetch([setting, self.global_id].cache_key) do
+        calculate_inherited_setting(setting)
+      end
     end
   end
 

spec/models/account_spec.rb

@@ -1304,10 +1304,13 @@ def account_with_admin_and_restricted_user(account, restricted_role)
         subaccount = account.sub_accounts.create!
         expect(subaccount.default_storage_quota).to eq 10.megabytes
 
-        # should reload
         account.default_storage_quota = 20.megabytes
         account.save!
 
+        # should clear caches
+        account = Account.find(account.id)
+        expect(account.default_storage_quota).to eq 20.megabytes
+
         subaccount = Account.find(subaccount)
         expect(subaccount.default_storage_quota).to eq 20.megabytes
       end
@@ -1358,6 +1361,27 @@ def account_with_admin_and_restricted_user(account, restricted_role)
       @account.save!
       expect(@account.restrict_student_future_view).to eq({:locked => false, :value => true})
     end
+
+    context "caching" do
+      specs_require_sharding
+      it "should clear cached values correctly" do
+        enable_cache do
+          [@account, @sub1, @sub2].each(&:restrict_student_future_view) # preload the cached values
+
+          @sub1.settings = @sub1.settings.merge(:restrict_student_future_view => {:locked => true, :value => true})
+          @sub1.save!
+
+          # hard reload
+          @account = Account.find(@account.id)
+          @sub1 = Account.find(@sub1.id)
+          @sub2 = Account.find(@sub2.id)
+
+          expect(@account.restrict_student_future_view).to eq({:locked => false, :value => false})
+          expect(@sub1.restrict_student_future_view).to eq({:locked => true, :value => true})
+          expect(@sub2.restrict_student_future_view).to eq({:locked => true, :value => true, :inherited => true})
+        end
+      end
+    end
   end
 
   context "require terms of use" do