Download value labels rather than values

app/models/case_log.rb

@@ -18,7 +18,6 @@ end
 
 class CaseLog < ApplicationRecord
   include Validations::SoftValidations
-  include GenerateCsv
 
   has_paper_trail
 
@@ -294,6 +293,18 @@ class CaseLog < ApplicationRecord
     LaRentRange.find_by(start_year: collection_start_year, la:, beds:, lettype:).soft_max
   end
 
+  def self.to_csv
+    CSV.generate(headers: true) do |csv|
+      csv << attribute_names
+
+      all.find_each do |record|
+        csv << record.attributes.map do |att, val|
+          record.form.get_question(att, record)&.label_from_value(val) || val
+        end
+      end
+    end
+  end
+
 private
 
   PIO = Postcodes::IO.new

app/models/concerns/generate_csv.rb

@@ -1,15 +0,0 @@
-module GenerateCsv
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def to_csv
-      CSV.generate(headers: true) do |csv|
-        csv << attribute_names
-
-        all.each do |record|
-          csv << record.attributes.values
-        end
-      end
-    end
-  end
-end

spec/requests/case_logs_controller_spec.rb

@@ -492,6 +492,7 @@ RSpec.describe CaseLogsController, type: :request do
         :case_log,
         owning_organisation: organisation,
         managing_organisation: organisation,
+        ecstat1: 1,
       )
     end
 
@@ -511,6 +512,11 @@ RSpec.describe CaseLogsController, type: :request do
       csv = CSV.parse(response.body)
       expect(csv.count).to eq(2)
     end
+
+    it "downloads answer labels rather than values" do
+      csv = CSV.parse(response.body)
+      expect(csv.second[10]).to eq("Full-time - 30 hours or more")
+    end
   end
 
   describe "PATCH" do