his_emr_api_lab 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2202cc31522b4ae92847b3102841cfcf0c65a9e389fde480e3e787f1ef49ec7
-  data.tar.gz: a82291c66cdd6fb651e0917dc68e5b28b6dcedeb124973ab57f9f60187b4c920
+  metadata.gz: eb21c8db8180a800fc69ebdfcfe9e2e804a96c698e73f28ae3c2c865a8853c16
+  data.tar.gz: 2e2697ddeb327c79698ca229f9d625b6e6105e5621348df1c7d2d06d5c7b7cbb
 SHA512:
-  metadata.gz: 7da2c231dba9fa4b013890becd128b0a8694fe797b510e9baa37638d1437133cc11e27e2479938eda921ccfe6c23583544092cb477372b5db298922913035c72
-  data.tar.gz: cb8fbf9e9c71d187e0085b42f0fe5299976dc4309d672c815c231cdb096548d9b53b9b0f222f453b66a41a8d18b759f2d8d295c46c899206d7c7ffcee500bb6c
+  metadata.gz: 4440f3a2b7493335594206621cb2381207b59dfab73d841431d77ef8ba7f28f1bc033617378c7789f50e52dacdb0318b8e2ab1d93f3929b6a66601dbbfa1537c
+  data.tar.gz: aacb8d43a4b71dc017a46d3f19791defc5f9f7b0562a96c8514d3d821f7d79124ce59719bcbf91f2042c7da61f61907bbab2b7e04b33b18443c0ea204b902f18

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

@@ -38,6 +38,9 @@ module Lab
         end
 
         def create_order(order)
+          order = order.dup
+          order.delete('_id')
+
           bum.couch_rest :post, '/', order
         end
 

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

@@ -11,15 +11,19 @@ module Lab
       class ConfigNotFound < RuntimeError; end
 
       class << self
+        def preferred_api
+          emr_api_application('lims_api', 'couchdb')
+        end
+
         ##
         # Returns LIMS' couchdb configuration file for the current environment (Rails.env)
         def couchdb
           config_path = begin
-                          find_config_path('couchdb.yml')
-                        rescue ConfigNotFound => e
-                          Rails.logger.error("Failed to find default LIMS couchdb config: #{e.message}")
-                          find_config_path('couchdb-lims.yml') # This can be placed in HIS-EMR-API/config
-                        end
+            find_config_path('couchdb.yml')
+          rescue ConfigNotFound => e
+            Rails.logger.error("Failed to find default LIMS couchdb config: #{e.message}")
+            find_config_path('couchdb-lims.yml') # This can be placed in HIS-EMR-API/config
+          end
 
           Rails.logger.debug("Using LIMS couchdb config: #{config_path}")
 
@@ -64,9 +68,7 @@ module Lab
           @emr_api_application ||= YAML.load_file(Rails.root.join('config', 'application.yml'))
 
           @emr_api_application.fetch(param) do
-            unless fallback
-              raise ConfigNotFound, "Missing config param: #{param}"
-            end
+            raise ConfigNotFound, "Missing config param: #{param}" unless fallback
 
             fallback
           end
@@ -83,9 +85,7 @@ module Lab
             Rails.root.parent.join("nlims_controller/config/#{filename}")
           ]
 
-          if filename == 'couchdb.yml'
-            paths = [Rails.root.join('config/lims-couchdb.yml'), *paths]
-          end
+          paths = [Rails.root.join('config/lims-couchdb.yml'), *paths] if filename == 'couchdb.yml'
 
           paths.each do |path|
             Rails.logger.debug("Looking for LIMS couchdb config at: #{path}")

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

@@ -69,9 +69,7 @@ module Lab
       end
 
       def start_date
-        if self['date_created'].blank?
-          raise LimsException, 'Order missing created date'
-        end
+        raise LimsException, 'Order missing created date' if self['date_created'].blank?
 
         Utils.parse_date(self['date_created'])
       end
@@ -85,7 +83,7 @@ module Lab
 
       # Translates a LIMS sample priority to a concept_id
       def reason_for_test
-        return unknown_concept.concept_id unless self['priority']
+        return nil unless self['priority']
 
         name = case self['priority']
                when %r{Reapet / Missing}i then 'Repeat / Missing'

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

@@ -2,6 +2,8 @@
 
 require 'logger_multiplexor'
 
+require_relative './api/couchdb_api'
+
 module Lab
   module Lims
     ##
@@ -19,8 +21,7 @@ module Lab
 
       def self.start_push_worker
         start_worker('push_worker') do
-          api = Lims::Api::RestApi.new(Lab::Lims::Config.rest_api)
-          worker = PushWorker.new(api)
+          worker = PushWorker.new(lims_api)
 
           worker.push_orders # (wait: true)
         end
@@ -28,8 +29,7 @@ module Lab
 
       def self.start_pull_worker
         start_worker('pull_worker') do
-          api = Lims::Api::RestApi.new(Lab::Lims::Config.rest_api)
-          worker = PullWorker.new(api)
+          worker = PullWorker.new(lims_api)
 
           worker.pull_orders
         end
@@ -37,8 +37,7 @@ module Lab
 
       def self.start_realtime_pull_worker
         start_worker('realtime_pull_worker') do
-          api = Lims::Api::WsApi.new(Lab::Lims::Config.updates_socket)
-          worker = PullWorker.new(api)
+          worker = PullWorker.new(Lims::Api::WsApi.new(Lab::Lims::Config.updates_socket))
 
           worker.pull_orders
         end
@@ -71,6 +70,14 @@ module Lab
         Rails.logger.warn("Check for realtime updates failed: #{e.message}")
         false
       end
+
+      def self.lims_api
+        case Lims::Config.preferred_api
+        when /couchdb/i then Api::CouchDbApi.new(config: Lab::Lims::Config.couchdb)
+        when /rest/i then Api::RestApi.new(Lab::Lims::Config.rest_api)
+        else raise "Invalid LIMS API in application.yml, expected 'rest' or 'couchdb'"
+        end
+      end
     end
   end
 end

data/app/services/lab/orders_service.rb

@@ -66,9 +66,7 @@ module Lab
 
       def update_order(order_id, params)
         specimen_id = params.dig(:specimen, :concept_id)
-        unless specimen_id
-          raise ::InvalidParameterError, 'Specimen concept_id is required'
-        end
+        raise ::InvalidParameterError, 'Specimen concept_id is required' unless specimen_id
 
         order = Lab::LabOrder.find(order_id)
         if order.concept_id != unknown_concept_id && !params[:force_update]&.casecmp?('true')
@@ -84,7 +82,7 @@ module Lab
                         discontinued_reason_non_coded: 'Sample drawn/updated')
         end
 
-        if params.key?(:reason_for_test_id)
+        if params[:reason_for_test_id]
           Rails.logger.debug("Updating reason for test on order ##{order.order_id}")
           update_reason_for_test(order, params[:reason_for_test_id])
         end
@@ -116,13 +114,9 @@ module Lab
       # a 'Lab' encounter is created using the provided program_id and
       # patient_id.
       def find_encounter(order_params)
-        if order_params[:encounter_id]
-          return Encounter.find(order_params[:encounter_id])
-        end
+        return Encounter.find(order_params[:encounter_id]) if order_params[:encounter_id]
 
-        unless order_params[:patient_id]
-          raise InvalidParameterError, 'encounter_id or patient_id required'
-        end
+        raise InvalidParameterError, 'encounter_id or patient_id required' unless order_params[:patient_id]
 
         program_id = order_params[:program_id] || Program.find_by_name!(Lab::Metadata::LAB_PROGRAM_NAME).program_id
 
@@ -203,17 +197,13 @@ module Lab
       end
 
       def update_reason_for_test(order, concept_id)
-        if concept_id.blank?
-          raise InvalidParameterError, "Reason for test can't be blank"
-        end
+        raise InvalidParameterError, "Reason for test can't be blank" if concept_id.blank?
 
         return if order.reason_for_test&.value_coded == concept_id
 
-        unless order.reason_for_test&.value_coded.nil?
-          raise InvalidParameterError, "Can't change reason for test once set"
-        end
+        raise InvalidParameterError, "Can't change reason for test once set" if order.reason_for_test&.value_coded
 
-        order.reason_for_test.delete
+        order.reason_for_test&.delete
         add_reason_for_test(order, date: order.start_date, reason_for_test_id: concept_id)
       end
     end

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest