Skip to content

Commit

Permalink
Merge pull request #1477 from sanger/depfu/update/rubocop-1.68.0
Browse files Browse the repository at this point in the history
Update rubocop 1.67.0 → 1.68.0 (minor)
  • Loading branch information
BenTopping authored Nov 8, 2024
2 parents 79f1fa1 + a44f4ae commit 299a26d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ GEM
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.4)
json (2.7.5)
jsonapi-resources (0.10.7)
activerecord (>= 4.1)
concurrent-ruby
Expand Down Expand Up @@ -178,7 +178,7 @@ GEM
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.26.3)
parser (3.3.5.0)
parser (3.3.5.1)
ast (~> 2.4.1)
racc
pry (0.14.2)
Expand Down Expand Up @@ -267,7 +267,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -277,7 +277,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.33.0)
parser (>= 3.3.1.0)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
Expand Down
8 changes: 6 additions & 2 deletions app/ont/ont.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@ def self.library_factory(request:, library_attributes:)
# Get the tag_set from the kit_barcode
ont_tag_set = TagSet.find_by(name: library_attributes[:kit_barcode])
# Find the tag_id from the tag_set based on the tag_sequence/oligo
library_attributes[:tag_id] =
ont_tag_set&.tags&.find_by(oligo: library_attributes[:tag_sequence])&.id
if ont_tag_set.nil?
library_attributes[:tag_id] = nil
else
library_attributes[:tag_id] =
ont_tag_set.tags.find_by(oligo: library_attributes[:tag_sequence])&.id
end
filtered_attributes = library_attributes.slice(*self.library_attributes)

Ont::Library.new(
Expand Down

0 comments on commit 299a26d

Please sign in to comment.