his_emr_api_lab 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb21c8db8180a800fc69ebdfcfe9e2e804a96c698e73f28ae3c2c865a8853c16
-  data.tar.gz: 2e2697ddeb327c79698ca229f9d625b6e6105e5621348df1c7d2d06d5c7b7cbb
+  metadata.gz: 87bb3f6d6ab772890afd0597ea354e2c531f00acf0252d003ca4daf3287d5ef9
+  data.tar.gz: '0292911676d1e1b21ca843826f98a899fccb2bdd767532b18565722a01acf69c'
 SHA512:
-  metadata.gz: 4440f3a2b7493335594206621cb2381207b59dfab73d841431d77ef8ba7f28f1bc033617378c7789f50e52dacdb0318b8e2ab1d93f3929b6a66601dbbfa1537c
-  data.tar.gz: aacb8d43a4b71dc017a46d3f19791defc5f9f7b0562a96c8514d3d821f7d79124ce59719bcbf91f2042c7da61f61907bbab2b7e04b33b18443c0ea204b902f18
+  metadata.gz: 4fb657851d9eaeda1b6003b24ae28989da574b62a070d95e97441211fbf4034b0ae6f95dcfaca809b2661dabc2ca68d0ef725d0d15ba9a462d74c53b5dd96143
+  data.tar.gz: 91ebb9c3384c48e043c30057a12c14938110c6e82616caf6ec6b3bbd392affe865ee4369fe8a983936bc3527ca33b5232aa81ea1302cf897397428fc916e0a73

data/app/services/lab/lims/api/rest_api.rb

@@ -59,6 +59,9 @@ class Lab::Lims::Api::RestApi
       end
 
       yield order_dto, OpenStruct.new(last_seq: 0)
+    rescue LimsApiError => e
+      Rails.logger.error("Failed to fetch updates for ##{order.accession_number}: #{e.class} - #{e.message}")
+      sleep(1)
     end
   end
 

data/app/services/lab/lims/order_dto.rb

@@ -32,7 +32,7 @@ module Lab
       def specimen_type_id
         lims_specimen_name = self['sample_type']&.strip&.downcase
 
-        if %w[specimen_not_collected not_assigned not_specified].include?(lims_specimen_name)
+        if lims_specimen_name.nil? || %w[specimen_not_collected not_assigned not_specified].include?(lims_specimen_name)
           return ConceptName.select(:concept_id).find_by_name!('Unknown').concept_id
         end
 

data/app/services/lab/lims/order_serializer.rb

@@ -64,7 +64,7 @@ module Lab
             first_name: name&.given_name,
             last_name: name&.family_name,
             id: national_id&.identifier,
-            phone_number: phone_number&.value,
+            phone_number: phone_number&.value || 'Unknown',
             gender: person.gender,
             email: nil
           }
@@ -83,9 +83,7 @@ module Lab
         end
 
         def format_sample_status_trail(order)
-          if order.concept_id == ConceptName.find_by_name!('Unknown').concept_id
-            return []
-          end
+          return [] if order.concept_id == ConceptName.find_by_name!('Unknown').concept_id
 
           user = User.find(order.discontinued_by || order.creator)
           drawn_by = PersonName.find_by_person_id(user.user_id)

data/app/services/lab/lims/push_worker.rb

@@ -17,7 +17,12 @@ module Lab
         loop do
           logger.info('Looking for new orders to push to LIMS...')
           orders = orders_pending_sync(batch_size).all
-          orders.each { |order| push_order(order) }
+          orders.each do |order|
+            push_order(order)
+          rescue GatewayError => e
+            logger.error("Failed to push order ##{order.accession_number}: #{e.class} - #{e.message}")
+            sleep(Lab::Lims::Config.updates_poll_frequency)
+          end
 
           # Doing this after .each above to stop ActiveRecord from executing
           # an extra request to the database (ActiveRecord's lazy evaluation

data/db/migrate/20210807111531_add_default_to_lims_order_mapping.rb

@@ -0,0 +1,7 @@
+class AddDefaultToLimsOrderMapping < ActiveRecord::Migration[5.2]
+  def up
+    change_column :lab_lims_order_mappings, :revision, :string, limit: 256, default: nil, null: true
+  end
+
+  def down; end
+end

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '1.1.3'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.7
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -290,6 +290,7 @@ files:
 - db/migrate/20210326195504_add_order_revision_to_lims_order_mapping.rb
 - db/migrate/20210407071728_create_lab_lims_failed_imports.rb
 - db/migrate/20210610095024_fix_numeric_results_value_type.rb
+- db/migrate/20210807111531_add_default_to_lims_order_mapping.rb
 - lib/auto12epl.rb
 - lib/couch_bum/couch_bum.rb
 - lib/generators/lab/install/USAGE