Merge pull request #1053 from alphagov/add-extra-info-to-csv-download

Add extra fields to Queries CSV download

app/models/bet.rb

@@ -92,4 +92,12 @@ def is_query?
   def query_object
     query
   end
+
+  def last_edit_date
+    updated_at || created_at
+  end
+
+  def author
+    user.try(:name) || " "
+  end
 end

app/models/query.rb

@@ -28,15 +28,19 @@ def query_object
 
   def self.to_csv(*_args)
     CSV.generate do |csv|
-      csv << ["query", "match_type", "link", "best/worst", "comment"]
+      csv << ["query", "match_type", "link", "best/worst", "comment", "status", "position", "last edit date", "author"]
 
       all.includes(:bets).find_each do |query|
         query.bets.each do |bet|
           csv << [query.query,
                   query.match_type,
                   bet.link,
                   bet.is_best ? "best" : "worst",
-                  bet.comment.to_s]
+                  bet.comment.to_s,
+                  bet.valid_until,
+                  bet.position,
+                  bet.last_edit_date.strftime("%d %b %Y"),
+                  bet.author]
         end
       end
     end

app/views/queries/_bet_table.html.erb

@@ -25,8 +25,8 @@
       <% if type == :best %>
         <%= t.cell bet.position %>
       <% end %>
-      <%= t.cell (bet.updated_at || bet.created_at).strftime("%d %b %Y") %>
-      <%= t.cell bet.try(:user).try(:name) || " " %>
+      <%= t.cell bet.last_edit_date.strftime("%d %b %Y") %>
+      <%= t.cell bet.author %>
       <%= t.cell bet.valid_until %>
       <% if bet.active? %>
         <%= t.cell button_to 'Deactivate', deactivate_bet_path(bet), class: "govuk-button govuk-button--secondary" %>

features/support/best_bets.rb

@@ -103,11 +103,11 @@ def check_absence_of_best_bet_on_query_page(query, link)
 def check_for_queries_in_csv_format(queries)
   headers, *rows = *CSV.parse(page.body)
 
-  expect(headers).to eq(["query", "match_type", "link", "best/worst", "comment"])
+  expect(headers).to eq(["query", "match_type", "link", "best/worst", "comment", "status", "position", "last edit date", "author"])
 
   queries.each do |query|
     query.bets.each do |bet|
-      expect(rows).to include([query.query, query.match_type, bet.link, "best", ""])
+      expect(rows).to include([query.query, query.match_type, bet.link, "best", "", "Permanent"])
     end
   end
 end

spec/models/best_bet_spec.rb

@@ -78,6 +78,29 @@
           it { is_expected.to be_valid }
         end
       end
+
+      describe "#valid_until" do
+        it "valid_until is permanent if permanent is set to true" do
+          best_bet = Bet.new(@best_bet_attributes)
+
+          expect(best_bet.valid_until).to eq("Permanent")
+        end
+
+        it "returns an expiry date if expiration date is in the future" do
+          expiration_date = 1.day.from_now
+          bet_date_attrs = { permanent: false, expiration_date: }
+          best_bet = Bet.new(@best_bet_attributes.merge(bet_date_attrs))
+
+          expect(best_bet.valid_until).to eq("Expires #{expiration_date.strftime('%d %b %Y')}")
+        end
+
+        it "returns a status of Expired if expiration date is in the past" do
+          bet_date_attrs = { permanent: false }
+          best_bet = Bet.new(@best_bet_attributes.merge(bet_date_attrs))
+
+          expect(best_bet.valid_until).to eq("Expired")
+        end
+      end
     end
 
     context "when given an internal link" do
@@ -140,6 +163,16 @@
       end
     end
 
+    describe "#author" do
+      it "should return the name of user" do
+        user_name = "Ahsoka Tano"
+        user = create(:user, name: user_name)
+        best_bet = Bet.new(@best_bet_attributes.merge(user_id: user.id))
+
+        expect(best_bet.author).to eq(user_name)
+      end
+    end
+
     describe "bet_date validations" do
       it "Temporary bets must have an expiration date" do
         bet_date_attrs = { permanent: false, expiration_date: "" }