Skip to content

Y25-482 - Print using v2 - 1 #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenTopping wants to merge 1 commit into
base: develop
Choose a base branch
from
+14 −20
Open

Y25-482 - Print using v2 - 1 #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 2 additions & 9 deletions lib/tasks/config.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,6 @@ namespace :config do
task generate: :environment do
api = Sequencescape::Api.new(Gatekeeper::Application.config.api_connection_options)

barcode_printer_uuid = lambda do |printers|
->(printer_name) {
printers.detect { |prt| prt.name == printer_name }.try(:uuid) ||
raise("Printer #{printer_name}: not found!")
}
end.(api.barcode_printer.all)

# Build the configuration file based on the server we are connected to.
CONFIG = {}.tap do |configuration|
configuration[:searches] = {}.tap do |searches|
Expand All @@ -25,8 +18,8 @@ namespace :config do
configuration[:printers] = Hash.new { |h, i| h[i] = Array.new }.tap do |printers|
approved_printers = Gatekeeper::Application.config.approved_printers
puts 'Preparing printers ...'
selected = api.barcode_printer.all.select { |printer| printer.active && (approved_printers == :all || approved_printers.include?(printer.name)) }
selected.each { |printer| printers[printer.type.name] << { name: printer.name, uuid: printer.uuid } }
selected = Sequencescape::Api::V2::BarcodePrinter.all.select { |printer| printer.active && (approved_printers == :all || approved_printers.include?(printer.name)) }
selected.each { |printer| printers[printer.barcode_type] << { name: printer.name, uuid: printer.uuid } }
end

# Might want to switch this out for something more dynamic, but seeing as we'll almost certainly be working with a filtered set
Expand Down
23 changes: 12 additions & 11 deletions test/models/barcode_sheet_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ class BarcodeSheetTest < ActiveSupport::TestCase

test '#initialise' do
received_labels = [BarcodeSheet::Label.new(barcode: 'DN1S', prefix: 'DN', number: '1', lot: 'lot_number', template: 'tag_set')]
printer = api.barcode_printer.find('baac0dea-0000-0000-0000-000000000000')
printer.stubs(:print_service).returns('PMB')
printer = Sequencescape::Api::V2::BarcodePrinter.new(
print_service: 'PMB', name: @printer_name, barcode_type: '96 Well Plate'
)

barcode_sheet = BarcodeSheet.new(printer, received_labels)
assert_equal barcode_sheet.printer.name, @printer_name
Expand All @@ -44,9 +45,9 @@ class BarcodeSheetTest < ActiveSupport::TestCase
barcode: 'DN1S'
}]

printer = api.barcode_printer.find('baac0dea-0000-0000-0000-000000000000')

printer.stubs(:print_service).returns('PMB')
printer = Sequencescape::Api::V2::BarcodePrinter.new(
print_service: 'PMB', name: @printer_name, barcode_type: '96 Well Plate'
)

PMB::TestSuiteStubs.get(@label_template_url) do |_env|
[
Expand Down Expand Up @@ -74,9 +75,9 @@ class BarcodeSheetTest < ActiveSupport::TestCase
Timecop.freeze(Date.parse('02-02-2019')) do
received_labels = [BarcodeSheet::Label.new(barcode: 'DN1S', prefix: 'DN', number: '1', lot: 'lot_number', template: 'tag_set')]

printer = api.barcode_printer.find('baac0dea-0000-0000-0000-000000000000')

printer.stubs(:print_service).returns('SPrint')
printer = Sequencescape::Api::V2::BarcodePrinter.new(
print_service: 'SPrint', name: @printer_name, barcode_type: '96 Well Plate'
)

response = mock('response')
response.stubs(:code).returns('200')
Expand All @@ -91,9 +92,9 @@ class BarcodeSheetTest < ActiveSupport::TestCase
Timecop.freeze(Date.parse('02-02-2019')) do
received_labels = [BarcodeSheet::Label.new(barcode: 'DN1S', prefix: 'DN', number: '1', lot: 'lot_number', template: 'tag_set')]

printer = api.barcode_printer.find('baac0dea-0000-0000-0000-000000000000')

printer.stubs(:print_service).returns('SPrint')
printer = Sequencescape::Api::V2::BarcodePrinter.new(
print_service: 'SPrint', name: @printer_name, barcode_type: '96 Well Plate'
)

response = mock('response')
response.stubs(:code).returns('422')
Expand Down