Merge pull request #4374 from alphagov/redo-chart-data

Build statistics block data from new format of csv files
alphagov · Nov 6, 2024 · 22086c6 · 22086c6
2 parents b32e624 + 86e75c0
commit 22086c6
Show file tree

Hide file tree

Showing 15 changed files with 197 additions and 93 deletions.
diff --git a/app/models/landing_page/block/statistics.rb b/app/models/landing_page/block/statistics.rb
@@ -11,25 +11,16 @@ def x_axis_keys
     end
 
     def rows
-      rows = []
-
-      csv_rows.each do |row|
-        variable_name = row.values.second
-        value = row.values.last
-
-        existing_row = rows.find { |item| item[:label].include?(variable_name) }
-
-        if existing_row.present?
-          existing_row[:values] << value.to_i
-        else
-          rows << {
-            label: variable_name,
-            values: [value.to_i],
-          }
+      csv_headers[1..].map do |header|
+        values = csv_rows.map do |row|
+          row[header].to_f
         end
-      end
 
-      rows
+        {
+          label: header,
+          values:,
+        }
+      end
     end
 
     def attachment
@@ -39,16 +30,24 @@ def attachment
   private
 
     def csv_rows
-      @csv_rows ||= begin
-        rows = if attachment
-                 CSV.new(URI.parse(attachment.url).open, headers: true).map(&:to_h)
-               else
-                 # SCAFFOLDING
-                 csv_file_path = Rails.root.join("#{STATISTICS_DATA_PATH}/#{data['csv_file']}")
-                 CSV.read(csv_file_path, headers: true).map(&:to_h)
-               end
-        rows.each(&:deep_symbolize_keys!)
-      end
+      @csv_rows ||= opened_csv.map(&:to_h)
+    end
+
+    def csv_headers
+      opened_csv.headers
+    end
+
+    def opened_csv
+      @opened_csv ||= attachment ? csv_from_url : csv_from_file
+    end
+
+    def csv_from_url
+      CSV.parse(URI.parse(attachment.url).open, headers: true)
+    end
+
+    def csv_from_file
+      csv_file_path = Rails.root.join("#{STATISTICS_DATA_PATH}/#{data['csv_file']}")
+      CSV.read(csv_file_path, headers: true)
     end
   end
 end
diff --git a/lib/data/landing_page_content_items/homepage.yaml b/lib/data/landing_page_content_items/homepage.yaml
@@ -93,7 +93,7 @@ blocks:
           title: "Chart to visually represent some data"
           x_axis_label: "X Axis"
           y_axis_label: "Y Axis"
-          csv_file: "data_one.csv"
+          csv_file: "data_two.csv"
           data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
           minimal: true
   - type: card
@@ -106,7 +106,7 @@ blocks:
           title: "Chart to visually represent some data"
           x_axis_label: "X Axis"
           y_axis_label: "Y Axis"
-          csv_file: "data_one.csv"
+          csv_file: "data_three.csv"
           data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
           minimal: true
 - type: govspeak

diff --git a/lib/data/landing_page_content_items/landing_page.yaml b/lib/data/landing_page_content_items/landing_page.yaml
@@ -130,7 +130,7 @@ blocks:
     card_content:
       blocks:
         - type: statistics
-          title: "Chart to visually represent some data"
+          title: "Chart to visually represent some data with float data"
           x_axis_label: "X Axis"
           y_axis_label: "Y Axis"
           csv_file: "data_one.csv"
@@ -143,10 +143,10 @@ blocks:
     card_content:
       blocks:
         - type: statistics
-          title: "Chart to visually represent some data"
+          title: "Chart to visually represent some data with whole numbers"
           x_axis_label: "X Axis"
           y_axis_label: "Y Axis"
-          csv_file: "data_one.csv"
+          csv_file: "data_three.csv"
           data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
           minimal: true
   - type: card
@@ -156,10 +156,10 @@ blocks:
     card_content:
       blocks:
         - type: statistics
-          title: "Chart to visually represent some data"
+          title: "Chart to visually represent some data with missing data"
           x_axis_label: "X Axis"
           y_axis_label: "Y Axis"
-          csv_file: "data_one.csv"
+          csv_file: "data_three.csv"
           data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
           minimal: true
 - type: two_column_layout
@@ -193,7 +193,7 @@ blocks:
           - type: statistics
             x_axis_label: "X Axis"
             y_axis_label: "Y Axis"
-            csv_file: "data_one.csv"
+            csv_file: "data_three.csv"
             data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
             padding: true
 - type: statistics
@@ -207,7 +207,7 @@ blocks:
   title: "Chart to visually represent some more data"
   x_axis_label: "X Axis"
   y_axis_label: "Y Axis"
-  csv_file: "data_two.csv"
+  csv_file: "data_three.csv"
   data_source_link: https://www.ons.gov.uk/economy/inflationandpriceindices/timeseries/l55o/mm23
 - type: share_links
   links:

diff --git a/lib/data/landing_page_content_items/statistics/data_four.csv b/lib/data/landing_page_content_items/statistics/data_four.csv
@@ -0,0 +1,5 @@
+,Generation X,Millenials
+2020,10,15
+2021,20,25
+2023,25,30
+2024,30,35
diff --git a/lib/data/landing_page_content_items/statistics/data_one.csv b/lib/data/landing_page_content_items/statistics/data_one.csv
@@ -1,7 +1,12 @@
-Date,variable,value
-2024-01-01,variable_name,10
-2024-02-01,variable_name,11
-2024-03-01,variable_name,12
-2024-04-01,variable_name,13
-2024-05-01,variable_name,14
-2024-06-01,variable_name,15
+,Some decimal data
+1/6/2013,0.500
+1/6/2014,0.600
+1/6/2015,0.700
+1/6/2016,0.500
+1/6/2017,0.600
+1/6/2018,0.700
+1/6/2019,0.500
+1/6/2020,
+1/6/2021,
+1/6/2022,0.500
+1/6/2023,0.600
diff --git a/lib/data/landing_page_content_items/statistics/data_three.csv b/lib/data/landing_page_content_items/statistics/data_three.csv
@@ -0,0 +1,8 @@
+,The number of people representing some data point
+31/12/2022,45775
+31/3/2023,47518
+30/6/2023,50546
+30/9/2023,56042
+31/12/2023,45768
+31/3/2024,34530
+30/6/2024,29585
diff --git a/lib/data/landing_page_content_items/statistics/data_two.csv b/lib/data/landing_page_content_items/statistics/data_two.csv
@@ -1,7 +1,7 @@
-Date,variable,value
-2023-01-01,variable_name,20
-2023-02-01,variable_name,21
-2023-03-01,variable_name,22
-2023-01-01,variable_name_two,23
-2023-02-01,variable_name_two,24
-2023-03-01,variable_name_two,25
+,Percentage of people representing some data point
+1/6/2018,70%
+1/6/2019,50%
+1/6/2020,60%
+1/6/2021,64%
+1/6/2022,52%
+1/6/2023,91%
diff --git a/lib/data/landing_page_content_items/tasks.yaml b/lib/data/landing_page_content_items/tasks.yaml
@@ -88,7 +88,7 @@ blocks:
             hide_heading: true
             x_axis_label: "X Axis"
             y_axis_label: "Y Axis"
-            csv_file: "data_one.csv"
+            csv_file: "data_two.csv"
             data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
             padding: true
     - type: card
@@ -101,7 +101,7 @@ blocks:
             hide_heading: true
             x_axis_label: "X Axis"
             y_axis_label: "Y Axis"
-            csv_file: "data_one.csv"
+            csv_file: "data_three.csv"
             data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
             padding: true
     - type: card
@@ -114,7 +114,7 @@ blocks:
             hide_heading: true
             x_axis_label: "X Axis"
             y_axis_label: "Y Axis"
