his_emr_api_lab 1.1.15 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0345aafa5a183730006a41e0451a129eea8b201622af42c9ae9b13fb23e410d
-  data.tar.gz: d2003b6e1872c4d3c16b1bc80edea36d4ac353d62b37aad71932119085c5aecb
+  metadata.gz: 31eb65eeca1c291f733da313a36a6477143ed6119afa9858cd7afb6979ef75bd
+  data.tar.gz: 3f753f4313b69f613388c2517a8efe7936871baad6adb43dfc8475ecfe303688
 SHA512:
-  metadata.gz: afb1c33968cb197c30b9f702b04188e93c886982a2304dc21aefcfd46add7aeb62df2307d53c6f2794dba8895a049f131b82835046280de920996d70eb6f1b84
-  data.tar.gz: ad3514949b17d623983acd6c8f7c4af305da52e4eda81e2345d94d7390e2d35aa7796d91397d819f0f64efa73803a011b4e9bd46baa574b265b04346da30b1d2
+  metadata.gz: 94ba7f43627d0def3edb609439535f9a715b695afda5ba43a494b673f421b1878cda6386b2b58c9960990f58c5156f308d85a5909668aad7c1dba97ab4aae2a9
+  data.tar.gz: 2f2d3552dcbe2608623066a65bb4fff59932aea55b3ab4b8a24478cc773161b6b1149c4bba08175233e4c6a43d3ed247abd889fcf258528c31bb4c4e8c89c35e

data/app/controllers/lab/orders_controller.rb

@@ -8,14 +8,15 @@ module Lab
         OrdersService.order_test(order_params)
       end
 
+      orders.each { |order| Lab::PushOrderJob.perform_later(order.fetch(:order_id)) }
+
       render json: orders, status: :created
     end
 
     def update
       specimen = params.require(:specimen).permit(:concept_id)
-
-      order = OrdersService.update_order(params[:id], specimen: specimen,
-                                                      force_update: params[:force_update])
+      order = OrdersService.update_order(params[:id], specimen: specimen, force_update: params[:force_update])
+      Lab::PushOrderJob.perform_later(order.fetch(:order_id))
 
       render json: order
     end
@@ -23,11 +24,13 @@ module Lab
     def index
       filters = params.permit(%i[patient_id accession_number date status])
 
+      Lab::UpdatePatientOrdersJob.perform_later(filters[:patient_id]) if filters[:patient_id]
       render json: OrdersSearchService.find_orders(filters)
     end
 
     def destroy
       OrdersService.void_order(params[:id], params[:reason])
+      Lab::VoidOrderJob.perform_later(params[:id])
 
       render status: :no_content
     end

data/app/controllers/lab/tests_controller.rb

@@ -14,7 +14,8 @@ class Lab::TestsController < ::ApplicationController
     order_id, test_concepts = test_params.require(%i[order_id tests])
     date = test_params[:date] || Date.today
 
-    tests = service.create_tests(Order.find(order_id), date, test_concepts)
+    tests = service.create_tests(Lab::LabOrder.find(order_id), date, test_concepts)
+    Lab::PushOrderJob.perform_later(order_id)
 
     render json: tests, status: :created
   end

data/app/models/lab/lab_order.rb

@@ -44,19 +44,11 @@ module Lab
     scope :drawn, -> { where.not(concept_id: ConceptName.where(name: 'Unknown').select(:concept_id)) }
     scope :not_drawn, -> { where(concept_id: ConceptName.where(name: 'Unknown').select(:concept_id)) }
 
-    after_commit :queue_lims_push
-
     def self.prefetch_relationships
       includes(:reason_for_test,
                :requesting_clinician,
                :target_lab,
                tests: [:result])
     end
-
-    private
-
-    def queue_lims_push
-      Lab::PushOrderJob.perform_later(order_id)
-    end
   end
 end

data/app/services/lab/orders_search_service.rb

@@ -5,14 +5,6 @@ module Lab
   module OrdersSearchService
     class << self
       def find_orders(filters)
-        # A bit of hack-ish solution to have a patient's orders updated upon
-        # scanning of a patient. Done in this way to deal with LIMS' lack of
-        # a notification system for lab order updates. We are limited to polling
-        # for updates on a per order basis.
-        if filters[:patient_id]
-          Lab::UpdatePatientOrdersJob.perform_later(filters[:patient_id])
-        end
-
         extra_filters = pop_filters(filters, :date, :end_date, :status)
 
         orders = Lab::LabOrder.prefetch_relationships
@@ -39,13 +31,9 @@ module Lab
         date = date&.to_date
         end_date = end_date&.to_date
 
-        if date && end_date
-          return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day)
-        end
+        return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day) if date && end_date
 
-        if date
-          return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day)
-        end
+        return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day) if date
 
         return orders.where('start_date < ?', end_date + 1.day) if end_date
 

data/app/services/lab/orders_service.rb

@@ -100,7 +100,6 @@ module Lab
 
         order.tests.each { |test| test.void(reason) }
         voided = order.void(reason)
-        Lab::VoidOrderJob.perform_later(order_id)
 
         voided
       end

data/lib/lab/version.rb

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

data/lib/logger_multiplexor.rb

@@ -23,10 +23,16 @@ class LoggerMultiplexor
   end
 
   def method_missing(method_name, *args)
-    @loggers.each { |logger| logger.method(method_name).call(*args) }
+    if respond_to_missing?(method_name)
+      @loggers.each { |logger| logger.send(method_name, *args) }
+    else
+      super
+    end
   end
 
   def respond_to_missing?(method_name)
-    @loggers.all? { |logger| logger.respond_to_missing?(method_name) }
+    @loggers.all? do |logger|
+      logger.respond_to?(method_name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -334,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API