Merge pull request #503 from Vizzuality/feat/assessment-date-flags

feat: Adding assessment date flags
Vizzuality · Nov 18, 2024 · 364c860 · 364c860
2 parents 63a22da + 19c9314
commit 364c860
Show file tree

Hide file tree

Showing 12 changed files with 330 additions and 309 deletions.
diff --git a/app/admin/cp_assessments.rb b/app/admin/cp_assessments.rb
@@ -8,7 +8,7 @@
   permit_params :sector_id, :assessment_date, :publication_date, :cp_assessmentable_id, :last_reported_year,
                 :assumptions, :cp_alignment_2025, :cp_alignment_2027, :cp_alignment_2035, :cp_alignment_2050,
                 :region, :cp_regional_alignment_2025, :cp_regional_alignment_2027, :cp_regional_alignment_2035,
-                :cp_regional_alignment_2050, :years_with_targets_string, :emissions,
+                :cp_regional_alignment_2050, :years_with_targets_string, :emissions, :assessment_date_flag,
                 cp_matrices_attributes: [:id, :portfolio, :cp_alignment_2025, :cp_alignment_2035, :cp_alignment_2050, :_destroy]
 
   filter :assessment_date
@@ -60,6 +60,7 @@
       end
       row :sector
       row :assessment_date
+      row :assessment_date_flag
       row :publication_date
       row :last_reported_year
       row :cp_alignment_2050
@@ -123,6 +124,7 @@
       record.sector.name
     end
     column :assessment_date
+    column :assessment_date_flag
     column :publication_date, &:publication_date_csv
     year_columns.map do |year|
       column year do |a|

diff --git a/app/services/csv_import/company_cp_assessments.rb b/app/services/csv_import/company_cp_assessments.rb
@@ -7,6 +7,7 @@ def import
         assessment = prepare_assessment(row)
 
         assessment.assessment_date = assessment_date(row) if row.header?(:assessment_date)
+        assessment.assessment_date_flag = row[:assessment_date_flag] if row.header?(:assessment_date_flag)
         assessment.publication_date = publication_date(row) if row.header?(:publication_date)
         assessment.assumptions = row[:assumptions].presence if row.header?(:assumptions)
         assessment.emissions = parse_emissions(row) if emission_headers?(row)
@@ -46,7 +47,8 @@ def prepare_assessment(row)
         CP::Assessment.find_or_initialize_by(
           cp_assessmentable_type: 'Company',
           cp_assessmentable_id: find_company!(row)&.id,
-          assessment_date: assessment_date(row)
+          assessment_date: assessment_date(row),
+          assessment_date_flag: row.header?(:assessment_date_flag) ? row[:assessment_date_flag] : nil
         )
     end
 

diff --git a/app/views/admin/cp_assessments/_form.html.erb b/app/views/admin/cp_assessments/_form.html.erb
@@ -9,6 +9,7 @@
     %>
     <%= f.input :sector, collection: TPISector.tpi_tool %>
     <%= f.input :assessment_date %>
+    <%= f.input :assessment_date_flag %>
     <%= f.input :publication_date %>
     <%= f.input :last_reported_year %>
     <%= f.input :assumptions %>

diff --git a/app/views/tpi/companies/show.html.erb b/app/views/tpi/companies/show.html.erb
@@ -205,7 +205,11 @@
                 remote: true,
                 url: cp_assessment_tpi_company_path(@company),
                 params: regional_view ? "view=regional" : nil,
-                data: @company_presenter.cp_assessments.map {|v| {label: v['assessment_date']&.strftime('%d %B %Y'), value: v['id']}},
+                data: @company_presenter.cp_assessments.map do |v|
+                  label = v['assessment_date']&.strftime('%d %B %Y')
+                  label += " (#{v['assessment_date_flag']})" if v['assessment_date_flag'].present?
+                  {label: label, value: v['id']}
+                end,
                 selected: params[:cp_assessment_id]
               }) %>
             </div>

diff --git a/db/migrate/20241115133904_add_assessment_date_flag_to_cp_assessments.rb b/db/migrate/20241115133904_add_assessment_date_flag_to_cp_assessments.rb
@@ -0,0 +1,5 @@
+class AddAssessmentDateFlagToCPAssessments < ActiveRecord::Migration[6.1]
+  def change
+    add_column :cp_assessments, :assessment_date_flag, :string
+  end
+end
diff --git a/db/seeds/tpi/company-cp-assessments.csv b/db/seeds/tpi/company-cp-assessments.csv
diff --git a/db/seeds/tpi/company-cp-benchmarks.csv b/db/seeds/tpi/company-cp-benchmarks.csv
diff --git a/db/structure.sql b/db/structure.sql
@@ -818,7 +818,8 @@ CREATE TABLE public.cp_assessments (
     sector_id bigint,
     final_disclosure_year integer,
     cp_alignment_2027 character varying,
-    cp_regional_alignment_2027 character varying
+    cp_regional_alignment_2027 character varying,
+    assessment_date_flag character varying
 );
 
 
@@ -4178,6 +4179,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20240119084250'),
 ('20240202090401'),
 ('20240206094238'),
-('20240527100352');
+('20240527100352'),
+('20241115133904');
 
 
diff --git a/db/test-dump.psql b/db/test-dump.psql
diff --git a/spec/commands/csv_data_upload_spec.rb b/spec/commands/csv_data_upload_spec.rb
@@ -1278,7 +1278,9 @@
     expect(assessment.cp_regional_alignment_2027).to eq('1.5 Degrees')
     expect(assessment.cp_regional_alignment_2035).to eq('2 Degrees')
     expect(assessment.cp_regional_alignment_2050).to eq('International Pledges')
+    expect(assessment.assessment_date_flag).to eq('old')
     expect(assessment2.cp_alignment_2050).to eq('Not Aligned')
+    expect(assessment2.assessment_date_flag).to eq('new')
   end
 
   it 'imports CSV files with Bank CP Assessments data' do

diff --git a/spec/factories/cp_assessment.rb b/spec/factories/cp_assessment.rb
@@ -4,6 +4,7 @@
     association :sector, factory: :tpi_sector
 
     assessment_date { 1.year.ago }
+    assessment_date_flag { 'current' }
     publication_date { 11.months.ago }
     last_reported_year { 2020 }
 

diff --git a/spec/support/fixtures/files/company_cp_assessments.csv b/spec/support/fixtures/files/company_cp_assessments.csv
@@ -1,3 +1,3 @@
-"Id","company_id","Company","Assessment date","Publication date","Last Reported Year",2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,"Assumptions","CP alignment 2025","CP alignment 2035","CP Alignment 2050","Region","CP regional alignment 2025","CP regional alignment 2035","CP regional alignment 2050",CP alignment 2027,CP regional alignment 2027
-,1000,"ACME","2019-01-04","2019-02",2018,,101,101,100,101,100,99,98,,,,,,,,,,,"Assumptions for ACME","Paris Pledges","National Pledges","No Disclosure","OECD","1.5 degrees","2 degrees","International Pledges",Paris Pledges,1.5 degrees
-,2000,"ACME Materials","2019-01-04","2019-02",2019,,,,,,,,,,,,,,,,,,,"Assumptions for ACME Materials",,,"Not aligned",,,,,,
+"Id","company_id","Company","Assessment date","Assessment date flag","Publication date","Last Reported Year",2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,"Assumptions","CP alignment 2025","CP alignment 2035","CP Alignment 2050","Region","CP regional alignment 2025","CP regional alignment 2035","CP regional alignment 2050",CP alignment 2027,CP regional alignment 2027
+,1000,"ACME","2019-01-04","old","2019-02",2018,,101,101,100,101,100,99,98,,,,,,,,,,,"Assumptions for ACME","Paris Pledges","National Pledges","No Disclosure","OECD","1.5 degrees","2 degrees","International Pledges",Paris Pledges,1.5 degrees
+,2000,"ACME Materials","2019-01-04","new","2019-02",2019,,,,,,,,,,,,,,,,,,,"Assumptions for ACME Materials",,,"Not aligned",,,,,,