-            csv_file: "data_one.csv"
+            csv_file: "data_four.csv"
             data_source_link: https://www.ons.gov.uk/economy/grossdomesticproductgdp/timeseries/ihyq/qna
             padding: true
     - type: card

diff --git a/spec/factories/content_items.rb b/spec/factories/content_items.rb
@@ -28,6 +28,28 @@
               title: "Data Two",
               url: "https://www.asset.test.gov.uk/data_two.csv",
             },
+            {
+              accessible: false,
+              attachment_type: "document",
+              content_type: "text/csv",
+              file_size: 123,
+              filename: "data_three.csv",
+              id: 12_347,
+              preview_url: "https://www.asset.test.gov.uk/data_three.csv/preview",
+              title: "Data Three",
+              url: "https://www.asset.test.gov.uk/data_three.csv",
+            },
+            {
+              accessible: false,
+              attachment_type: "document",
+              content_type: "text/csv",
+              file_size: 123,
+              filename: "data_four.csv",
+              id: 12_348,
+              preview_url: "https://www.asset.test.gov.uk/data_four.csv/preview",
+              title: "Data Four",
+              url: "https://www.asset.test.gov.uk/data_four.csv",
+            },
           ],
         }
       end

diff --git a/spec/fixtures/landing_page_statistics_data/data_four.csv b/spec/fixtures/landing_page_statistics_data/data_four.csv
@@ -0,0 +1,5 @@
+,Generation X,Millenials
+2020,10,15
+2021,20,25
+2023,25,30
+2024,30,35
diff --git a/spec/fixtures/landing_page_statistics_data/data_one.csv b/spec/fixtures/landing_page_statistics_data/data_one.csv
@@ -1,7 +1,8 @@
-Date,variable,value
-2024-01-01,variable_name,10
-2024-02-01,variable_name,11
-2024-03-01,variable_name,12
-2024-04-01,variable_name,13
-2024-05-01,variable_name,14
-2024-06-01,variable_name,15
+,Percentage of people being kinder to one and other
+1/6/2013,0.500
+1/6/2014,0.600
+1/6/2015,0.700
+1/6/2016,0.500
+1/6/2017,0.600
+1/6/2018,0.700
+1/6/2019,0.550
diff --git a/spec/fixtures/landing_page_statistics_data/data_three.csv b/spec/fixtures/landing_page_statistics_data/data_three.csv
@@ -0,0 +1,8 @@
+,The number of people working smarter not harder
+31/12/2022,45775
+31/3/2023,47518
+30/6/2023,50546
+30/9/2023,56042
+31/12/2023,45768
+31/3/2024,34530
+30/6/2024,29585
diff --git a/spec/fixtures/landing_page_statistics_data/data_two.csv b/spec/fixtures/landing_page_statistics_data/data_two.csv
@@ -1,7 +1,12 @@
-Date,variable,value
-2024-01-01,variable_name,10
-2024-02-01,variable_name,11
-2024-03-01,variable_name,12
-2024-01-01,variable_name_two,13
-2024-02-01,variable_name_two,14
-2024-03-01,variable_name_two,15
+,Percentage of people being kinder to one and other
+1/6/2013,0.500
+1/6/2014,0.600
+1/6/2015,0.700
+1/6/2016,0.500
+1/6/2017,0.600
+1/6/2018,0.700
+1/6/2019,0.500
+1/6/2020,
+1/6/2021,
+1/6/2022,0.500
+1/6/2023,0.600
diff --git a/spec/models/content_item_spec.rb b/spec/models/content_item_spec.rb
@@ -77,7 +77,7 @@
 
   describe "#attachments" do
     it "loads the attachment data from the content item" do
-      expect(subject.attachments.count).to eq(2)
+      expect(subject.attachments.count).to eq(4)
       expect(subject.attachments[0].title).to eq("Data One")
     end
   end