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
5 changes: 4 additions & 1 deletion app/models/genome.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ class Genome < ApplicationRecord
/x,
example: 'CP036432.1'
},
biosample: { pattern: /SAM(?:N|EA|D)\d+/, example: 'SAMN10878311' },
# BioSamples, or their SRA sample equivalents (SRS, ERS, DRS)
biosample: {
pattern: /(?:SAM(?:N|EA|D)|[SED]RS)\d+/, example: 'SAMN10878311'
},
sra: { pattern: /[SED]RX\d+/, example: 'SRX1234567' }
}.freeze

Expand Down
9 changes: 7 additions & 2 deletions test/models/genome_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,10 @@ def accession_errors(attrs)

test 'accepts BioSample and SRA Experiment sources, comma-separated' do
{
biosample: ['SAMN10878311', 'SAMEA6956417, SAMEA6939414', 'SAMD00093579'],
biosample: [
'SAMN10878311', 'SAMEA6956417, SAMEA6939414', 'SAMD00093579',
'SRS31202089', 'ERS861224', 'DRS000001', 'SAMN15855652, SRS9415155'
],
sra: ['SRX1234567', 'ERX123456, DRX123456']
}.each do |db, list|
list.each do |acc|
Expand All @@ -219,7 +222,9 @@ def accession_errors(attrs)

test 'rejects sources that are not BioSamples or SRA Experiments' do
{
biosample: ['ERS861224', 'SRS9415155', 'PRJNA384792', 'SAMN15855652 SAMN15855653'],
biosample: [
'SRR12620258', 'SRX1234567', 'PRJNA384792', 'SAMN15855652 SAMN15855653'
],
sra: ['SRR12620258', 'SRS18309842', 'SAMN10878311', 'SRP119423']
}.each do |db, list|
list.each do |acc|
Expand Down
Loading