CP Changes V2: second iter

Author: mountolive

app/javascript/components/tpi/charts/cp-performance/Chart.js

@@ -20,7 +20,7 @@ import Legend from './Legend';
 function filterBySubsector(companyData, selectedSubsector, sectorName) {
   if (!selectedSubsector || !hasSubsectorToggle(sectorName)) return companyData;
 
-  return companyData.filter(d => d.company.subsector === selectedSubsector.value);
+  return companyData.filter(d => d.company.subsector?.toLowerCase() === selectedSubsector.value.toLowerCase());
 }
 function filterByShowValue(companyData, showByValue, selectedSubsector, sectorName) {
   const bySubsector = filterBySubsector(companyData, selectedSubsector, sectorName);

app/javascript/components/tpi/charts/cp-performance/chart-utils.js

@@ -32,7 +32,7 @@ export const useParsedChartData = (data, companySelector, selectedCompanies, sel
     const benchmarks = data.filter(d => {
       const typeMatch = d.type === 'area';
       if (selectedSubsector) {
-        return typeMatch && d.subsector === selectedSubsector.value;
+        return typeMatch && d.subsector?.toLowerCase() === selectedSubsector.value.toLowerCase();
       }
 
       return typeMatch;

app/models/company_subsector.rb

@@ -16,4 +16,12 @@ class CompanySubsector < ApplicationRecord
                                  }, class_name: 'CP::Assessment'
   has_one :latest_cp_assessment_regional, -> { currently_published.regional.order(assessment_date: :desc) },
           class_name: 'CP::Assessment'
+
+  before_validation :normalize_subsector
+
+  private
+
+  def normalize_subsector
+    self.subsector = subsector&.strip
+  end
 end

app/models/cp/assessment.rb

@@ -153,7 +153,9 @@ def cp_regional_alignment_2050_by_company
     end
 
     def company_subsector
-      CompanySubsector.find(company_subsector_id) if company_subsector_id.present?
+      return @company_subsector if defined?(@company_subsector)
+
+      @company_subsector = company_subsector_id.present? ? CompanySubsector.find(company_subsector_id) : nil
     end
 
     def subsector_name
@@ -204,6 +206,13 @@ def benchmarks
       )
       return result if result.present?
 
+      if subsector_name.present?
+        Rails.logger.warn(
+          "[CP::Assessment#benchmarks] No benchmarks for subsector='#{subsector_name}' " \
+          "sector='#{sector.name}' date=#{publication_date}, falling back to nil subsector"
+        )
+      end
+
       sector.latest_benchmarks_for_date(publication_date, category: cp_assessmentable_type, subsector: nil)
     end
 

app/models/tpi_sector.rb

@@ -63,7 +63,11 @@ def latest_cp_unit
   def latest_released_benchmarks(category:, region: nil, subsector: nil)
     region ||= 'Global'
     scope = cp_benchmarks.where(category: category.to_s, region: region)
-    scope = scope.where(subsector: subsector) unless subsector.nil?
+    scope = if subsector.nil?
+              scope.where(subsector: nil)
+            else
+              scope.where('LOWER(subsector) = LOWER(?)', subsector)
+            end
     last = scope.group_by(&:release_date).max
     last ? last.last : []
   end
@@ -89,7 +93,12 @@ def latest_benchmarks_for_date(date, category:, region: nil, subsector: nil)
     region ||= 'Global'
     return latest_released_benchmarks(category: category, region: region, subsector: subsector) unless date
 
-    benchmarks = cp_benchmarks.where(category: category.to_s, region: region, subsector: subsector)
+    benchmarks = cp_benchmarks.where(category: category.to_s, region: region)
+    benchmarks = if subsector.nil?
+                   benchmarks.where(subsector: nil)
+                 else
+                   benchmarks.where('LOWER(subsector) = LOWER(?)', subsector)
+                 end
     sector_benchmarks_dates = benchmarks.pluck(:release_date).uniq.sort
 
     last_release_date_before_given_date =

app/services/csv_export/user/cp_benchmarks.rb

@@ -36,11 +36,13 @@ def call
 
       private
 
+      CHEMICALS_SUBSECTOR_LABELS_DOWNCASED = CP::Benchmark::CHEMICALS_SUBSECTOR_LABELS.map(&:downcase).freeze
+
       def filtered_benchmarks
         @cp_benchmarks.reject do |b|
           b.sector&.name == 'Chemicals' &&
-            b.benchmark_label.present? &&
-            !CP::Benchmark::CHEMICALS_SUBSECTOR_LABELS.include?(b.benchmark_label)
+            b.subsector.present? &&
+            !CHEMICALS_SUBSECTOR_LABELS_DOWNCASED.include?(b.subsector.downcase)
         end
       end
     end

app/services/csv_import/company_cp_assessments.rb

@@ -56,10 +56,12 @@ def subsector?(row)
     end
 
     def resolve_subsector_value(row)
-      return row[:subsector] if row.header?(:subsector) && row[:subsector].present?
-      return row[:technology_type] if row.header?(:technology_type) && row[:technology_type].present?
-
-      nil
+      value = if row.header?(:subsector) && row[:subsector].present?
+                row[:subsector]
+              elsif row.header?(:technology_type) && row[:technology_type].present?
+                row[:technology_type]
+              end
+      value&.strip&.presence
     end
 
     def prepare_assessment(row)
@@ -73,10 +75,19 @@ def prepare_assessment(row)
     end
 
     def prepare_assessment_subsector(row)
-      company_id = find_company!(row)&.id
-      subsector = CompanySubsector.where(company_id: company_id, subsector: resolve_subsector_value(row)).first
+      company = find_company!(row)
+      company_id = company&.id
+      subsector_value = resolve_subsector_value(row)
+
+      subsector = CompanySubsector
+        .where(company_id: company_id)
+        .where('LOWER(subsector) = LOWER(?)', subsector_value)
+        .first
+
+      if subsector.nil? && company&.sector&.name == 'Chemicals' && subsector_value.present?
+        subsector = CompanySubsector.find_or_create_by!(company_id: company_id, subsector: subsector_value)
+      end
 
-      # fallthru in case the subsector passed doesn't exist
       return prepare_assessment(row) unless subsector
 
       find_record_by(:id, row) ||

app/services/csv_import/cp_benchmarks.rb

@@ -11,7 +11,7 @@ def import
         benchmark.scenario = row[:scenario] if row.header?(:scenario)
         benchmark.region = parse_cp_benchmark_region(row[:region]) if row.header?(:region)
         benchmark.benchmark_label = row[:benchmark_label] if row.header?(:benchmark_label)
-        benchmark.subsector = row[:technology_type] if row.header?(:technology_type) && !row.header?(:subsector)
+        benchmark.subsector = row[:technology_type]&.strip if row.header?(:technology_type) && !row.header?(:subsector)
         benchmark.emissions = parse_emissions(row) if emission_headers?(row)
 
         was_new_record = benchmark.new_record?
@@ -51,10 +51,12 @@ def prepare_benchmark(row)
     end
 
     def resolve_subsector(row)
-      return row[:subsector] if row.header?(:subsector)
-      return row[:technology_type] if row.header?(:technology_type)
-
-      nil
+      value = if row.header?(:subsector)
+                row[:subsector]
+              elsif row.header?(:technology_type)
+                row[:technology_type]
+              end
+      value&.strip&.presence
     end
 
     def parse_date(date)

app/views/tpi/companies/show.html.erb

@@ -310,11 +310,17 @@
       </div>
 
       <% if show_subsector_toggle %>
+        <% steel_pre_split = @company.sector&.name == 'Steel' && @cp_assessment&.assessment_date&.year.to_i < 2025 %>
         <div id="subsector-toggle" class="buttons has-addons" style="margin-top: 1rem; margin-bottom: 0.5rem;">
           <% @company.company_subsectors.each do |cs| %>
             <% has_data = subsector_assessments[cs.subsector].present? %>
             <% is_global_default = cs.subsector == 'Global' && !has_subsector_data %>
-            <% if has_data || is_global_default %>
+            <% is_pre_split_non_global = steel_pre_split && cs.subsector != 'Global' %>
+            <% if is_pre_split_non_global %>
+              <span class="button disabled" style="background-color: #e8e8e8; color: #999; border-color: #ddd; cursor: not-allowed;" title="No data available for this subsector for pre-2025 assessments">
+                <%= cs.subsector %>
+              </span>
+            <% elsif has_data || is_global_default %>
               <% assessment_id = has_data ? subsector_assessments[cs.subsector].first.id : @cp_assessment&.id %>
               <% is_active = has_subsector_data ? (active_subsector == cs.subsector) : is_global_default %>
               <%= link_to cs.subsector, cp_assessment_tpi_company_path(@company, cp_assessment_id: assessment_id),