his_emr_api_lab 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076c4e3c64155baece8e43499296d703578262b83b09bdb0adada71d3155613b
-  data.tar.gz: 492212d77df9cec8c5639b6f097fd1f72180f9846b45b9909e49504eebd30ff1
+  metadata.gz: 621f287ea97c94b4c48cd73c0bcd44e38ec8232bad9c2e5a9c1bed97ffa40828
+  data.tar.gz: 41138387babca534befa95b3c2f07e794f2b8fe3b7812901dba45f18aa80b45d
 SHA512:
-  metadata.gz: f96be1635dc75fc9b8207c874ebd34e53dd8f86c650434ac1ea37a5d2a3ae810b4a18c672a3c732cd14de964ff8352f00584231342340e358668f68e11db0497
-  data.tar.gz: 868ad9bd444b0afa72713576f5ed557dc3b32cb548fbaa0cab94c5129e2bfa83f7935a08c03876c08dc41f9258af7b886e1e7f0ee80ff728d8e52661fd47d6e8
+  metadata.gz: 7712bd7f073b68e2b1ebc23f248902ac27b4ba08773fba780f12704b43b849f209eb75c7de421763e7bbe80dd960031abf68e2aa961514451c7d153afb62824b
+  data.tar.gz: b00db5c45c98f2c05a9ce6bc7f843d0a66b6db78528b2f1d8bf1c978e9d7b56848c32f8d6a98400ba1e554c72d8f34d281242151f6c23f92dadf4209fbe298b1

data/app/controllers/lab/orders_controller.rb

@@ -11,7 +11,11 @@ module Lab
         OrdersService.order_test(order_params)
       end
 
-      orders.each { |order| Lab::PushOrderJob.perform_later(order.fetch(:order_id)) }
+      orders.each do |order|
+        Lab::PushOrderJob.perform_later(order.fetch(:order_id))
+      rescue StandardError => e
+        Rails.logger.error("Failed to enqueue PushOrderJob for order #{order.fetch(:order_id)}: #{e.message}")
+      end
 
       render json: orders, status: :created
     end
@@ -19,19 +23,30 @@ module Lab
     def update
       specimen = params.require(:specimen).slice(:concept_id)
       order = OrdersService.update_order(params[:id], specimen:, force_update: params[:force_update])
-      Lab::PushOrderJob.perform_later(order.fetch(:order_id))
+
+      begin
+        Lab::PushOrderJob.perform_later(order.fetch(:order_id))
+      rescue StandardError => e
+        Rails.logger.error("Failed to enqueue PushOrderJob for order #{order.fetch(:order_id)}: #{e.message}")
+      end
 
       render json: order
     end
 
     def index
-      filters = params.permit(%i[patient_id patient accession_number date status])
+      filters = params.permit(%i[patient_id patient accession_number date status visit_id])
 
       id = filters[:patient_id] || filters[:patient]
 
       patient = Patient.find(id) if filters[:patient_id] || filters[:patient]
 
-      Lab::UpdatePatientOrdersJob.perform_later(patient.id) if filters[:patient_id] || filters[:patient]
+      if filters[:patient_id] || filters[:patient]
+        begin
+          Lab::UpdatePatientOrdersJob.perform_later(patient.id)
+        rescue StandardError => e
+          Rails.logger.error("Failed to enqueue UpdatePatientOrdersJob for patient #{patient.id}: #{e.message}")
+        end
+      end
       orders = OrdersSearchService.find_orders(filters)
       begin
         render json: orders.reload, status: :ok
@@ -47,7 +62,12 @@ module Lab
 
     def destroy
       OrdersService.void_order(params[:id], params[:reason])
-      Lab::VoidOrderJob.perform_later(params[:id])
+
+      begin
+        Lab::VoidOrderJob.perform_later(params[:id])
+      rescue StandardError => e
+        Rails.logger.error("Failed to enqueue VoidOrderJob for order #{params[:id]}: #{e.message}")
+      end
 
       render status: :no_content
     end

data/app/services/lab/orders_search_service.rb

@@ -5,7 +5,7 @@ module Lab
   module OrdersSearchService
     class << self
       def find_orders(filters)
-        extra_filters = pop_filters(filters, :date, :end_date, :status)
+        extra_filters = pop_filters(filters, :date, :end_date, :status, :visit_id)
 
         uuid = filters.delete(:patient)
         patient = Patient.find(uuid) if uuid
@@ -19,6 +19,7 @@ module Lab
 
         orders = filter_orders_by_status(orders: orders, status: extra_filters[:status])
         orders = filter_orders_by_date(orders: orders, date: extra_filters[:date], end_date: extra_filters[:end_date])
+        orders = filter_orders_by_visit_id(orders: orders, visit_id: extra_filters[:visit_id])
 
         orders.map { |order| Lab::LabOrderSerializer.serialize_order(order) }
       end
@@ -54,6 +55,12 @@ module Lab
         end
       end
 
+      def filter_orders_by_visit_id(orders:, visit_id: nil)
+        return orders unless visit_id.present?
+
+        orders.joins(:encounter).where(encounter: { visit_id: visit_id })
+      end
+
       def unknown_concept_id
         ConceptName.find_by_name!('Unknown').concept_id
       end

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-27 00:00:00.000000000 Z
+date: 2026-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest