From aa306702a346342814ec594aa23f98277360680d Mon Sep 17 00:00:00 2001
From: Benjamin ratelade <ratelade.benjamin@gmail.com>
Date: Sun, 5 Sep 2021 15:20:23 +1000
Subject: [PATCH 1/6] [Round Trip Data] A start on importing user data via CSV

Created a test for data upload.
Some changes to the html for the Stats page, to allow for better targeting in tests.
Added an ugly upload button to Home.js
Created a support class for handling CSV uploads (and downloads, later).
Also created a sample csv file, which really ought to be replaced with some Factory.
---
 app/javascript/react/pages/Home/Home.js   | 72 +++++++++++++++--------
 app/javascript/react/pages/Stats/Stats.js |  4 +-
 app/services/csv_import_export.rb         | 58 ++++++++++++++++++
 config/initializers/devise.rb             |  2 +-
 spec/features/user_uploads_own_data.rb    | 64 ++++++++++++++++++++
 spec/support/csv_sample.csv               | 11 ++++
 6 files changed, 182 insertions(+), 29 deletions(-)
 create mode 100644 app/services/csv_import_export.rb
 create mode 100644 spec/features/user_uploads_own_data.rb
 create mode 100644 spec/support/csv_sample.csv

diff --git a/app/javascript/react/pages/Home/Home.js b/app/javascript/react/pages/Home/Home.js
index c83291f..5ff4394 100644
--- a/app/javascript/react/pages/Home/Home.js
+++ b/app/javascript/react/pages/Home/Home.js
@@ -44,32 +44,52 @@ const Home = () => {
   return (
     <div>
       <h1 className="my-4">Are you sweating enough?</h1>
-      <button
-        type="button"
-        className={`btn btn-${display ? "danger" : "success"}`}
-        onClick={() => setDisplay((prev) => !prev)}
-      >
-        {display ? "hide stats" : "add stats for today"}
-      </button>
-      {display && (
-        <>
-          <div className="my-4">
-            <SingleDatePicker
-              date={date}
-              onDateChange={(newDate) => setDate(newDate)}
-              focused={focus}
-              onFocusChange={({ focused }) => setFocus(focused)}
-              id="date"
-            />
-          </div>
-          <AddStatsForm
-            date={date.toISOString()}
-            className="my-4"
-            onSubmit={submitHandler}
-            formInput={formInput}
-          />
-        </>
-      )}
+      <div className="row">
+        <div className="col-12">
+          <button
+            type="button"
+            className={`btn btn-${display ? "danger" : "success"}`}
+            onClick={() => setDisplay((prev) => !prev)}
+          >
+            {display ? "hide stats" : "add stats for today"}
+          </button>
+          {display && (
+            <>
+              <div className="my-4">
+                <SingleDatePicker
+                  date={date}
+                  onDateChange={(newDate) => setDate(newDate)}
+                  focused={focus}
+                  onFocusChange={({ focused }) => setFocus(focused)}
+                  id="date"
+                />
+              </div>
+              <AddStatsForm
+                date={date.toISOString()}
+                className="my-4"
+                onSubmit={submitHandler}
+                formInput={formInput}
+              />
+            </>
+        )}
+        </div>
+      </div>
+      <div className="row">
+        <div className="col-12">
+          <input 
+            type="file" 
+            accept=".csv"
+            name="CSV-file-upload"
+          >
+          </input>
+          <button
+            type="button"
+            className={'btn btn-info'}
+           >
+           Upload Stats
+          </button>
+        </div>
+      </div>
     </div>
   );
 };
diff --git a/app/javascript/react/pages/Stats/Stats.js b/app/javascript/react/pages/Stats/Stats.js
index b08f97f..602c377 100644
--- a/app/javascript/react/pages/Stats/Stats.js
+++ b/app/javascript/react/pages/Stats/Stats.js
@@ -19,7 +19,7 @@ const Stats = () => {
   if (error) return <p>{`Error! ${error.message}`}</p>;
 
   return (
-    <ul className="list-group">
+    <ul className="list-group daily-stats-list">
       <li className="list-group-item">
         <div className="row">
           <div className="col-md-2">
@@ -31,7 +31,7 @@ const Stats = () => {
         </div>
       </li>
       {data.dailyStats.map((stat) => (
-        <li key={stat.id} className="list-group-item">
+        <li key={stat.id} className="list-group-item daily-stats-item">
           <div className="row">
             <div className="col-md-2">{moment(stat.date).format("L")}</div>
             <div className="col-md-10">
diff --git a/app/services/csv_import_export.rb b/app/services/csv_import_export.rb
new file mode 100644
index 0000000..f2b5fcd
--- /dev/null
+++ b/app/services/csv_import_export.rb
@@ -0,0 +1,58 @@
+require 'csv'
+
+class CsvImportExport
+  attr_accessor :file_path
+
+  def initialize(file_path)
+    @file_path = file_path
+  end
+
+  def import_daily_stats(user_id)
+    daily_stats_data = {}
+    CSV.foreach(file_path, headers: true) do |row|
+      date = Date.parse(row['Date'])
+      data = {
+        row["Activity Name"] => row["Quantity"]
+      }
+      daily_stats_data[date].present? ? daily_stats_data[date].merge(data) : daily_stats_data[date] = data
+    end
+
+    daily_stats = []
+    invalid_daily_stats = []
+    daily_stats_data.each do |date, data|
+      daily_stat = DailyStat.new(date: date, data: data, user_id: user_id)
+      if daily_stat.valid? 
+        daily_stats << daily_stat
+      else
+        invalid_daily_stats << [daily_stat.date, daily_stat.data, daily_stat.errors.full_messages]
+      end
+    end
+
+    begin
+      DailyStat.transaction do
+        daily_stats.each do |daily_stat|
+          daily_stat.save
+        end
+      end
+    rescue ActiveRecord::ActiveRecordError => error
+      # TODO: what do we do with these errors? Records are valid, but something went wrong
+      puts error.to_json
+    end
+    # binding.pry
+    generate_csv(invalid_daily_stats, "Date", "Data", "Error")
+
+  end
+
+  # TODO a method to handle errors and output them in a csv
+  def generate_csv(data, *headers)
+    CSV.generate(
+      write_headers: true, 
+      headers: headers
+      ) do |csv|
+      data.each do |data|
+        csv << data
+      end
+    end
+  end
+
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index ef70648..ff00efc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -186,7 +186,7 @@
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
+  config.timeout_in = 2.weeks
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
diff --git a/spec/features/user_uploads_own_data.rb b/spec/features/user_uploads_own_data.rb
new file mode 100644
index 0000000..58beb5c
--- /dev/null
+++ b/spec/features/user_uploads_own_data.rb
@@ -0,0 +1,64 @@
+require "rails_helper"
+
+feature "User uploads his data using nice UI", js: true do
+  context "A user exists with no stats" do
+    before do
+      @user_claudia = User.create!(
+        email: "claudia.king@automio.com",
+        password: "1password",
+        confirmed_at: DateTime.now,
+      )
+    end
+
+    scenario "Claudia signs in, sees no stats in Stats" do
+      When "Claudia signs in and views her stats in pretty UI" do
+        visit root_path
+        page.find("nav a", text: "Log in").click
+        focus_on(:form).for(user_session_path).submit(
+          "Email" => @user_claudia.email,
+          "Password" => @user_claudia.password,
+        )
+
+        page.find(".nav a[href='/app/stats']", text: "Stats").click
+      end
+
+      Then "she sees no stats" do
+        expect(
+          page
+            .find_all(".daily-stats-list .daily-stats-item")
+            .size
+        ).to be(0)
+      end
+
+      When "she uses the slick UI to upload a csv of stats" do
+        page.find("[data-widget-type='stats-app'] .nav-tabs a[href='/app']", text: "Add").click
+        # TODO dynamically generate the file with fixtures
+        # let's say the file should have 10 records
+        attach_file("CSV-file-upload", Rails.root + "spec/support/csv_sample.csv")
+        page.find("button", text: "Upload Stats").click
+      end
+
+      Then "she sees a notification that the upload is being processed" do
+        wait_for do
+          page.find("p.alert [data-testid=\"message\"]").text
+        end.to eq "Processing..."
+      end
+
+      Then "she sees a notification that the upload is completed" do
+        wait_for do
+          page.find("p.alert [data-testid=\"message\"]").text
+        end.to eq "Upload complete"
+      end
+
+      Then "she sees the new stats under stats" do
+        page.find(".nav a[href='/app/stats']", text: "Stats").click
+        
+        expect(
+          page
+            .find_all(".daily-stats-list .daily-stats-item")
+            .size
+        ).to be(10)
+      end
+    end
+  end
+end
diff --git a/spec/support/csv_sample.csv b/spec/support/csv_sample.csv
new file mode 100644
index 0000000..351847a
--- /dev/null
+++ b/spec/support/csv_sample.csv
@@ -0,0 +1,11 @@
+Date,Activity Name,Quantity
+15/08/2021,Weight,67.1
+14/08/2021,Weight,66.8
+13/08/2021,Weight,66.5
+12/08/2021,Weight,66
+11/08/2021,Pull ups,50
+11/08/2021,Weight,66.5
+10/08/2021,Weight,67
+08/08/2021,Push ups,200
+08/08/2021,Weight,66
+08/08/2021,Push ups,100
\ No newline at end of file

From 4b066f46b7b3f68d305ad2a05711d0a447827b30 Mon Sep 17 00:00:00 2001
From: Michael Milewski <saramic@gmail.com>
Date: Thu, 9 Sep 2021 19:32:24 +1000
Subject: [PATCH 2/6] added a FileHelper to generate test files inline

the method generate_file_with_contents can be used to generate a file
with a HEREDOC or with an array of hashses which will create a sparse
CSV file

Co-authored-by: Ben Ratelade <ratelade.benjamin@gmail.com>
---
 spec/features/user_uploads_own_data.rb | 28 +++++++++++++++++++-------
 spec/rails_helper.rb                   |  3 +++
 spec/support/csv_sample.csv            | 11 ----------
 spec/support/file_helper.rb            | 23 +++++++++++++++++++++
 4 files changed, 47 insertions(+), 18 deletions(-)
 delete mode 100644 spec/support/csv_sample.csv
 create mode 100644 spec/support/file_helper.rb

diff --git a/spec/features/user_uploads_own_data.rb b/spec/features/user_uploads_own_data.rb
index 58beb5c..4d3f28b 100644
--- a/spec/features/user_uploads_own_data.rb
+++ b/spec/features/user_uploads_own_data.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 
 feature "User uploads his data using nice UI", js: true do
-  context "A user exists with no stats" do
+  context "with a user that has no stats" do
     before do
       @user_claudia = User.create!(
         email: "claudia.king@automio.com",
@@ -26,19 +26,33 @@
         expect(
           page
             .find_all(".daily-stats-list .daily-stats-item")
-            .size
+            .size,
         ).to be(0)
       end
 
       When "she uses the slick UI to upload a csv of stats" do
         page.find("[data-widget-type='stats-app'] .nav-tabs a[href='/app']", text: "Add").click
-        # TODO dynamically generate the file with fixtures
-        # let's say the file should have 10 records
-        attach_file("CSV-file-upload", Rails.root + "spec/support/csv_sample.csv")
+        import_file = generate_file_with_contents("health_sample.csv") do
+          <<~HEALTH_SAMPLE_CSV
+            Date,Activity Name,Quantity
+            15/08/2021,Weight,67.1
+            14/08/2021,Weight,66.8
+            13/08/2021,Weight,66.5
+            12/08/2021,Weight,66
+            11/08/2021,Pull ups,50
+            11/08/2021,Weight,66.5
+            10/08/2021,Weight,67
+            08/08/2021,Push ups,200
+            08/08/2021,Weight,66
+            08/08/2021,Push ups,100
+          HEALTH_SAMPLE_CSV
+        end
+        attach_file("CSV-file-upload", import_file.path)
         page.find("button", text: "Upload Stats").click
       end
 
       Then "she sees a notification that the upload is being processed" do
+        pending "a way of actually processing the file"
         wait_for do
           page.find("p.alert [data-testid=\"message\"]").text
         end.to eq "Processing..."
@@ -52,11 +66,11 @@
 
       Then "she sees the new stats under stats" do
         page.find(".nav a[href='/app/stats']", text: "Stats").click
-        
+
         expect(
           page
             .find_all(".daily-stats-list .daily-stats-item")
-            .size
+            .size,
         ).to be(10)
       end
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 5e3b339..d53c6d8 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -75,4 +75,7 @@
   # predictable host and port for email links
   Capybara.server_port = 3001
   Capybara.server_host = "localhost"
+
+  # file helper can create temporary files with given content
+  config.include FileHelper
 end
diff --git a/spec/support/csv_sample.csv b/spec/support/csv_sample.csv
deleted file mode 100644
index 351847a..0000000
--- a/spec/support/csv_sample.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-Date,Activity Name,Quantity
-15/08/2021,Weight,67.1
-14/08/2021,Weight,66.8
-13/08/2021,Weight,66.5
-12/08/2021,Weight,66
-11/08/2021,Pull ups,50
-11/08/2021,Weight,66.5
-10/08/2021,Weight,67
-08/08/2021,Push ups,200
-08/08/2021,Weight,66
-08/08/2021,Push ups,100
\ No newline at end of file
diff --git a/spec/support/file_helper.rb b/spec/support/file_helper.rb
new file mode 100644
index 0000000..0e3a60a
--- /dev/null
+++ b/spec/support/file_helper.rb
@@ -0,0 +1,23 @@
+module FileHelper
+  def generate_file_with_contents(filename)
+    file = Tempfile.new(filename)
+    content = yield
+    content = csv_lines_to_string(content) if content.is_a?(Array)
+    file.write(content)
+    file.close
+    file
+  end
+
+  private
+
+  def csv_lines_to_string(csv_lines)
+    ordered_columns = csv_lines.map(&:keys).flatten.uniq.sort
+    CSV.generate do |csv|
+      csv << ordered_columns
+      csv_lines
+        .each do |csv_line|
+        csv << ordered_columns.map { |col| csv_line[col] }
+      end
+    end
+  end
+end

From ae5707100c6ec98c45664e9f57909862f3c6caab Mon Sep 17 00:00:00 2001
From: Benjamin ratelade <ratelade.benjamin@gmail.com>
Date: Thu, 9 Sep 2021 20:18:23 +1000
Subject: [PATCH 3/6] Renamed Importer and created new test for importer

Co-authored-by: Michael Milewski <saramic@gmail.com>
---
 ...export.rb => daily_stats_data_importer.rb} | 23 ++++++++---------
 .../daily_stats_data_importer_spec.rb         | 25 +++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)
 rename app/services/{csv_import_export.rb => daily_stats_data_importer.rb} (75%)
 create mode 100644 spec/services/daily_stats_data_importer_spec.rb

diff --git a/app/services/csv_import_export.rb b/app/services/daily_stats_data_importer.rb
similarity index 75%
rename from app/services/csv_import_export.rb
rename to app/services/daily_stats_data_importer.rb
index f2b5fcd..05ab45a 100644
--- a/app/services/csv_import_export.rb
+++ b/app/services/daily_stats_data_importer.rb
@@ -1,6 +1,6 @@
-require 'csv'
+require "csv"
 
-class CsvImportExport
+class DailyStatsDataImporter
   attr_accessor :file_path
 
   def initialize(file_path)
@@ -10,9 +10,9 @@ def initialize(file_path)
   def import_daily_stats(user_id)
     daily_stats_data = {}
     CSV.foreach(file_path, headers: true) do |row|
-      date = Date.parse(row['Date'])
+      date = Date.parse(row["Date"])
       data = {
-        row["Activity Name"] => row["Quantity"]
+        row["Activity Name"] => row["Quantity"],
       }
       daily_stats_data[date].present? ? daily_stats_data[date].merge(data) : daily_stats_data[date] = data
     end
@@ -21,7 +21,7 @@ def import_daily_stats(user_id)
     invalid_daily_stats = []
     daily_stats_data.each do |date, data|
       daily_stat = DailyStat.new(date: date, data: data, user_id: user_id)
-      if daily_stat.valid? 
+      if daily_stat.valid?
         daily_stats << daily_stat
       else
         invalid_daily_stats << [daily_stat.date, daily_stat.data, daily_stat.errors.full_messages]
@@ -34,21 +34,20 @@ def import_daily_stats(user_id)
           daily_stat.save
         end
       end
-    rescue ActiveRecord::ActiveRecordError => error
+    rescue ActiveRecord::ActiveRecordError => e
       # TODO: what do we do with these errors? Records are valid, but something went wrong
-      puts error.to_json
+      puts e.to_json
     end
     # binding.pry
     generate_csv(invalid_daily_stats, "Date", "Data", "Error")
-
   end
 
-  # TODO a method to handle errors and output them in a csv
+  # TODO: a method to handle errors and output them in a csv
   def generate_csv(data, *headers)
     CSV.generate(
-      write_headers: true, 
-      headers: headers
-      ) do |csv|
+      write_headers: true,
+      headers: headers,
+    ) do |csv|
       data.each do |data|
         csv << data
       end
diff --git a/spec/services/daily_stats_data_importer_spec.rb b/spec/services/daily_stats_data_importer_spec.rb
new file mode 100644
index 0000000..2e1ab03
--- /dev/null
+++ b/spec/services/daily_stats_data_importer_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+describe DailyStatsDataImporter do
+  let(:user) { create(:user_claudia) }
+
+  it "Raises an error with an invalid file path" do
+    importer = described_class.new("")
+    expect do
+      importer.import_daily_stats(user.id)
+    end.to raise_error(Errno::ENOENT, "No such file or directory @ rb_sysopen - ")
+  end
+
+  it "Creates data for a valid file" do
+    importer = described_class.new("spec/support/csv_sample.csv")
+    importer.import_daily_stats(user.id)
+    expect(DailyStat.find_by(date: "2021-08-08").data).to eq({"Push ups" => "200"})
+  end
+
+  it "Can be run idempotently" do
+    importer = described_class.new("spec/support/csv_sample.csv")
+    importer.import_daily_stats(user.id)
+    importer.import_daily_stats(user.id)
+    expect(DailyStat.find_by(date: "2021-08-08").data).to eq({"Push ups" => "200"})
+  end
+end

From 3f390ed9b268d4bb53472494019b2441d4faed73 Mon Sep 17 00:00:00 2001
From: Benjamin ratelade <ratelade.benjamin@gmail.com>
Date: Sat, 11 Sep 2021 14:52:34 +1000
Subject: [PATCH 4/6] Data Importer (OO) with some tests

Created the data importer alongside some tests to make sure it does the basic things.
---
 app/services/daily_stats_data_importer.rb     |  2 +-
 .../daily_stats_data_importer_spec.rb         | 33 ++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/services/daily_stats_data_importer.rb b/app/services/daily_stats_data_importer.rb
index 05ab45a..298b6ca 100644
--- a/app/services/daily_stats_data_importer.rb
+++ b/app/services/daily_stats_data_importer.rb
@@ -14,7 +14,7 @@ def import_daily_stats(user_id)
       data = {
         row["Activity Name"] => row["Quantity"],
       }
-      daily_stats_data[date].present? ? daily_stats_data[date].merge(data) : daily_stats_data[date] = data
+      daily_stats_data[date].present? ? daily_stats_data[date] = daily_stats_data[date].merge(data) : daily_stats_data[date] = data
     end
 
     daily_stats = []
diff --git a/spec/services/daily_stats_data_importer_spec.rb b/spec/services/daily_stats_data_importer_spec.rb
index 2e1ab03..8ad4262 100644
--- a/spec/services/daily_stats_data_importer_spec.rb
+++ b/spec/services/daily_stats_data_importer_spec.rb
@@ -2,6 +2,25 @@
 
 describe DailyStatsDataImporter do
   let(:user) { create(:user_claudia) }
+  let(:file) {
+    generate_file_with_contents("health_sample.csv") do
+          <<~HEALTH_SAMPLE_CSV
+            Date,Activity Name,Quantity
+            15/08/2021,Weight,67.1
+            14/08/2021,Weight,66.8
+            13/08/2021,Weight,66.5
+            12/08/2021,Weight,66
+            11/08/2021,Pull ups,50
+            11/08/2021,Weight,66.5
+            10/08/2021,Weight,67
+            08/08/2021,Push ups,200
+            08/08/2021,Weight,66
+            07/08/2021,Weight,66.4
+            06/08/2021,Weight,66.8
+            05/08/2021,Weight,66.6
+          HEALTH_SAMPLE_CSV
+        end
+  }
 
   it "Raises an error with an invalid file path" do
     importer = described_class.new("")
@@ -11,15 +30,21 @@
   end
 
   it "Creates data for a valid file" do
-    importer = described_class.new("spec/support/csv_sample.csv")
+    importer = described_class.new(file.path)
     importer.import_daily_stats(user.id)
-    expect(DailyStat.find_by(date: "2021-08-08").data).to eq({"Push ups" => "200"})
+    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => "67.1"})
   end
 
   it "Can be run idempotently" do
-    importer = described_class.new("spec/support/csv_sample.csv")
+    importer = described_class.new(file.path)
     importer.import_daily_stats(user.id)
     importer.import_daily_stats(user.id)
-    expect(DailyStat.find_by(date: "2021-08-08").data).to eq({"Push ups" => "200"})
+    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => "67.1"})
   end
+
+  it "Adds the expected data on a single Daily Stat" do
+    importer = described_class.new(file.path)
+    importer.import_daily_stats(user.id)
+    expect(user.daily_stats.find_by(date: "2021-08-11").data).to eq({"Pull ups"=> "50", "Weight"=> "66.5"})
+  end  
 end

From 723081d5ca255f15a7cfeca1d61e882707ebd5d2 Mon Sep 17 00:00:00 2001
From: Benjamin ratelade <ratelade.benjamin@gmail.com>
Date: Sun, 12 Sep 2021 21:45:32 +1000
Subject: [PATCH 5/6] [Round Trip Data] Improved CSV Importer along with tests

CSV importer class for DailyStats, in functionnal programming style.
Updated rubocop.yml to allow for big code blocks in spec/services
Reinstated the changes to user_adds_stats_using_nice_ui_spec.rb so that it uses Factory Bot.
Tweaked file_helper.rb module to allow changing the file extension.
---
 .rubocop.yml                                  |   1 +
 app/services/daily_stats_data_importer.rb     |  86 ++++++-------
 .../user_adds_stats_using_nice_ui_spec.rb     |  26 +---
 .../daily_stats_data_importer_spec.rb         | 113 ++++++++++++------
 spec/support/file_helper.rb                   |   2 +-
 5 files changed, 129 insertions(+), 99 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index b6b2cc9..b818231 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -35,6 +35,7 @@ Metrics/BlockLength:
   Description: allow features to be more descriptive and longer
   Exclude:
     - "spec/features/**/*"
+    - "spec/services/**/*"
 
 RSpec/Capybara/FeatureMethods:
   Description: allow given/background/scenario in capybara features
diff --git a/app/services/daily_stats_data_importer.rb b/app/services/daily_stats_data_importer.rb
index 298b6ca..e05ddbd 100644
--- a/app/services/daily_stats_data_importer.rb
+++ b/app/services/daily_stats_data_importer.rb
@@ -1,57 +1,63 @@
 require "csv"
 
 class DailyStatsDataImporter
-  attr_accessor :file_path
+  def self.import(filepath, user_id)
+    new.import(filepath, user_id)
+  end
 
-  def initialize(file_path)
-    @file_path = file_path
+  def import(filepath, user_id)
+    user = User.find(user_id)
+    read_file(filepath)
+      .map { |data| process_data(data) }
+      .map { |data| user.daily_stats.create(data) }
   end
 
-  def import_daily_stats(user_id)
-    daily_stats_data = {}
-    CSV.foreach(file_path, headers: true) do |row|
-      date = Date.parse(row["Date"])
-      data = {
-        row["Activity Name"] => row["Quantity"],
-      }
-      daily_stats_data[date].present? ? daily_stats_data[date] = daily_stats_data[date].merge(data) : daily_stats_data[date] = data
+  private
+
+  def read_file(filepath)
+    case File.extname(filepath)
+    when ".csv"
+      read_csv(filepath)
+    else
+      raise "Unknown file type"
     end
+  end
 
-    daily_stats = []
-    invalid_daily_stats = []
-    daily_stats_data.each do |date, data|
-      daily_stat = DailyStat.new(date: date, data: data, user_id: user_id)
-      if daily_stat.valid?
-        daily_stats << daily_stat
+  def read_csv(filepath)
+    results = []
+    CSV.foreach(filepath, headers: true) do |row|
+      row_data = {
+        date: row["Date"],
+        data: {
+          row["Activity Name"] => row["Quantity"],
+        },
+      }
+      same_date_item = results.find do |item|
+        item[:date] == row_data[:date]
+      end
+      if same_date_item.present?
+        same_date_item[:data] = same_date_item[:data].merge(row_data[:data])
       else
-        invalid_daily_stats << [daily_stat.date, daily_stat.data, daily_stat.errors.full_messages]
+        results << row_data
       end
     end
+    results
+  end
 
-    begin
-      DailyStat.transaction do
-        daily_stats.each do |daily_stat|
-          daily_stat.save
-        end
-      end
-    rescue ActiveRecord::ActiveRecordError => e
-      # TODO: what do we do with these errors? Records are valid, but something went wrong
-      puts e.to_json
-    end
-    # binding.pry
-    generate_csv(invalid_daily_stats, "Date", "Data", "Error")
+  def process_data(data)
+    parse_date(data)
+      .then { |new_data| parse_values(new_data) }
   end
 
-  # TODO: a method to handle errors and output them in a csv
-  def generate_csv(data, *headers)
-    CSV.generate(
-      write_headers: true,
-      headers: headers,
-    ) do |csv|
-      data.each do |data|
-        csv << data
-      end
-    end
+  def parse_date(data)
+    data[:date] = Date.parse(data[:date])
+    data
   end
 
+  def parse_values(data)
+    data[:data].each do |key, value|
+      data[:data][key] = value.to_f
+    end
+    data
+  end
 end
diff --git a/spec/features/user_adds_stats_using_nice_ui_spec.rb b/spec/features/user_adds_stats_using_nice_ui_spec.rb
index 9fe2fa6..d068930 100644
--- a/spec/features/user_adds_stats_using_nice_ui_spec.rb
+++ b/spec/features/user_adds_stats_using_nice_ui_spec.rb
@@ -1,29 +1,13 @@
 require "rails_helper"
 
 feature "User adds stats using nice UI", js: true do
-  context "when a user existst with stats" do
+  context "with a user who has stats" do
     before do
       @user_claudia = create(:user_claudia)
-      @user_claudia
-        .daily_stats
-        .append(
-          create(
-            :daily_stat,
-            date: Date.parse("2015-04-01"),
-            data: {situps: 100, weight: 66.6},
-            user: @user_claudia,
-          ),
-        )
-      @user_claudia
-        .daily_stats
-        .append(
-          create(
-            :daily_stat,
-            date: Date.parse("2015-04-02"),
-            data: {situps: 80, weight: 66.6},
-            user: @user_claudia,
-          ),
-        )
+      @user_claudia.daily_stats.append(create(:daily_stat, date: Date.parse("2015-04-01"),
+data: {situps: 100, weight: 66.6}, user: @user_claudia,))
+      @user_claudia.daily_stats.append(create(:daily_stat, date: Date.parse("2015-04-02"),
+data: {situps: 80, weight: 66.6}, user: @user_claudia,))
     end
 
     scenario "Claudia signs in, sees her stats and updates them" do
diff --git a/spec/services/daily_stats_data_importer_spec.rb b/spec/services/daily_stats_data_importer_spec.rb
index 8ad4262..e7295cc 100644
--- a/spec/services/daily_stats_data_importer_spec.rb
+++ b/spec/services/daily_stats_data_importer_spec.rb
@@ -2,49 +2,88 @@
 
 describe DailyStatsDataImporter do
   let(:user) { create(:user_claudia) }
-  let(:file) {
-    generate_file_with_contents("health_sample.csv") do
-          <<~HEALTH_SAMPLE_CSV
-            Date,Activity Name,Quantity
-            15/08/2021,Weight,67.1
-            14/08/2021,Weight,66.8
-            13/08/2021,Weight,66.5
-            12/08/2021,Weight,66
-            11/08/2021,Pull ups,50
-            11/08/2021,Weight,66.5
-            10/08/2021,Weight,67
-            08/08/2021,Push ups,200
-            08/08/2021,Weight,66
-            07/08/2021,Weight,66.4
-            06/08/2021,Weight,66.8
-            05/08/2021,Weight,66.6
-          HEALTH_SAMPLE_CSV
-        end
-  }
-
-  it "Raises an error with an invalid file path" do
-    importer = described_class.new("")
-    expect do
-      importer.import_daily_stats(user.id)
-    end.to raise_error(Errno::ENOENT, "No such file or directory @ rb_sysopen - ")
+  let(:file) do
+    generate_file_with_contents("health_sample", ".csv") do
+      <<~HEALTH_SAMPLE_CSV
+        Date,Activity Name,Quantity
+        15/08/2021,Weight,67.1
+        14/08/2021,Weight,66.8
+        13/08/2021,Weight,66.5
+        12/08/2021,Weight,66
+        11/08/2021,Pull ups,50
+        10/08/2021,Weight,67
+        08/08/2021,Push ups,200
+        07/08/2021,Weight,66.4
+        06/08/2021,Weight,66.8
+        05/08/2021,Weight,66.6
+      HEALTH_SAMPLE_CSV
+    end
+  end
+
+  let(:file_with_repeated_dates) do
+    generate_file_with_contents("health_sample", ".csv") do
+      <<~HEALTH_SAMPLE_CSV
+        Date,Activity Name,Quantity
+        15/08/2021,Weight,67.1
+        14/08/2021,Weight,66.8
+        13/08/2021,Weight,66.5
+        12/08/2021,Weight,66
+        11/08/2021,Pull ups,50
+        11/08/2021,Weight,66.5
+        10/08/2021,Weight,67
+        08/08/2021,Push ups,200
+        08/08/2021,Weight,66
+        07/08/2021,Weight,66.4
+        06/08/2021,Weight,66.8
+        05/08/2021,Weight,66.6
+      HEALTH_SAMPLE_CSV
+    end
+  end
+
+  let(:file_with_invalid_data) do
+    generate_file_with_contents("health_sample", ".csv") do
+      <<~HEALTH_SAMPLE_CSV
+        Date,Activity Name,Quantity
+        15/08/2021,Weight,67.1
+        14/08/2021,Weight,66.8
+        ,Pull Ups,100
+      HEALTH_SAMPLE_CSV
+    end
+  end
+
+  let(:incorrect_file_extension) do
+    generate_file_with_contents("health_sample", ".txt") do
+      <<~HEALTH_SAMPLE_CSV
+        Date,Activity Name,Quantity
+        15/08/2021,Weight,67.1
+      HEALTH_SAMPLE_CSV
+    end
   end
 
   it "Creates data for a valid file" do
-    importer = described_class.new(file.path)
-    importer.import_daily_stats(user.id)
-    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => "67.1"})
+    described_class.import(file.path, user.id)
+    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => 67.1})
+  end
+
+  it "Saves numerical data as Floats" do
+    described_class.import(file.path, user.id)
+    expect(user.daily_stats.find_by(date: "2021-08-15").data["Weight"]).to be_a(Float)
+  end
+
+  it "Fails gracefully when the wrong file type is provided" do
+    expect do
+      described_class.import(incorrect_file_extension.path, user.id)
+    end.to raise_error(RuntimeError, "Unknown file type")
   end
 
   it "Can be run idempotently" do
-    importer = described_class.new(file.path)
-    importer.import_daily_stats(user.id)
-    importer.import_daily_stats(user.id)
-    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => "67.1"})
+    described_class.import(file.path, user.id)
+    described_class.import(file.path, user.id)
+    expect(user.daily_stats.find_by(date: "2021-08-15").data).to eq({"Weight" => 67.1})
   end
 
-  it "Adds the expected data on a single Daily Stat" do
-    importer = described_class.new(file.path)
-    importer.import_daily_stats(user.id)
-    expect(user.daily_stats.find_by(date: "2021-08-11").data).to eq({"Pull ups"=> "50", "Weight"=> "66.5"})
-  end  
+  it "Combines records from rows with the same date" do
+    described_class.import(file_with_repeated_dates.path, user.id)
+    expect(user.daily_stats.find_by(date: "2021-08-11").data).to eq({"Weight" => 66.5, "Pull ups" => 50})
+  end
 end
diff --git a/spec/support/file_helper.rb b/spec/support/file_helper.rb
index 0e3a60a..135425e 100644
--- a/spec/support/file_helper.rb
+++ b/spec/support/file_helper.rb
@@ -1,5 +1,5 @@
 module FileHelper
-  def generate_file_with_contents(filename)
+  def generate_file_with_contents(*filename)
     file = Tempfile.new(filename)
     content = yield
     content = csv_lines_to_string(content) if content.is_a?(Array)

From 3e79fec80c71695a377fd9b7cd71d659868eb1c0 Mon Sep 17 00:00:00 2001
From: Benjamin ratelade <ratelade.benjamin@gmail.com>
Date: Mon, 13 Sep 2021 13:14:35 +1000
Subject: [PATCH 6/6] [Daily Stats Upload] Added the feature that allows
 uploading data via csv

Created a Settings controller to handle the import route.
Created a view (settings/show.html.erb) to display the upload form.
Added a link to /settings in the React nav. It points to a plain Rails page.
Cleaned up the React view to remove the upload button.
Renamed test for spec/features/user_uploads_own_data.rb to spec/features/user_uploads_own_data_spec.rb
Style tweak for Flash Notices so they are always visible.
---
 .../components/_flash_message.scss            |  1 +
 app/controllers/settings_controller.rb        |  9 +++++++++
 app/javascript/react/components/Nav/Nav.js    |  5 +++++
 app/javascript/react/pages/Home/Home.js       | 18 +-----------------
 app/views/settings/show.html.erb              |  8 ++++++++
 config/routes.rb                              |  2 ++
 ..._data.rb => user_uploads_own_data_spec.rb} | 19 ++++++-------------
 7 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 app/controllers/settings_controller.rb
 create mode 100644 app/views/settings/show.html.erb
 rename spec/features/{user_uploads_own_data.rb => user_uploads_own_data_spec.rb} (79%)

diff --git a/app/assets/stylesheets/components/_flash_message.scss b/app/assets/stylesheets/components/_flash_message.scss
index 574adea..3f44ce0 100644
--- a/app/assets/stylesheets/components/_flash_message.scss
+++ b/app/assets/stylesheets/components/_flash_message.scss
@@ -2,4 +2,5 @@
   position: fixed;
   bottom: 4rem;
   right: 4rem;
+  z-index: 1000; 
 }
\ No newline at end of file
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
new file mode 100644
index 0000000..0078e5c
--- /dev/null
+++ b/app/controllers/settings_controller.rb
@@ -0,0 +1,9 @@
+class SettingsController < ApplicationController
+  def show
+  end
+
+  def import
+    DailyStatsDataImporter.import(params[:file].path, current_user.id)
+    redirect_to "/app/stats", notice: "Upload complete"
+  end
+end
diff --git a/app/javascript/react/components/Nav/Nav.js b/app/javascript/react/components/Nav/Nav.js
index 6f1ced1..d826538 100644
--- a/app/javascript/react/components/Nav/Nav.js
+++ b/app/javascript/react/components/Nav/Nav.js
@@ -24,6 +24,11 @@ const Nav = () => (
     <li className="nav-item">
       <span className="nav-link disabled">Ranking</span>
     </li>
+    <li className="nav-item">
+      <a href="/settings" className="nav-link">
+        Settings
+      </a>
+    </li>
   </ul>
 );
 
diff --git a/app/javascript/react/pages/Home/Home.js b/app/javascript/react/pages/Home/Home.js
index 5ff4394..d5019f4 100644
--- a/app/javascript/react/pages/Home/Home.js
+++ b/app/javascript/react/pages/Home/Home.js
@@ -71,23 +71,7 @@ const Home = () => {
                 formInput={formInput}
               />
             </>
-        )}
-        </div>
-      </div>
-      <div className="row">
-        <div className="col-12">
-          <input 
-            type="file" 
-            accept=".csv"
-            name="CSV-file-upload"
-          >
-          </input>
-          <button
-            type="button"
-            className={'btn btn-info'}
-           >
-           Upload Stats
-          </button>
+          )}
         </div>
       </div>
     </div>
diff --git a/app/views/settings/show.html.erb b/app/views/settings/show.html.erb
new file mode 100644
index 0000000..a5ba351
--- /dev/null
+++ b/app/views/settings/show.html.erb
@@ -0,0 +1,8 @@
+<div class="row">
+  <div class="col-12">
+    <%= form_with(url: import_path, multipart: true) do |form| %>
+      <%= form.file_field :file, {accept: ".csv"} %>
+      <%= form.button "Upload Stats", {class: "btn btn-info"} %>
+    <% end %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index df9826b..35fe9aa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,8 @@
     root to: "users#index"
   end
   mount GraphiQL::Rails::Engine, at: "/graphiql", graphql_path: "/graphql" if Rails.env.development?
+  resource :settings, only: [:show]
+  post :import, to: "settings#import"
   post "/graphql", to: "graphql#execute"
   devise_for :users
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
diff --git a/spec/features/user_uploads_own_data.rb b/spec/features/user_uploads_own_data_spec.rb
similarity index 79%
rename from spec/features/user_uploads_own_data.rb
rename to spec/features/user_uploads_own_data_spec.rb
index 4d3f28b..0739e1c 100644
--- a/spec/features/user_uploads_own_data.rb
+++ b/spec/features/user_uploads_own_data_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-feature "User uploads his data using nice UI", js: true do
+feature "User uploads their data using rails UI", js: true do
   context "with a user that has no stats" do
     before do
       @user_claudia = User.create!(
@@ -30,9 +30,9 @@
         ).to be(0)
       end
 
-      When "she uses the slick UI to upload a csv of stats" do
-        page.find("[data-widget-type='stats-app'] .nav-tabs a[href='/app']", text: "Add").click
-        import_file = generate_file_with_contents("health_sample.csv") do
+      When "she uses the Rails UI to upload a csv of stats" do
+        page.find("[data-widget-type='stats-app'] .nav-tabs a[href='/settings']", text: "Settings").click
+        import_file = generate_file_with_contents("health_sample", ".csv") do
           <<~HEALTH_SAMPLE_CSV
             Date,Activity Name,Quantity
             15/08/2021,Weight,67.1
@@ -47,17 +47,10 @@
             08/08/2021,Push ups,100
           HEALTH_SAMPLE_CSV
         end
-        attach_file("CSV-file-upload", import_file.path)
+        attach_file("file", import_file.path)
         page.find("button", text: "Upload Stats").click
       end
 
-      Then "she sees a notification that the upload is being processed" do
-        pending "a way of actually processing the file"
-        wait_for do
-          page.find("p.alert [data-testid=\"message\"]").text
-        end.to eq "Processing..."
-      end
-
       Then "she sees a notification that the upload is completed" do
         wait_for do
           page.find("p.alert [data-testid=\"message\"]").text
@@ -71,7 +64,7 @@
           page
             .find_all(".daily-stats-list .daily-stats-item")
             .size,
-        ).to be(10)
+        ).to be(7)
       end
     end
   end