From 0c8870f8f627fa67fd98853a522f1fc9c8496bb8 Mon Sep 17 00:00:00 2001
From: martintomas <martintomas.it@gmail.com>
Date: Wed, 23 Oct 2024 13:38:37 +0200
Subject: [PATCH 1/5] refactoring: Removing BETA naming

---
 app/assets/stylesheets/tpi/pages/company.scss |  4 ----
 app/controllers/concerns/tpi/user_download.rb |  6 ++----
 app/controllers/tpi/companies_controller.rb   |  1 +
 app/controllers/tpi/sectors_controller.rb     |  1 +
 app/controllers/tpi/tpi_controller.rb         |  4 ++++
 .../components/tpi/charts/mq-level/options.js |  5 +----
 app/models/mq/assessment.rb                   |  2 +-
 .../tpi/companies/_mq_assessment.html.erb     |  2 +-
 app/views/tpi/companies/show.html.erb         |  5 -----
 app/views/tpi/sectors/index.html.erb          |  5 -----
 app/views/tpi/sectors/show.html.erb           |  5 -----
 .../tpi/sectors_controller_spec.rb            | 16 +++++++--------
 spec/support/capybara_helpers.rb              |  9 +++------
 spec/system/public/tpi/company_spec.rb        | 10 +++++-----
 spec/system/public/tpi/sectors_spec.rb        | 20 +++++++++----------
 15 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/app/assets/stylesheets/tpi/pages/company.scss b/app/assets/stylesheets/tpi/pages/company.scss
index b985cf308..b5615106f 100644
--- a/app/assets/stylesheets/tpi/pages/company.scss
+++ b/app/assets/stylesheets/tpi/pages/company.scss
@@ -243,10 +243,6 @@
 
         border-left: 2px solid $hawkes-blue;
 
-        &.level5 {
-          background-color: rgba($tpi-level5-background-color, 0.15);
-        }
-
         &__header {
           font-size: 16px;
           font-weight: bold;
diff --git a/app/controllers/concerns/tpi/user_download.rb b/app/controllers/concerns/tpi/user_download.rb
index 72bfb1089..8fb908145 100644
--- a/app/controllers/concerns/tpi/user_download.rb
+++ b/app/controllers/concerns/tpi/user_download.rb
@@ -12,10 +12,8 @@ def send_tpi_user_file(mq_assessments:, cp_assessments:, filename:)
         .includes(sector: [:cp_units])
 
       mq_assessments_files = mq_assessments_by_methodology.map do |methodology, assessments|
-        is_beta_methodology = MQ::Assessment::BETA_METHODOLOGIES.include? methodology
-        name = is_beta_methodology ? "#{methodology}_BETA_#{timestamp}" : "#{methodology}_#{timestamp}"
         {
-          "MQ_Assessments_Methodology_#{name}.csv" => CSVExport::User::MQAssessments.new(assessments).call
+          "MQ_Assessments_Methodology_#{methodology}_#{timestamp}.csv" => CSVExport::User::MQAssessments.new(assessments).call
         }
       end.reduce(&:merge)
 
@@ -38,7 +36,7 @@ def send_tpi_user_file(mq_assessments:, cp_assessments:, filename:)
         'User guide TPI files.xlsx' => user_guide
       )
       if ENV['MQ_BETA_ENABLED'].to_s == 'true'
-        files = files.merge 'Company_Latest_Assessments_BETA_5.0.csv' => latest_cp_assessments_beta_csv
+        files = files.merge 'Company_Latest_Assessments_5.0.csv' => latest_cp_assessments_beta_csv
       end
       render zip: files.compact, filename: "#{filename} - #{timestamp}"
     end
diff --git a/app/controllers/tpi/companies_controller.rb b/app/controllers/tpi/companies_controller.rb
index d2724d22b..0d6b53856 100644
--- a/app/controllers/tpi/companies_controller.rb
+++ b/app/controllers/tpi/companies_controller.rb
@@ -2,6 +2,7 @@ module TPI
   class CompaniesController < TPIController
     include UserDownload
 
+    before_action :enable_beta_mq_assessments
     before_action :fetch_company
     before_action :redirect_if_numeric_or_historic_slug, only: [:show]
     before_action :fetch_cp_assessment, only: [:show, :cp_assessment, :emissions_chart_data]
diff --git a/app/controllers/tpi/sectors_controller.rb b/app/controllers/tpi/sectors_controller.rb
index 2e6cd22c5..e27d3cd6d 100644
--- a/app/controllers/tpi/sectors_controller.rb
+++ b/app/controllers/tpi/sectors_controller.rb
@@ -2,6 +2,7 @@ module TPI
   class SectorsController < TPIController
     include UserDownload
 
+    before_action :enable_beta_mq_assessments
     before_action :fetch_companies, only: [:show, :index]
     before_action :fetch_sectors, only: [:show, :index, :user_download_all]
     before_action :fetch_sector, only: [:show, :user_download]
diff --git a/app/controllers/tpi/tpi_controller.rb b/app/controllers/tpi/tpi_controller.rb
index c0893c6ec..d4add55b1 100644
--- a/app/controllers/tpi/tpi_controller.rb
+++ b/app/controllers/tpi/tpi_controller.rb
@@ -6,6 +6,10 @@ class TPIController < ApplicationController
 
     protected
 
+    def enable_beta_mq_assessments
+      session[:enable_beta_mq_assessments] = true unless session.key?(:enable_beta_mq_assessments)
+    end
+
     def fixed_navbar(admin_panel_section_title, admin_panel_link)
       @admin_panel_section_title = admin_panel_section_title
       @link = admin_panel_link
diff --git a/app/javascript/components/tpi/charts/mq-level/options.js b/app/javascript/components/tpi/charts/mq-level/options.js
index a76a505dd..ea28b5fb6 100644
--- a/app/javascript/components/tpi/charts/mq-level/options.js
+++ b/app/javascript/components/tpi/charts/mq-level/options.js
@@ -58,10 +58,7 @@ export function getOptions({ chartData }) {
           fontSize: '12px'
         },
         useHTML: true,
-        stagger: 0,
-        formatter() {
-          return this.value === 5 ? '5 [BETA]' : this.value;
-        }
+        stagger: 0
       },
       title: {
         text: 'Level',
diff --git a/app/models/mq/assessment.rb b/app/models/mq/assessment.rb
index 2e3b46082..291ddd2aa 100644
--- a/app/models/mq/assessment.rb
+++ b/app/models/mq/assessment.rb
@@ -22,7 +22,7 @@ class Assessment < ApplicationRecord
 
     LEVELS = %w[0 1 2 3 4 4STAR 5 5STAR].freeze
     BETA_METHODOLOGIES = { # taken into account only when beta is enabled
-      5 => {levels: %w[5], highlight_questions: %w[18]}
+      5 => {levels: %w[5], highlight_questions: %w[]}
     }.freeze
     BETA_LEVELS = BETA_METHODOLOGIES.map { |_k, v| v[:levels] }.flatten.freeze
 
diff --git a/app/views/tpi/companies/_mq_assessment.html.erb b/app/views/tpi/companies/_mq_assessment.html.erb
index 11ef814f4..b0855b95a 100644
--- a/app/views/tpi/companies/_mq_assessment.html.erb
+++ b/app/views/tpi/companies/_mq_assessment.html.erb
@@ -31,7 +31,7 @@
   <% assessment.questions_by_level.each do |level, questions| %>
     <div class="mq-assessment-level level<%= level %>">
       <p class="mq-assessment-level__header">
-        Level <%= level.in?(assessment.beta_levels) ? "#{level} [BETA]" : level %>: <%= t("tpi.company.level_description.#{level}") %>
+        Level <%= "#{level}: #{t("tpi.company.level_description.#{level}")}" %>
       </p>
 
       <div class="mq-assessment-answers">
diff --git a/app/views/tpi/companies/show.html.erb b/app/views/tpi/companies/show.html.erb
index 88b4e7a9b..230f83ef8 100644
--- a/app/views/tpi/companies/show.html.erb
+++ b/app/views/tpi/companies/show.html.erb
@@ -1,11 +1,6 @@
 <% content_for :page_title, "#{@company.name} - Transition Pathway Initiative" %>
 <% content_for :page_description, "Assess how prepared #{@company.name} is for the transition to a low-carbon economy – its Management Quality and Carbon Performance." %>
 
-<%= react_component('MqBetaModal', {
-  enabled: session[:enable_beta_mq_assessments],
-  page: "companies"
-}) %>
-
 <% regional_view = @company.cp_alignment_region.present? && params[:view] == 'regional' %>
 
 <div class="company-page" data-controller="companies">
diff --git a/app/views/tpi/sectors/index.html.erb b/app/views/tpi/sectors/index.html.erb
index 1fb91630f..c3e9eb330 100644
--- a/app/views/tpi/sectors/index.html.erb
+++ b/app/views/tpi/sectors/index.html.erb
@@ -1,11 +1,6 @@
 <% content_for :page_title, "Tool - Transition Pathway Initiative" %>
 <% content_for :page_description, "The TPI tool is a corporate climate action benchmark which assesses how prepared companies are for the transition to a low-carbon economy." %>
 
-<%= react_component('MqBetaModal', {
-  enabled: session[:enable_beta_mq_assessments],
-  page: "company"
-}) %>
-
 <div class="sectors-index-page">
   <div class="dropdown-selector-sector-page-wrapper">
     <%= react_component("DropdownSelector", {
diff --git a/app/views/tpi/sectors/show.html.erb b/app/views/tpi/sectors/show.html.erb
index 89ea493e3..d3372dfc6 100644
--- a/app/views/tpi/sectors/show.html.erb
+++ b/app/views/tpi/sectors/show.html.erb
@@ -1,11 +1,6 @@
 <% content_for :page_title, "#{@sector.name} - Transition Pathway Initiative" %>
 <% content_for :page_description, "Description: Compare and assess how prepared the world’s top companies in the #{@sector.name} sector are for the transition to a low-carbon economy." %>
 
-<%= react_component('MqBetaModal', {
-  enabled: session[:enable_beta_mq_assessments],
-  page: "sector"
-}) %>
-
 <div class="sector-page">
   <div class="dropdown-selector-sector-page-wrapper">
     <%= react_component("DropdownSelector", {
diff --git a/spec/controllers/tpi/sectors_controller_spec.rb b/spec/controllers/tpi/sectors_controller_spec.rb
index ea660ed38..462c81aa3 100644
--- a/spec/controllers/tpi/sectors_controller_spec.rb
+++ b/spec/controllers/tpi/sectors_controller_spec.rb
@@ -155,9 +155,9 @@
         expect(entries_names).to include("CP_Assessments_#{timestamp}.csv")
         expect(entries_names).to include("CP_Assessments_Regional_#{timestamp}.csv")
         expect(entries_names).to include('Company_Latest_Assessments.csv')
-        expect(entries_names).to include('Company_Latest_Assessments_BETA_5.0.csv')
+        expect(entries_names).to include('Company_Latest_Assessments_5.0.csv')
         expect(entries_names).to include("MQ_Assessments_Methodology_1_#{timestamp}.csv")
-        expect(entries_names).to include("MQ_Assessments_Methodology_5_BETA_#{timestamp}.csv")
+        expect(entries_names).to include("MQ_Assessments_Methodology_5_#{timestamp}.csv")
         expect(entries_names).to include('User guide TPI files.xlsx')
 
         expect(entries_csv_json["Sector_Benchmarks_#{timestamp}.csv"])
@@ -168,11 +168,11 @@
           .to match_snapshot('tpi_single_sector_user_download_cp_assessments_regional_csv')
         expect(entries_csv_json['Company_Latest_Assessments.csv'])
           .to match_snapshot('tpi_single_sector_user_company_latest_assessments_csv')
-        expect(entries_csv_json['Company_Latest_Assessments_BETA_5.0.csv'])
+        expect(entries_csv_json['Company_Latest_Assessments_5.0.csv'])
           .to match_snapshot('tpi_single_sector_user_company_latest_assessments_beta_5.0_csv')
         expect(entries_csv_json["MQ_Assessments_Methodology_1_#{timestamp}.csv"])
           .to match_snapshot('tpi_single_sector_user_mq_assessments_methodology_1_csv')
-        expect(entries_csv_json["MQ_Assessments_Methodology_5_BETA_#{timestamp}.csv"])
+        expect(entries_csv_json["MQ_Assessments_Methodology_5_#{timestamp}.csv"])
           .to match_snapshot('tpi_single_sector_user_mq_assessments_methodology_5_beta_csv')
       end
     end
@@ -207,9 +207,9 @@
         expect(entries_names).to include("Sector_Benchmarks_#{timestamp}.csv")
         expect(entries_names).to include("CP_Assessments_#{timestamp}.csv")
         expect(entries_names).to include('Company_Latest_Assessments.csv')
-        expect(entries_names).to include('Company_Latest_Assessments_BETA_5.0.csv')
+        expect(entries_names).to include('Company_Latest_Assessments_5.0.csv')
         expect(entries_names).to include("MQ_Assessments_Methodology_1_#{timestamp}.csv")
-        expect(entries_names).to include("MQ_Assessments_Methodology_5_BETA_#{timestamp}.csv")
+        expect(entries_names).to include("MQ_Assessments_Methodology_5_#{timestamp}.csv")
         expect(entries_names).to include('User guide TPI files.xlsx')
 
         expect(entries_csv_json["Sector_Benchmarks_#{timestamp}.csv"])
@@ -218,11 +218,11 @@
           .to match_snapshot('tpi_all_sectors_user_download_cp_assessments_csv')
         expect(entries_csv_json['Company_Latest_Assessments.csv'])
           .to match_snapshot('tpi_all_sectors_user_company_latest_assessments_csv')
-        expect(entries_csv_json['Company_Latest_Assessments_BETA_5.0.csv'])
+        expect(entries_csv_json['Company_Latest_Assessments_5.0.csv'])
           .to match_snapshot('tpi_all_sectors_user_company_latest_assessments_beta_5.0_csv')
         expect(entries_csv_json["MQ_Assessments_Methodology_1_#{timestamp}.csv"])
           .to match_snapshot('tpi_all_sectors_user_mq_assessments_methodology_1_csv')
-        expect(entries_csv_json["MQ_Assessments_Methodology_5_BETA_#{timestamp}.csv"])
+        expect(entries_csv_json["MQ_Assessments_Methodology_5_#{timestamp}.csv"])
           .to match_snapshot('tpi_all_sectors_user_mq_assessments_methodology_5_beta_csv')
       end
     end
diff --git a/spec/support/capybara_helpers.rb b/spec/support/capybara_helpers.rb
index 2489ca44c..97d7e6a30 100644
--- a/spec/support/capybara_helpers.rb
+++ b/spec/support/capybara_helpers.rb
@@ -30,16 +30,13 @@ def within_ascor_pillar(header_text)
     end
   end
 
-  def with_mq_beta_scores
+  def with_older_mq_scores
     within '.mq-beta-scores' do
-      click_on 'Current V5.0'
-    end
-    within '.modal-content' do
-      click_on 'Proceed'
+      click_on 'V4.0'
     end
     yield
     within '.mq-beta-scores' do
-      click_on 'V4.0'
+      click_on 'Current V5.0'
     end
   end
 
diff --git a/spec/system/public/tpi/company_spec.rb b/spec/system/public/tpi/company_spec.rb
index 66e783c9c..ec8b53575 100644
--- a/spec/system/public/tpi/company_spec.rb
+++ b/spec/system/public/tpi/company_spec.rb
@@ -9,13 +9,13 @@
     expect(page).to have_text('Japan Airlines')
   end
 
-  it 'does not show BETA scores by default' do
-    expect(page).not_to have_text('Level 5')
+  it 'show BETA scores by default' do
+    expect(page).to have_text('Level 5')
   end
 
-  it 'allows to show BETA scores' do
-    with_mq_beta_scores do
-      expect(page).to have_text('Level 5')
+  it 'allow to see older methodology' do
+    with_older_mq_scores do
+      expect(page).not_to have_text('Level 5')
     end
   end
 
diff --git a/spec/system/public/tpi/sectors_spec.rb b/spec/system/public/tpi/sectors_spec.rb
index d8ea6b39e..8a714baf6 100644
--- a/spec/system/public/tpi/sectors_spec.rb
+++ b/spec/system/public/tpi/sectors_spec.rb
@@ -11,26 +11,26 @@
 
       # pie chart
       within '.chart--mq-sector-pie-chart' do
-        expect(page).not_to have_text('Level 5')
+        expect(page).to have_text('Level 5')
         expect(page).to have_selector('.companies-size', text: '111')
       end
 
       # bubble chart loads
       within '.bubble-chart__container' do
-        expect(page).not_to have_text('Level 5')
+        expect(page).to have_text('Level 5')
         expect(page).to have_text('Autos')
         expect(page).to have_text('Airlines')
       end
     end
 
-    it 'loads also beta scores' do
-      with_mq_beta_scores do
+    it 'load old mq scores' do
+      with_older_mq_scores do
         within '.chart--mq-sector-pie-chart' do
-          expect(page).to have_text('Level 5')
+          expect(page).not_to have_text('Level 5')
         end
 
         within '.bubble-chart__container' do
-          expect(page).to have_text('Level 5')
+          expect(page).not_to have_text('Level 5')
         end
       end
     end
@@ -49,15 +49,15 @@
         expect(page).to have_text('Level 2 ? 0 companies', normalize_ws: true) # Level 2 0 companies
         expect(page).to have_text('Level 3 ? 2 companies', normalize_ws: true) # Level 3 2 companies
         expect(page).to have_text('Level 4 ? 1 company', normalize_ws: true) # Level 4 1 company
-        expect(page).not_to have_text('Level 5') # BETA level that is disabled by default
+        expect(page).to have_text('Level 5')
         expect(page).to have_selector('.companies-size', text: '5')
       end
     end
 
-    it 'loads also beta scores' do
-      with_mq_beta_scores do
+    it 'switch to older level scores' do
+      with_older_mq_scores do
         within '.chart--mq-sector-pie-chart' do
-          expect(page).to have_text('Level 5')
+          expect(page).not_to have_text('Level 5')
         end
       end
     end

From 877968f02c00f3c538be0a44eb97a5a0c90ef42f Mon Sep 17 00:00:00 2001
From: martintomas <martintomas.it@gmail.com>
Date: Wed, 23 Oct 2024 14:01:30 +0200
Subject: [PATCH 2/5] refactoring: Splitting MQ download option

---
 .../stylesheets/tpi/_mq_beta_scores.scss      |  5 +-
 app/controllers/concerns/tpi/user_download.rb |  4 +-
 app/controllers/tpi/sectors_controller.rb     |  7 +++
 app/views/tpi/companies/show.html.erb         | 29 ++--------
 app/views/tpi/sectors/index.html.erb          | 58 ++-----------------
 app/views/tpi/sectors/show.html.erb           | 37 ++----------
 config/routes.rb                              |  1 +
 .../tpi/sectors_controller_spec.rb            | 31 +++++++++-
 8 files changed, 58 insertions(+), 114 deletions(-)

diff --git a/app/assets/stylesheets/tpi/_mq_beta_scores.scss b/app/assets/stylesheets/tpi/_mq_beta_scores.scss
index d7078a942..b550309c9 100644
--- a/app/assets/stylesheets/tpi/_mq_beta_scores.scss
+++ b/app/assets/stylesheets/tpi/_mq_beta_scores.scss
@@ -64,6 +64,9 @@
   &__download-button {
     flex-grow: 4;
     text-align: right;
+    display: flex;
+    gap: 5px;
+    justify-content: end;
 
     .button {
       background-color: $blue;
@@ -73,4 +76,4 @@
       margin-bottom: 10px;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/controllers/concerns/tpi/user_download.rb b/app/controllers/concerns/tpi/user_download.rb
index 8fb908145..61cd878de 100644
--- a/app/controllers/concerns/tpi/user_download.rb
+++ b/app/controllers/concerns/tpi/user_download.rb
@@ -26,14 +26,12 @@ def send_tpi_user_file(mq_assessments:, cp_assessments:, filename:)
       cp_assessments_csv = CSVExport::User::CompanyCPAssessments.new(cp_assessments).call
       cp_assessments_regional_csv = CSVExport::User::CompanyCPAssessmentsRegional.new(cp_assessments).call
       sector_benchmarks_csv = CSVExport::User::CPBenchmarks.new(cp_benchmarks).call
-      user_guide = File.binread(Rails.root.join('public', 'tpi', 'export_support', 'User guide TPI files.xlsx'))
 
       files = (mq_assessments_files || {}).merge(
         'Company_Latest_Assessments.csv' => latest_cp_assessments_csv,
         "CP_Assessments_#{timestamp}.csv" => cp_assessments_csv,
         "CP_Assessments_Regional_#{timestamp}.csv" => cp_assessments_regional_csv,
-        "Sector_Benchmarks_#{timestamp}.csv" => sector_benchmarks_csv,
-        'User guide TPI files.xlsx' => user_guide
+        "Sector_Benchmarks_#{timestamp}.csv" => sector_benchmarks_csv
       )
       if ENV['MQ_BETA_ENABLED'].to_s == 'true'
         files = files.merge 'Company_Latest_Assessments_5.0.csv' => latest_cp_assessments_beta_csv
diff --git a/app/controllers/tpi/sectors_controller.rb b/app/controllers/tpi/sectors_controller.rb
index e27d3cd6d..b3d4eb544 100644
--- a/app/controllers/tpi/sectors_controller.rb
+++ b/app/controllers/tpi/sectors_controller.rb
@@ -92,6 +92,13 @@ def user_download
       )
     end
 
+    def user_download_methodology
+      user_guide = File.binread(Rails.root.join('public', 'tpi', 'export_support', 'User guide TPI files.xlsx'))
+      render zip: {
+        'User guide TPI files.xlsx' => user_guide
+      }, filename: "TPI Methodology - #{Time.now.strftime('%d%m%Y')}"
+    end
+
     private
 
     def any_cp_assessment?
diff --git a/app/views/tpi/companies/show.html.erb b/app/views/tpi/companies/show.html.erb
index 230f83ef8..af7c13109 100644
--- a/app/views/tpi/companies/show.html.erb
+++ b/app/views/tpi/companies/show.html.erb
@@ -11,22 +11,14 @@
     <div class="container is-hidden-touch">
       <div class="mq-beta-scores">
         <%= render 'tpi/shared/mq_beta_scores', has_data: @company.beta_mq_assessments? %>
-        <div>
-          <a href="#management-quality" class="link with-icon is-pulled-left">
-            <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" />
-            Go to Management Quality
-          </a>
-          <% if @company_presenter.cp_assessments.any? %>
-            <a href="#carbon-performance" class="link with-icon is-pulled-left">
-              <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" />
-              Go to Carbon Performance
-            </a>
-          <% end %>
-        </div>
         <div class="mq-beta-scores__download-button">
+          <%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
+            <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
+            Download Methodology
+          <% end %>
           <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
             <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
-            Download data
+            Download CP & MQ Data
           <% end %>
         </div>
       </div>
@@ -34,16 +26,6 @@
     <div class="container is-hidden-desktop">
       <div class="mq-beta-scores is-hidden-desktop">
         <%= render 'tpi/shared/mq_beta_scores', has_data: @company.beta_mq_assessments? %>
-        <div>
-          <a href="#management-quality" class="link with-icon is-pulled-left">
-            Management Quality
-          </a>
-          <% if @company_presenter.cp_assessments.any? %>
-            <a href="#carbon-performance" class="link with-icon is-pulled-left">
-              Carbon Performance
-            </a>
-          <% end %>
-        </div>
       </div>
     </div>
   </div>
@@ -237,6 +219,7 @@
       </div>
     </section>
   <% end %>
+
   <% if @company.latest_information.present? %>
     <%= react_component("LatestInformation", { name: @company.name, latestInformation: @company.latest_information }) %>
   <% end %>
diff --git a/app/views/tpi/sectors/index.html.erb b/app/views/tpi/sectors/index.html.erb
index c3e9eb330..0d07715c9 100644
--- a/app/views/tpi/sectors/index.html.erb
+++ b/app/views/tpi/sectors/index.html.erb
@@ -14,30 +14,14 @@
     <div class="container">
       <div class="mq-beta-scores">
         <%= render 'tpi/shared/mq_beta_scores', has_data: true %>
-        <div>
-          <a href="#management-quality" class="link with-icon">
-            <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" class="is-hidden-touch" />
-            Management Quality
-          </a>
-          <a href="#carbon-performance" class="link with-icon">
-            <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" class="is-hidden-touch" />
-            Carbon Performance
-          </a>
-          <% if @methodology_publication.present? %>
-            <a href="#methodology" class="link with-icon">
-              <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" class="is-hidden-touch" />
-              Methodology
-            </a>
-          <% end %>
-          <a href="#publications" class="link with-icon">
-            <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" class="is-hidden-touch" />
-            Publications
-          </a>
-        </div>
         <div class="mq-beta-scores__download-button">
+          <%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
+            <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
+            Download Methodology
+          <% end %>
           <%= link_to user_download_all_tpi_sectors_path, class: 'button is-primary with-icon with-border' do %>
             <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
-            Download data
+            Download CP & MQ Data
           <% end %>
         </div>
       </div>
@@ -75,36 +59,4 @@
       sectors: TPI::CPPerformanceSectorDecorator.decorate_collection(@sectors).map(&:to_h)
     }) %>
   </section>
-
-  <% if @methodology_publication.present? %>
-    <section id="methodology" class="container">
-      <div class="columns">
-        <div class="column pages__content">
-          <h4>Methodology</h4>
-
-          <div>
-            <%= @methodology_description&.text&.html_safe %>
-          </div>
-        </div>
-        <div class="column">
-          <%= render 'tpi/publications/list', publications_and_articles: [@methodology_publication] %>
-        </div>
-      </div>
-    </section>
-  <% end %>
-
-  <hr/>
-
-  <section id="publications" class="container tpi-sector__promoted-publications">
-    <div class="promoted-publications__title">
-      <div class="promoted-publications__title-text">Publications and news</div>
-
-      <%= link_to 'View all publications and news', tpi_publications_path, class: 'button is-secondary is-hidden-touch' %>
-    </div>
-
-    <%= render "tpi/publications/promoted", publications_and_articles: @publications_and_articles, count: @publications_and_articles.count %>
-    <div class="view-all-btn__container">
-      <a href="/publications" class="button is-secondary is-hidden-desktop">View all news</a>
-    </div>
-  </section>
 </div>
diff --git a/app/views/tpi/sectors/show.html.erb b/app/views/tpi/sectors/show.html.erb
index d3372dfc6..88e2140e7 100644
--- a/app/views/tpi/sectors/show.html.erb
+++ b/app/views/tpi/sectors/show.html.erb
@@ -14,22 +14,14 @@
     <div class="container is-hidden-touch">
       <div class="mq-beta-scores">
         <%= render 'tpi/shared/mq_beta_scores', has_data: true %>
-        <div>
-          <a href="#management-quality" class="link with-icon is-pulled-left">
-            <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" />
-            Go to Management Quality
-          </a>
-          <% if any_cp_assessment? %>
-            <a href="#carbon-performance" class="link with-icon is-pulled-left">
-              <img src="<%= asset_path 'icons/arrow-down.svg'%>" alt="arrow down" />
-              Go to Carbon Performance
-            </a>
-          <% end %>
-        </div>
         <div class="mq-beta-scores__download-button">
+          <%= link_to user_download_methodology_tpi_sectors_path, class: 'button is-primary is-pulled-right with-icon with-border' do %>
+            <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
+            Download Methodology
+          <% end %>
           <%= link_to user_download_tpi_sector_path(@sector), class: 'button is-primary is-pulled-right with-icon with-border' do %>
             <img src="<%= asset_path 'icons/download.svg'%>" alt="download icon" />
-            Download data
+            Download CP & MQ Data
           <% end %>
         </div>
       </div>
@@ -85,23 +77,4 @@
         }) %>
     </section>
   <% end %>
-
-  <% if @publications_and_articles.present? %>
-    <hr>
-
-    <section class="section tpi-sector__promoted-publications">
-      <div class="container">
-        <div class="promoted-publications__title">
-          <div class="promoted-publications__title-text">Publications and news</div>
-
-          <%= link_to 'View all publications and news', tpi_publications_path, class: 'button is-secondary is-hidden-touch' %>
-        </div>
-
-        <%= render "tpi/publications/promoted", publications_and_articles: @publications_and_articles, count: @publications_and_articles.count %>
-        <div class="view-all-btn__container">
-          <a href="/publications" class="button is-secondary is-hidden-desktop">View all news</a>
-        </div>
-      </div>
-    </section>
-  <% end %>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 856d9837b..677a8d07c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -23,6 +23,7 @@
           get :levels_chart_data
           get :cp_performance_chart_data
           get :user_download_all
+          get :user_download_methodology
         end
         member do
           get :levels_chart_data
diff --git a/spec/controllers/tpi/sectors_controller_spec.rb b/spec/controllers/tpi/sectors_controller_spec.rb
index 462c81aa3..15aae7aa4 100644
--- a/spec/controllers/tpi/sectors_controller_spec.rb
+++ b/spec/controllers/tpi/sectors_controller_spec.rb
@@ -158,7 +158,6 @@
         expect(entries_names).to include('Company_Latest_Assessments_5.0.csv')
         expect(entries_names).to include("MQ_Assessments_Methodology_1_#{timestamp}.csv")
         expect(entries_names).to include("MQ_Assessments_Methodology_5_#{timestamp}.csv")
-        expect(entries_names).to include('User guide TPI files.xlsx')
 
         expect(entries_csv_json["Sector_Benchmarks_#{timestamp}.csv"])
           .to match_snapshot('tpi_single_sector_user_download_zip_sector_benchmarks_csv')
@@ -210,7 +209,6 @@
         expect(entries_names).to include('Company_Latest_Assessments_5.0.csv')
         expect(entries_names).to include("MQ_Assessments_Methodology_1_#{timestamp}.csv")
         expect(entries_names).to include("MQ_Assessments_Methodology_5_#{timestamp}.csv")
-        expect(entries_names).to include('User guide TPI files.xlsx')
 
         expect(entries_csv_json["Sector_Benchmarks_#{timestamp}.csv"])
           .to match_snapshot('tpi_all_sectors_user_download_zip_sector_benchmarks_csv')
@@ -227,4 +225,33 @@
       end
     end
   end
+
+  describe 'GET user download methodology' do
+    subject { get :user_download_methodology }
+
+    it { is_expected.to be_successful }
+
+    it 'returns zip file' do
+      subject
+      expect(response.content_type).to eq('application/zip')
+    end
+
+    describe 'zip file' do
+      it 'has proper content' do
+        subject
+
+        entries_names = []
+        entries_csv_json = {}
+        zip_io = StringIO.new(response.body)
+        Zip::File.open_buffer(zip_io) do |zipfile|
+          zipfile.each do |entry|
+            entries_names << entry.name
+            entries_csv_json[entry.name] = parse_csv_to_json(entry.get_input_stream.read) if entry.name.ends_with?('.csv')
+          end
+        end
+
+        expect(entries_names).to include('User guide TPI files.xlsx')
+      end
+    end
+  end
 end

From 6da7a8d00504e386b99abd66553094c61fa68e5a Mon Sep 17 00:00:00 2001
From: martintomas <martintomas.it@gmail.com>
Date: Wed, 23 Oct 2024 17:07:01 +0200
Subject: [PATCH 3/5] feat: Adding default mailer endpoint

---
 .env.sample                                   |  5 +++
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  7 ++++
 app/controllers/tpi/sectors_controller.rb     |  9 +++++
 app/mailers/application_mailer.rb             |  2 +-
 app/mailers/data_download_mailer.rb           |  6 ++++
 .../send_download_file_info_email.html.erb    | 15 +++++++++
 config/environments/development.rb            |  4 +--
 config/environments/production.rb             |  8 ++---
 config/environments/staging.rb                |  8 ++---
 config/initializers/mailjet.rb                |  6 ++++
 config/routes.rb                              |  1 +
 .../tpi/sectors_controller_spec.rb            | 24 ++++++++++++++
 spec/mailers/data_download_mailer_spec.rb     | 33 +++++++++++++++++++
 14 files changed, 115 insertions(+), 14 deletions(-)
 create mode 100644 app/mailers/data_download_mailer.rb
 create mode 100644 app/views/data_download_mailer/send_download_file_info_email.html.erb
 create mode 100644 config/initializers/mailjet.rb
 create mode 100644 spec/mailers/data_download_mailer_spec.rb

diff --git a/.env.sample b/.env.sample
index 9df289ce7..75211a527 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,3 +1,8 @@
 GCS_CREDENTIALS_FILE=
 GCS_BUCKET=
 MQ_BETA_ENABLED=true
+
+# SMTP API
+SMTP_API_KEY=
+SMTP_API_SECRET=
+SMTP_DEFAULT_FROM=
diff --git a/Gemfile b/Gemfile
index 9c0436d25..22c6bc915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ gem 'react-rails'
 gem 'appsignal'
 gem 'roo'
 gem 'caxlsx'
+gem 'mailjet'
 
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index bd1c07330..397d68a14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -291,6 +291,11 @@ GEM
       net-imap
       net-pop
       net-smtp
+    mailjet (1.8.0)
+      activesupport (>= 5.0.0)
+      faraday (~> 2.1)
+      rack (>= 1.4.0)
+      yajl-ruby
     marcel (1.0.4)
     matrix (0.4.2)
     memoist (0.16.2)
@@ -547,6 +552,7 @@ GEM
       rails (>= 3.2.16)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yajl-ruby (1.4.3)
     zeitwerk (2.6.18)
 
 PLATFORMS
@@ -589,6 +595,7 @@ DEPENDENCIES
   image_processing
   language_list
   listen (>= 3.0.5, < 3.2)
+  mailjet
   pg (>= 0.18, < 2.0)
   pg_search (= 2.3.2)
   pry
diff --git a/app/controllers/tpi/sectors_controller.rb b/app/controllers/tpi/sectors_controller.rb
index b3d4eb544..086105b29 100644
--- a/app/controllers/tpi/sectors_controller.rb
+++ b/app/controllers/tpi/sectors_controller.rb
@@ -78,6 +78,11 @@ def cp_performance_chart_data
       render json: data.chart_json
     end
 
+    def send_download_file_info_email
+      DataDownloadMailer.send_download_file_info_email(permitted_email_params).deliver_now
+      head :ok
+    end
+
     def user_download_all
       send_user_download_file(
         Company.published.select(:id).where(sector_id: @sectors.pluck(:id)),
@@ -163,5 +168,9 @@ def companies_scope(params)
         Company.published.active
       end
     end
+
+    def permitted_email_params
+      params.permit(:email, :job_title, :forename, :surname, :location, :organisation, purposes: [])
+    end
   end
 end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 286b2239d..131c38e5a 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
+  default from: ENV['SMTP_DEFAULT_FROM']
   layout 'mailer'
 end
diff --git a/app/mailers/data_download_mailer.rb b/app/mailers/data_download_mailer.rb
new file mode 100644
index 000000000..4b41fe7ba
--- /dev/null
+++ b/app/mailers/data_download_mailer.rb
@@ -0,0 +1,6 @@
+class DataDownloadMailer < ApplicationMailer
+  def send_download_file_info_email(data)
+    @data = data
+    mail(to: 'martintomas.it@gmail.com', subject: 'TPI data has been downloaded')
+  end
+end
diff --git a/app/views/data_download_mailer/send_download_file_info_email.html.erb b/app/views/data_download_mailer/send_download_file_info_email.html.erb
new file mode 100644
index 000000000..a555a850d
--- /dev/null
+++ b/app/views/data_download_mailer/send_download_file_info_email.html.erb
@@ -0,0 +1,15 @@
+<h1>Following user downloaded data from TPI website</h1>
+
+<p><strong>Email:</strong> <%= @data[:email] %></p>
+<p><strong>Job Title:</strong> <%= @data[:job_title] %></p>
+<p><strong>Forename:</strong> <%= @data[:forename] %></p>
+<p><strong>Surname:</strong> <%= @data[:surname] %></p>
+<p><strong>Location:</strong> <%= @data[:location] %></p>
+<p><strong>Organisation:</strong> <%= @data[:organisation] %></p>
+
+<h2>Purposes</h2>
+<ul>
+  <% Array.wrap(@data[:purposes]).each do |purpose| %>
+    <li><%= purpose %></li>
+  <% end %>
+</ul>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 444e6b0a1..fff936694 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -33,10 +33,8 @@
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local
 
-  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
-
-  config.action_mailer.perform_caching = false
+  config.action_mailer.perform_deliveries = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 99067f050..0cbeb7711 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -62,11 +62,9 @@
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "laws_and_pathways_production"
 
-  config.action_mailer.perform_caching = false
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.delivery_method = :mailjet
+  config.action_mailer.perform_deliveries = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 3a1b12b98..040f46b11 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -65,11 +65,9 @@
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "laws_and_pathways_#{Rails.env}"
 
-  config.action_mailer.perform_caching = false
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.delivery_method = :mailjet
+  config.action_mailer.perform_deliveries = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/config/initializers/mailjet.rb b/config/initializers/mailjet.rb
new file mode 100644
index 000000000..55c247c7c
--- /dev/null
+++ b/config/initializers/mailjet.rb
@@ -0,0 +1,6 @@
+# kindly generated by appropriated Rails generator
+Mailjet.configure do |config|
+  config.api_key = ENV['SMTP_API_KEY']
+  config.secret_key = ENV['SMTP_API_SECRET']
+  config.default_from = ENV['SMTP_DEFAULT_FROM']
+end
diff --git a/config/routes.rb b/config/routes.rb
index 677a8d07c..ab6986f29 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,6 +24,7 @@
           get :cp_performance_chart_data
           get :user_download_all
           get :user_download_methodology
+          post :send_download_file_info_email
         end
         member do
           get :levels_chart_data
diff --git a/spec/controllers/tpi/sectors_controller_spec.rb b/spec/controllers/tpi/sectors_controller_spec.rb
index 15aae7aa4..ffbce90de 100644
--- a/spec/controllers/tpi/sectors_controller_spec.rb
+++ b/spec/controllers/tpi/sectors_controller_spec.rb
@@ -254,4 +254,28 @@
       end
     end
   end
+
+  describe 'POST send_download_file_info_email' do
+    subject { post :send_download_file_info_email, params: data }
+    let(:data) do
+      {
+        email: 'test@test.test',
+        job_title: 'job_title',
+        forename: 'forename',
+        surname: 'surname',
+        location: 'location',
+        organisation: 'organisation',
+        purposes: %w[purposes1 purposes2]
+      }
+    end
+
+    it 'returns ok status' do
+      subject
+      expect(response).to have_http_status(:ok)
+    end
+
+    it 'sends email' do
+      expect { subject }.to change { ActionMailer::Base.deliveries.count }.by(1)
+    end
+  end
 end
diff --git a/spec/mailers/data_download_mailer_spec.rb b/spec/mailers/data_download_mailer_spec.rb
new file mode 100644
index 000000000..882386cd9
--- /dev/null
+++ b/spec/mailers/data_download_mailer_spec.rb
@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+RSpec.describe DataDownloadMailer, type: :mailer do
+  describe 'send_download_file_info_email' do
+    let(:data) {
+      {
+        email: 'test@test.test',
+        job_title: 'job_title',
+        forename: 'forename',
+        surname: 'surname',
+        location: 'location',
+        organisation: 'organisation',
+        purposes: ['purpose1', 'purpose2']
+      }
+    }
+    let(:mail) { DataDownloadMailer.send_download_file_info_email data }
+
+    it 'renders the headers' do
+      expect(mail.subject).to eq('TPI data has been downloaded')
+      expect(mail.to).to eq(['martintomas.it@gmail.com'])
+      expect(mail.from).to eq([ENV['SMTP_DEFAULT_FROM']].reject(&:blank?))
+
+      expect(mail.body.encoded).to include('test@test.test')
+      expect(mail.body.encoded).to include('job_title')
+      expect(mail.body.encoded).to include('forename')
+      expect(mail.body.encoded).to include('surname')
+      expect(mail.body.encoded).to include('location')
+      expect(mail.body.encoded).to include('organisation')
+      expect(mail.body.encoded).to include('purpose1')
+      expect(mail.body.encoded).to include('purpose2')
+    end
+  end
+end

From ac99c6f9f1cbd5a44ff7ce9cb31b50eef6fbdfb0 Mon Sep 17 00:00:00 2001
From: martintomas <martintomas.it@gmail.com>
Date: Wed, 23 Oct 2024 17:25:56 +0200
Subject: [PATCH 4/5] fix: rubocop offenses

---
 app/mailers/application_mailer.rb         | 2 +-
 config/initializers/mailjet.rb            | 2 +-
 spec/mailers/data_download_mailer_spec.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 131c38e5a..4ca5b1428 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV['SMTP_DEFAULT_FROM']
+  default from: ENV.fetch('SMTP_DEFAULT_FROM', 'from@example.com')
   layout 'mailer'
 end
diff --git a/config/initializers/mailjet.rb b/config/initializers/mailjet.rb
index 55c247c7c..01c67dbd0 100644
--- a/config/initializers/mailjet.rb
+++ b/config/initializers/mailjet.rb
@@ -2,5 +2,5 @@
 Mailjet.configure do |config|
   config.api_key = ENV['SMTP_API_KEY']
   config.secret_key = ENV['SMTP_API_SECRET']
-  config.default_from = ENV['SMTP_DEFAULT_FROM']
+  config.default_from = ENV.fetch('SMTP_DEFAULT_FROM', 'from@example.com')
 end
diff --git a/spec/mailers/data_download_mailer_spec.rb b/spec/mailers/data_download_mailer_spec.rb
index 882386cd9..187c881f8 100644
--- a/spec/mailers/data_download_mailer_spec.rb
+++ b/spec/mailers/data_download_mailer_spec.rb
@@ -10,7 +10,7 @@
         surname: 'surname',
         location: 'location',
         organisation: 'organisation',
-        purposes: ['purpose1', 'purpose2']
+        purposes: %w[purpose1 purpose2]
       }
     }
     let(:mail) { DataDownloadMailer.send_download_file_info_email data }
@@ -18,7 +18,7 @@
     it 'renders the headers' do
       expect(mail.subject).to eq('TPI data has been downloaded')
       expect(mail.to).to eq(['martintomas.it@gmail.com'])
-      expect(mail.from).to eq([ENV['SMTP_DEFAULT_FROM']].reject(&:blank?))
+      expect(mail.from).to eq([ENV.fetch('SMTP_DEFAULT_FROM', 'from@example.com')])
 
       expect(mail.body.encoded).to include('test@test.test')
       expect(mail.body.encoded).to include('job_title')

From b0c3ca9de827acdb74200a6f6a5e017c0b9187a0 Mon Sep 17 00:00:00 2001
From: martintomas <martintomas.it@gmail.com>
Date: Thu, 24 Oct 2024 16:10:57 +0200
Subject: [PATCH 5/5] feat: Turning on emails

---
 app/mailers/data_download_mailer.rb                           | 2 +-
 .../send_download_file_info_email.html.erb                    | 4 ++--
 config/environments/production.rb                             | 2 +-
 config/environments/staging.rb                                | 2 +-
 spec/mailers/data_download_mailer_spec.rb                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/mailers/data_download_mailer.rb b/app/mailers/data_download_mailer.rb
index 4b41fe7ba..ce03a868f 100644
--- a/app/mailers/data_download_mailer.rb
+++ b/app/mailers/data_download_mailer.rb
@@ -1,6 +1,6 @@
 class DataDownloadMailer < ApplicationMailer
   def send_download_file_info_email(data)
     @data = data
-    mail(to: 'martintomas.it@gmail.com', subject: 'TPI data has been downloaded')
+    mail(to: 'tpi@lse.ac.uk', subject: 'TPI data has been downloaded')
   end
 end
diff --git a/app/views/data_download_mailer/send_download_file_info_email.html.erb b/app/views/data_download_mailer/send_download_file_info_email.html.erb
index a555a850d..3fd2a9a18 100644
--- a/app/views/data_download_mailer/send_download_file_info_email.html.erb
+++ b/app/views/data_download_mailer/send_download_file_info_email.html.erb
@@ -1,4 +1,4 @@
-<h1>Following user downloaded data from TPI website</h1>
+<h2>Following user downloaded data from TPI website</h2>
 
 <p><strong>Email:</strong> <%= @data[:email] %></p>
 <p><strong>Job Title:</strong> <%= @data[:job_title] %></p>
@@ -7,7 +7,7 @@
 <p><strong>Location:</strong> <%= @data[:location] %></p>
 <p><strong>Organisation:</strong> <%= @data[:organisation] %></p>
 
-<h2>Purposes</h2>
+<h3>Purposes</h3>
 <ul>
   <% Array.wrap(@data[:purposes]).each do |purpose| %>
     <li><%= purpose %></li>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0cbeb7711..db8701407 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -64,7 +64,7 @@
 
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method = :mailjet
-  config.action_mailer.perform_deliveries = false
+  config.action_mailer.perform_deliveries = true
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 040f46b11..273b0b6f7 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -67,7 +67,7 @@
 
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method = :mailjet
-  config.action_mailer.perform_deliveries = false
+  config.action_mailer.perform_deliveries = true
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/spec/mailers/data_download_mailer_spec.rb b/spec/mailers/data_download_mailer_spec.rb
index 187c881f8..357f3fa74 100644
--- a/spec/mailers/data_download_mailer_spec.rb
+++ b/spec/mailers/data_download_mailer_spec.rb
@@ -17,7 +17,7 @@
 
     it 'renders the headers' do
       expect(mail.subject).to eq('TPI data has been downloaded')
-      expect(mail.to).to eq(['martintomas.it@gmail.com'])
+      expect(mail.to).to eq(['tpi@lse.ac.uk'])
       expect(mail.from).to eq([ENV.fetch('SMTP_DEFAULT_FROM', 'from@example.com')])
 
       expect(mail.body.encoded).to include('test@test.test')