Merge remote-tracking branch 'origin/master' into aws-eb-test

app/models/school.rb

@@ -649,7 +649,11 @@ def meter_attributes_to_analytics
   end
 
   def invalidate_cache_key
-    update_attribute(:validation_cache_key, SecureRandom.uuid)
+    if Flipper.enabled?(:meter_collection_cache_delete_on_invalidate)
+      AggregateSchoolService.new(self).invalidate_cache
+    else
+      update_attribute(:validation_cache_key, SecureRandom.uuid)
+    end
   end
 
   def process_data!

app/services/aggregate_school_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dashboard'
 
 class AggregateSchoolService
@@ -33,26 +35,27 @@ def in_cache_or_cache_off?
   end
 
   def self.caching_off?
-    ! Rails.application.config.action_controller.perform_caching
+    !Rails.application.config.action_controller.perform_caching
   end
 
   def self.analysis_date(meter_collection, fuel_type)
-    return Time.zone.today unless fuel_type
-    fuel_type = fuel_type.to_sym
-    if fuel_type == :gas
+    case fuel_type&.to_sym
+    when :gas
       meter_collection.aggregated_heat_meters.amr_data.end_date
-    elsif fuel_type == :electricity
-      meter_collection.aggregated_electricity_meters.amr_data.end_date
-    elsif fuel_type == :storage_heater
+    when :electricity, :storage_heater
       meter_collection.aggregated_electricity_meters.amr_data.end_date
     else
       Time.zone.today
     end
   end
 
-private
+  private
 
   def cache_key
-    "#{@active_record_school.id}-#{@active_record_school.name.parameterize}-aggregated_meter_collection-#{@active_record_school.validation_cache_key}"
+    parts = [@active_record_school.id, @active_record_school.name.parameterize, 'aggregated_meter_collection']
+    unless Flipper.enabled?(:meter_collection_cache_delete_on_invalidate)
+      parts << @active_record_school.validation_cache_key
+    end
+    parts.join('-')
   end
 end

lib/tasks/deployment/20250122094731_flipper_meter_collection_cache_delete_on_invalidate.rake

@@ -0,0 +1,12 @@
+namespace :after_party do
+  desc 'Deployment task: flipper_meter_collection_cache_delete_on_invalidate'
+  task flipper_meter_collection_cache_delete_on_invalidate: :environment do
+    puts "Running deploy task 'flipper_meter_collection_cache_delete_on_invalidate'"
+
+    Flipper.add(:meter_collection_cache_delete_on_invalidate)
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord.create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end