his_emr_api_lab 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc965d603f0266ab7897325bdf7342208fb136527c39b2b6d267269b79c2670c
-  data.tar.gz: 67b239f498c628d805d336df0b1ce1aa906969638046453640b57278dbdc3d1a
+  metadata.gz: 0a4ea1a6183fe75cd7d56a11e934391903cab098f8892b91380d6f6e67b3b752
+  data.tar.gz: 4b9f2c6e7f8beabf94c5c474cd11a2cbafe833a4111d975786b9b65b85a093fd
 SHA512:
-  metadata.gz: 1944e524aab65fa92c218339dd61e1edfd741b38c0525b8c89092d493dd77bfc1f450f5bbe51dca6b9896db402f32f7d38a2e0c90ba59eac04e257a82bbb5375
-  data.tar.gz: 33b215daa16a744b72ff9999ec71fcfbc211c21fad7cad8f73d540ec8eb9cf16183bdd1a4f90ee6a901847a89f0cba0f4d4326bb28383515105f2662805f232a
+  metadata.gz: b5562e97cd505fed7dc56e3529e7b5b38510cf3ec5d0a94dbd2fbff91a8286e7715a96bb77c6ff339cf7edf60d0eda539e57ec758109c32de26cd11892e387e7
+  data.tar.gz: '097f26ec972cd4f79e57f5719142c6224a975dad0b4c31de4e6063df96470f01885c000544b743f4d0470b09c2d63ab1180f97dad6eb585ab0d7ff6d01350e1b'

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/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.3.5'
+  VERSION = '2.3.6'
 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.6
 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-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest