Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/services/import/reduction.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,19 @@ def unique_id
unique_id = subject_metadata['id_str'] || subject_metadata['!id_str'] || subject_metadata['#id_str'] || subject_metadata['#id_field']
return unique_id if unique_id

# fallback if objectId
unique_id = subject_metadata['objectId'] || subject_metadata['!objectId'] || subject_metadata['#objectId']
return unique_id if unique_id

# fallback if fileId
unique_id = subject_metadata['fileId'] || subject_metadata['!fileId'] || subject_metadata['#fileId']
return unique_id if unique_id

# staging has older data with different subject metadata - fallback to handling this special env case
subject_metadata['!SDSS_ID'] if Rails.env.staging? || Rails.env.test?
return subject_metadata['!SDSS_ID'] if Rails.env.staging? || Rails.env.test?

# fallback if to subject id
zooniverse_subject_id.to_s
end

# use a custom label extractor (injected at run time)
Expand Down
7 changes: 7 additions & 0 deletions spec/services/import/reduction_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,13 @@
reduction_model_staging = described_class.new(staging_payload, label_extractor).run
expect(reduction_model_staging.unique_id).to match('1237663785278570672')
end

it 'falls back to the Zooniverse subject id when no metadata identifier exists' do
allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production'))
raw_payload[:subject]['metadata'].delete('id')
reduction_model_staging = described_class.new(raw_payload, label_extractor).run
expect(reduction_model_staging.unique_id).to match(zooniverse_subject_id.to_s)
end
end

context 'with a existing duplicate reduction' do
Expand Down
Loading