diff --git a/app/services/api/v1/data/column_helpers.rb b/app/services/api/v1/data/column_helpers.rb index 5c391f7817..d0c709cdf6 100644 --- a/app/services/api/v1/data/column_helpers.rb +++ b/app/services/api/v1/data/column_helpers.rb @@ -27,18 +27,6 @@ def column_manifest {columns: sortable_columns.map { |cp| cp[:alias] }} end - def csv_column_aliases - csv_columns.map do |column_properties| - column_properties[:alias] - end - end - - def csv_column_display_names - csv_columns.map do |column_properties| - column_properties[:display] || column_properties[:alias]&.humanize - end - end - private def visible_columns @@ -74,14 +62,6 @@ def group_columns column_properties[:column] end end - - ## CSV specific - - def csv_columns - select_columns_map.select do |column_properties| - column_properties[:csv].nil? || column_properties[:csv] == true - end - end end end end diff --git a/app/services/api/v1/data/ndc_sdg/csv_content.rb b/app/services/api/v1/data/ndc_sdg/csv_content.rb index 16da9e0d22..aeab50e2fb 100644 --- a/app/services/api/v1/data/ndc_sdg/csv_content.rb +++ b/app/services/api/v1/data/ndc_sdg/csv_content.rb @@ -7,8 +7,8 @@ module NdcSdg class CsvContent def initialize(filter) @query = filter.call - @headers = filter.csv_column_display_names - @aliases = filter.csv_column_aliases + @headers = filter.column_display_names + @aliases = filter.column_aliases end def call diff --git a/app/services/api/v1/data/ndc_sdg/filter_columns.rb b/app/services/api/v1/data/ndc_sdg/filter_columns.rb index 3b2dffc19c..b8eba4e1c5 100644 --- a/app/services/api/v1/data/ndc_sdg/filter_columns.rb +++ b/app/services/api/v1/data/ndc_sdg/filter_columns.rb @@ -18,7 +18,7 @@ def select_columns_map { column: 'locations.iso_code3', alias: 'iso_code3', - visible: false + display: 'ISO' }, { column: 'locations.wri_standard_name', @@ -57,12 +57,12 @@ def select_columns_map { column: 'ndcs.document_type', alias: 'document_type', - csv: false + visible: false }, { column: 'ndcs.language', alias: 'document_language', - csv: false + visible: false } ] end