Fix inconsistent item headers in donation and purchase CSV exports

Author: AHarris03

Gemfile.lock

@@ -856,4 +856,4 @@ DEPENDENCIES
   webmock (~> 3.26)
 
 BUNDLED WITH
-   2.7.1
+  4.0.9

app/controllers/purchases_controller.rb

@@ -33,8 +33,12 @@ def index
     respond_to do |format|
       format.html
       #  format.csv { send_data Purchase.generate_csv(@purchases), filename: "Purchases-#{Time.zone.today}.csv" }
+      # the fix made in export purchases depends on the use of the current organization
       format.csv do
-        send_data Exports::ExportPurchasesCSVService.new(purchase_ids: @purchases.map(&:id)).generate_csv, filename: "Purchases-#{Time.zone.today}.csv"
+        send_data Exports::ExportPurchasesCSVService.new(
+          purchase_ids: @purchases.map(&:id),
+          organization: current_organization
+        ).generate_csv, filename: "Purchases-#{Time.zone.today}.csv"
       end
     end
   end

app/services/exports/export_donations_csv_service.rb

@@ -95,18 +95,11 @@ def base_headers
       base_table.keys
     end
 
+    #updated to use organization headers instead of just headers with a value when filtered
     def item_headers
       return @item_headers if @item_headers
 
-      item_names = Set.new
-
-      donations.each do |donation|
-        donation.line_items.each do |line_item|
-          item_names.add(line_item.item.name)
-        end
-      end
-
-      @item_headers = item_names.sort
+      @item_headers = @organization.items.pluck(:name).sort_by(&:downcase)
 
       @item_headers = @item_headers.flat_map { |header| [header, "#{header} In-Kind Value"] } if @organization.include_in_kind_values_in_exported_files
 

app/services/exports/export_purchases_csv_service.rb

@@ -1,6 +1,7 @@
 module Exports
   class ExportPurchasesCSVService
-    def initialize(purchase_ids:)
+    def initialize(purchase_ids:, organization:)
+      @organization = organization
       # Use a where lookup so that I can eager load all the resources
       # needed rather than depending on external code to do it for me.
       # This makes this code more self contained and efficient!
@@ -101,18 +102,12 @@ def base_headers
       base_table.keys
     end
 
+    # updated to use organization headers instead of just headers with a value when filtered
+    # more updates in purchases controller
     def item_headers
       return @item_headers if @item_headers
 
-      item_names = Set.new
-
-      purchases.each do |purchase|
-        purchase.line_items.each do |line_item|
-          item_names.add(line_item.item.name)
-        end
-      end
-
-      @item_headers = item_names.sort
+      @item_headers = @organization.items.pluck(:name).sort_by(&:downcase)
     end
 
     def build_row_data(purchase)

config/database.yml

@@ -1,48 +1,27 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  host: <%= ENV.fetch("PG_HOST", 'localhost') %>
   database: diaper_dev
-  username: <%= ENV.fetch("PG_USERNAME", 'postgres') %>
-  password: <%= ENV.fetch("PG_PASSWORD", nil) %>
+  username: aleha
+  password:
   pool: 20
   timeout: 5000
 
-development: &development
+development:
   <<: *default
-  gssencmode: "disable"
-  timeout: 5000
-
-staging:
-  <<: *default
-  username: <%= ENV['POSTGRESQL_USERNAME'] %>
-  password: <%= ENV['POSTGRESQL_PASSWORD'] %>
-  database: <%= ENV['POSTGRESQL_DATABASE'] %>
-  host: <%= ENV['POSTGRESQL_ADDRESS'] %>
+  gssencmode: disable
 
 test:
   <<: *default
   database: diaper_test
-  timeout: 5000
 
-# These env vars live in Cloud66 application settings. Don't change
-# the names of the vars we're looking for without ensuring you've
-# updated/duplicated the vars there!
-#
-# Solid Cache is only configured for production, where it uses
-# the primary database.
+staging:
+  <<: *default
+
 production:
   primary: &primary_production
     <<: *default
-    adapter: postgresql
-    encoding: unicode
-    host: <%= ENV["DIAPER_DB_HOST"] %>
-    pool: 20
-    username: <%= ENV["DIAPER_DB_USERNAME"] %>
-    password: <%= ENV["DIAPER_DB_PASSWORD"] %>
-    database: <%= ENV["DIAPER_DB_DATABASE"] %>
-    timeout: 5000
+    database: diaper_production
   cache:
     <<: *primary_production
     migrations_paths: db/cache_migrate
-

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2025_10_07_141240) do
+ActiveRecord::Schema[8.0].define(version: 2025_10_17_194543) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 

spec/services/exports/export_donations_csv_service_spec.rb

@@ -71,6 +71,15 @@ def source_name(donation)
         CSV
         expect(subject).to eq(csv)
       end
+      # new donations export regression test
+      it "includes all organization item headers even when exported donations only use a subset of items" do
+        unused_item = create(:item, name: "Z Unused Item", organization: organization)
+
+        csv_rows = CSV.parse(subject, headers: true)
+        headers = csv_rows.headers
+
+        expect(headers).to include("A Item", "B Item", "C Item", "Dupe Item", "E Item", "Z Unused Item")
+      end
     end
 
     context 'while "Include in-kind value in donation and distribution exports?" is set to yes' do

spec/services/exports/export_purchases_csv_service_spec.rb

@@ -1,20 +1,21 @@
 RSpec.describe Exports::ExportPurchasesCSVService do
   describe "#generate_csv_data" do
-    subject { described_class.new(purchase_ids: purchase_ids).generate_csv_data }
+    let(:organization) { create(:organization) }
     let(:purchase_ids) { purchases.map(&:id) }
+    let(:storage_location) { create(:storage_location, organization: organization) }
+    subject { described_class.new(purchase_ids: purchase_ids, organization: organization).generate_csv_data }
+
     let(:duplicate_item) do
-      FactoryBot.create(
-        :item, name: Faker::Appliance.unique.equipment
-      )
+      create(:item, name: Faker::Appliance.unique.equipment, organization: organization)
     end
+
     let(:items_lists) do
       [
         [
           [duplicate_item, 5],
           [
-            FactoryBot.create(
-              :item, name: Faker::Appliance.unique.equipment
-            ),
+            FactoryBot.create(:item, name: Faker::Appliance.unique.equipment, 
+            organization: organization),
             7
           ],
           [duplicate_item, 3]
@@ -35,9 +36,9 @@
       items_lists.each_with_index.map do |items, i|
         purchase = create(
           :purchase,
-          vendor: create(
-            :vendor, business_name: "Vendor Name #{i}"
-          ),
+          organization: organization,
+          storage_location: storage_location,
+          vendor: create(:vendor, business_name: "Vendor Name #{i}", organization: organization),
           issued_at: start_time + i.days,
           comment: "This is the #{i}-th purchase in the test.",
           amount_spent_in_cents: i * 4 + 555,
@@ -114,5 +115,13 @@
         expect(subject[idx + 1]).to eq(row)
       end
     end
+    # new purchase export regression test
+    it "includes all organization item headers even when exported purchases only use a subset of items" do
+      unused_item = create(:item, name: "Z Unused Item", organization: organization)
+
+      headers = subject[0]
+
+      expect(headers).to include("Z Unused Item")
+    end
   end
 end