Skip to content

Commit

Permalink
Rubocooooooooop
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkadel committed Sep 7, 2021
1 parent 78e70cc commit 569bad8
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions app/uploaders/zizia/csv_manifest_validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,14 @@ def valid_object_types
@valid_object_types ||= ['c', 'w']
end

def parse_values_from_csv
if header_name == "object type"
row[column_number].split(delimiter).map(&:downcase)
else
row[column_number].split(delimiter)
end
end

# Make sure this column contains only valid values
def validate_values(header_name, valid_values_method)
column_number = @transformed_headers.find_index(header_name)
Expand All @@ -170,12 +178,7 @@ def validate_values(header_name, valid_values_method)
@rows.each_with_index do |row, i|
next if i.zero? # Skip the header row
next unless row[column_number]
values = ""
if header_name == "object type"
values = row[column_number].split(delimiter).map(&:downcase)
else
values = row[column_number].split(delimiter)
end
values = parse_values_from_csv
valid_values = method(valid_values_method).call
invalid_values = values.select { |value| !valid_values.include?(value) }

Expand Down

0 comments on commit 569bad8

Please sign in to comment.