module SchoolAggregation
  extend ActiveSupport::Concern

private

  def aggregate_school(school)
    cache_key = "#{school.name.parameterize}-aggregated_meter_collection"
    Rails.cache.fetch(cache_key, expires_in: 3.hours) do
      meter_collection = MeterCollection.new(school)
      AggregateDataService.new(meter_collection).aggregate_heat_and_electricity_meters
      meter_collection
    end
  end
end

module SchoolAggregation
  extend ActiveSupport::Concern

private

  def aggregate_school(school)
    cache_key = "#{school.name.parameterize}-aggregated_meter_collection"
    Rails.cache.fetch(cache_key, expires_in: 3.hours) do
      meter_collection = MeterCollection.new(school)
      AggregateDataService.new(meter_collection).validate_and_aggregate_meter_data
      meter_collection
    end
  end
end

Use old validate and aggregate for analysis
Use old validate and aggregate for analysis
