his_emr_api_lab 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc965d603f0266ab7897325bdf7342208fb136527c39b2b6d267269b79c2670c
-  data.tar.gz: 67b239f498c628d805d336df0b1ce1aa906969638046453640b57278dbdc3d1a
+  metadata.gz: aa10ff237ade4cbd630628c0511ca04f8ab31e076a8b9b6f8413a4e0dde444f9
+  data.tar.gz: 4ca6cf07011ac9117fa00b0fee436e353dd5faad5cb71ed50656b89b4826c98e
 SHA512:
-  metadata.gz: 1944e524aab65fa92c218339dd61e1edfd741b38c0525b8c89092d493dd77bfc1f450f5bbe51dca6b9896db402f32f7d38a2e0c90ba59eac04e257a82bbb5375
-  data.tar.gz: 33b215daa16a744b72ff9999ec71fcfbc211c21fad7cad8f73d540ec8eb9cf16183bdd1a4f90ee6a901847a89f0cba0f4d4326bb28383515105f2662805f232a
+  metadata.gz: 1a6aba5b3b1339126fd2f7f16959b1d1f1a11381d1d790eeeaca9909383fcd8324c3896b1a94d75aa9c19edc7ae7b7aafdbfb95b59073ff68b66be35732fc97e
+  data.tar.gz: 4964fbb342fc54ff534c0d90d6c43191492deb9401b7e4278ed5921be74bc32ea84cd6adbc6f6dca5c82a1fd8f6120a8412ce08b58fa55634825ae1bccb45193

data/app/controllers/lab/orders_controller.rb

@@ -58,6 +58,10 @@ module Lab
     def verify_tracking_number
       tracking_number = params.require(:accession_number)
       render json: { exists: OrdersService.check_tracking_number(tracking_number) }, status: :ok
+    rescue Lab::Lims::ValidationUnavailable => e
+      # Return 502 Bad Gateway to indicate the external service is unavailable
+      # This allows the frontend to prompt user for confirmation
+      render json: { errors: [e.message] }, status: :bad_gateway
     end
 
     def destroy
@@ -74,7 +78,7 @@ module Lab
 
     def order_status
       order_params = params.permit(:tracking_number, :status, :status_time, :comments, :status_id,
-                                    updated_by: [:first_name, :last_name, :id, :phone_number])
+                                   updated_by: %i[first_name last_name id phone_number])
       OrdersService.update_order_status(order_params)
       render json: { message: "Status for order #{order_params['tracking_number']} successfully updated" }, status: :ok
     end

data/app/services/lab/acknowledgement_service.rb

@@ -14,12 +14,11 @@ module Lab
                                         date_received: params[:date_received])
       end
 
-      def acknowledgements_pending_sync(batch_size, start_date: nil)
+      def acknowledgements_pending_sync(batch_size, start_date: nil, last_order_id: 0)
         query = Lab::LabAcknowledgement.joins(:order).where(pushed: false)
-
+                                       .where('lims_acknowledgement_statuses.order_id > ?', last_order_id)
         query = query.where('orders.date_created >= ?', start_date) if start_date
-
-        query.limit(batch_size)
+        query.order('lims_acknowledgement_statuses.order_id ASC').limit(batch_size)
       end
 
       def push_acknowledgement(acknowledgement, lims_api)

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

@@ -16,19 +16,33 @@ module Lab
       end
 
       def push_acknowledgement(batch_size: 1000, wait: false)
+        last_order_id = 0
         loop do
           logger.info('Looking for new acknowledgements to push to LIMS...')
           acknowledgements = Lab::AcknowledgementService.acknowledgements_pending_sync(batch_size,
-                                                                                       start_date: start_date).all
+                                                                                       start_date: start_date,
+                                                                                       last_order_id: last_order_id).all
 
           logger.debug("Found #{acknowledgements.size} acknowledgements...")
           acknowledgements.each do |acknowledgement|
             Lab::AcknowledgementService.push_acknowledgement(acknowledgement, @lims_api)
+            last_order_id = acknowledgement.order_id
           rescue StandardError => e
             logger.error("Failed to push acknowledgement ##{acknowledgement.order_id}: #{e.class} - #{e.message}")
           end
 
-          break unless wait
+          # If no records found or not waiting, check if we should continue
+          if acknowledgements.empty?
+            break unless wait
+          elsif !wait && acknowledgements.size < batch_size
+            # Processed final partial batch in one-shot mode
+            logger.info("Processed final batch of #{acknowledgements.size} acknowledgements")
+            break
+          elsif !wait
+            # More records likely exist, continue processing
+            logger.info('Batch complete, checking for more acknowledgements...')
+            next
+          end
 
           logger.info('Waiting for acknowledgements...')
           sleep(Lab::Lims::Config.updates_poll_frequency)

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

@@ -8,17 +8,18 @@ module Lab
       class MissingAccessionNumber < LimsException; end
       class UnknownSpecimenType < LimsException; end
       class UnknownTestType < LimsException; end
+      class ValidationUnavailable < LimsException; end
     end
   end
 end
 
-
 module Lab
   module Lims
-      class LimsException < StandardError; end
-      class DuplicateNHID < LimsException; end
-      class MissingAccessionNumber < LimsException; end
-      class UnknownSpecimenType < LimsException; end
-      class UnknownTestType < LimsException; end
+    class LimsException < StandardError; end
+    class DuplicateNHID < LimsException; end
+    class MissingAccessionNumber < LimsException; end
+    class UnknownSpecimenType < LimsException; end
+    class UnknownTestType < LimsException; end
+    class ValidationUnavailable < LimsException; end
   end
 end

data/app/services/lab/orders_service.rb

@@ -56,8 +56,14 @@ module Lab
 
         Order.transaction do
           encounter = find_encounter(order_params)
-          if order_params[:accession_number].present? && check_tracking_number(order_params[:accession_number])
-            raise 'Accession number already exists'
+          if order_params[:accession_number].present?
+            begin
+              raise 'Accession number already exists' if check_tracking_number(order_params[:accession_number])
+            rescue Lab::Lims::ValidationUnavailable => e
+              # Log warning but allow order creation to proceed
+              # User should have been prompted to confirm on the frontend
+              Rails.logger.warn("Creating order with unvalidated accession number: #{e.message}")
+            end
           end
 
           order = create_order(encounter, order_params)
@@ -364,6 +370,15 @@ module Lab
         # fetch from the rest api and check if it exists
         lims_api = Lab::Lims::ApiFactory.create_api
         lims_api.verify_tracking_number(accession_number).present?
+      rescue StandardError => e
+        # Log the error for debugging
+        Rails.logger.error("Failed to verify accession number with NLIMS: #{e.message}")
+        Rails.logger.error(e.backtrace.join("\n"))
+
+        # Raise a specific exception indicating validation is unavailable
+        # This allows the controller to handle it differently than "accession exists"
+        raise Lab::Lims::ValidationUnavailable,
+              "Failed to communicate with external service: #{e.message}"
       end
 
       ##

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.7
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-02 00:00:00.000000000 Z
+date: 2026-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest